Skip to content

Commit c5e54bf

Browse files
authored
Merge pull request nestjs#3 from nestjs/master
merge upstream
2 parents 2bd0535 + a153808 commit c5e54bf

210 files changed

Lines changed: 5896 additions & 8784 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.travis.yml

Lines changed: 47 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,63 @@
11
language: node_js
2-
node_js:
3-
- "8"
4-
- "10"
5-
- "11"
2+
63
cache:
74
directories:
85
- "node_modules"
6+
97
git:
108
depth: 5
9+
1110
addons:
1211
firefox: "latest"
12+
1313
before_script:
1414
- export DISPLAY=:99.0
1515
- sh -e /etc/init.d/xvfb start
16+
1617
before_install:
1718
- npm i -g npm@latest
19+
1820
install:
1921
- npm ci
2022
- npm run build:dev
21-
script:
22-
- npm run lint
23-
- npm test
24-
after_success: npm run coverage
23+
24+
jobs:
25+
include:
26+
- state: "Test"
27+
name: "Unit Test Node v12"
28+
script: npm test
29+
node_js: 12
30+
after_success: npm run coverage
31+
32+
- state: "Test"
33+
name: "Unit Test Node v10"
34+
script: npm test
35+
node_js: 10
36+
37+
- state: "Test"
38+
name: "Unit Test Node v8"
39+
script: npm test
40+
node_js: 8
41+
42+
- state: "Test"
43+
name: "Integration Test"
44+
install: skip
45+
before_install: skip
46+
before_script: skip
47+
addons: skip
48+
script:
49+
sudo service mysql stop &&
50+
bash ./scripts/prepare.sh &&
51+
npm run integration-test
52+
node_js: 12
53+
54+
- stage: "Test"
55+
name: "Lint"
56+
script: npm run lint
57+
node_js: 12
58+
59+
- stage: "Test"
60+
name: "Build samples"
61+
script: npm run build:samples
62+
node_js: 12
63+

Readme.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<a href="https://travis-ci.org/nestjs/nest" target="_blank"><img src="https://api.travis-ci.org/nestjs/nest.svg?branch=master" alt="Travis" /></a>
1616
<a href="https://travis-ci.org/nestjs/nest" target="_blank"><img src="https://img.shields.io/travis/nestjs/nest/master.svg?label=linux" alt="Linux" /></a>
1717
<a href="https://coveralls.io/github/nestjs/nest?branch=master" target="_blank"><img src="https://coveralls.io/repos/github/nestjs/nest/badge.svg?branch=master#9" alt="Coverage" /></a>
18-
<a href="https://gitter.im/nestjs/nestjs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=body_badge" target="_blank"><img src="https://badges.gitter.im/nestjs/nestjs.svg" alt="Gitter" /></a>
1918
<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
2019
<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
2120
<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
@@ -61,25 +60,23 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
6160

6261
#### Sponsors
6362

64-
<a href="https://www.swingdev.io" target="_blank"><img src="https://nestjs.com/img/swingdev-logo.svg#1" width="125" valign="middle" /> </a> &nbsp; <a href="https://blueanchor.io/" target="_blank"><img src="https://nestjs.com/img/blueanchor.png" width="180" valign="middle" /></a> &nbsp;
65-
<a href="https://www.novologic.com/" target="_blank"><img src="https://nestjs.com/img/novologic.png" width="130" valign="middle" /></a> &nbsp;
66-
<a href="https://scal.io" target="_blank"><img src="https://nestjs.com/img/scalio-logo.svg" width="100" valign="middle" /></a> &nbsp; <a href="http://angularity.io" target="_blank"><img src="http://angularity.io/media/logo.svg" height="26" valign="middle" /></a> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com" target="_blank"><img src="https://nestjs.com/img/hostpresto.png" height="30" valign="middle" /></a>
67-
68-
&nbsp; <a href="https://genuinebee.com/" target="_blank"><img src="https://nestjs.com/img/genuinebee.svg" height="36" valign="middle" /></a> &nbsp; <a href="http://architectnow.net/" target="_blank"><img src="https://nestjs.com/img/architectnow.png" height="24" valign="middle" /></a> &nbsp; <a href="https://quander.io/" target="_blank"><img src="https://nestjs.com/img/quander.png" height="28" valign="middle" /></a> &nbsp; <a href="https://mantro.net/" target="_blank"><img src="https://nestjs.com/img/mantro-logo.svg" height="20" valign="middle" /></a> &nbsp; <a href="https://triplebyte.com/" target="_blank"><img src="https://nestjs.com/img/triplebyte.png" height="30" valign="middle" /></a> &nbsp;
69-
<a href="https://ever.co/" target="_blank"><img src="https://nestjs.com/img/ever-logo.png" height="20" valign="middle" /></a> &nbsp;
70-
<a href="https://buddy.works/" target="_blank"><img src="https://nestjs.com/img/buddy-logo.svg" height="35" valign="middle" /></a> &nbsp;
71-
<a href="https://blokt.com" target="_blank"><img src="https://nestjs.com/img/blokt-logo.png" height="31" valign="middle" /></a> &nbsp;
72-
<a href="https://reposit.co.uk/" target="_blank"><img src="https://nestjs.com/img/reposit-logo.png" height="28" valign="middle" /></a> &nbsp; &nbsp; <a href="https://yakaz.com/" target="_blank"><img src="https://nestjs.com/img/yakaz.png" width="80" valign="middle" /></a> &nbsp;
73-
<a href="https://nearpod.com/" target="_blank"><img src="https://nestjs.com/img/nearpod-logo.svg" width="120" valign="middle" /></a> &nbsp;
74-
<a href="https://clay.global/" target="_blank"><img src="https://nestjs.com/img/clay-logo.svg" width="90" valign="middle" /></a> &nbsp;
75-
<a href="https://firesticktricks.com" target="_blank"><img src="https://nestjs.com/img/firesticktricks-logo.png" width="145" valign="middle" /></a> &nbsp;
76-
<a href="http://xtremis.com/" target="_blank"><img src="https://nestjs.com/img/logo-xtremis.svg" width="145" valign="middle" /></a>
77-
63+
<a href="https://www.swingdev.io" target="_blank"><img src="https://nestjs.com/img/swingdev-logo.svg#1" width="110" valign="middle" /> </a> &nbsp; <a href="https://blueanchor.io/" target="_blank"><img src="https://nestjs.com/img/blueanchor.png" width="150" valign="middle" /></a> &nbsp;
64+
<a href="https://www.novologic.com/" target="_blank"><img src="https://nestjs.com/img/novologic.png" width="110" valign="middle" /></a> &nbsp;
65+
<a href="https://scal.io" target="_blank"><img src="https://nestjs.com/img/scalio-logo.svg" width="80" valign="middle" /></a> &nbsp; <a href="http://angularity.io" target="_blank"><img src="http://angularity.io/media/logo.svg" height="22" valign="middle" /></a> &nbsp; <!--<a href="https://keycdn.com"><img src="https://nestjs.com/img/keycdn.svg" height="30" /></a> &nbsp;--> <a href="https://hostpresto.com" target="_blank"><img src="https://nestjs.com/img/hostpresto.png" height="24" valign="middle" /></a>
66+
<a href="https://ever.co/" target="_blank"><img src="https://nestjs.com/img/ever-logo.png" height="14" valign="middle" /></a> &nbsp;
67+
<a href="https://buddy.works/" target="_blank"><img src="https://nestjs.com/img/buddy-logo.svg" height="25" valign="middle" /></a> &nbsp;
68+
<a href="https://blokt.com" target="_blank"><img src="https://nestjs.com/img/blokt-logo.png" height="25" valign="middle" /></a> &nbsp; <a href="https://genuinebee.com/" target="_blank"><img src="https://nestjs.com/img/genuinebee.svg" height="24" valign="middle" /></a> &nbsp; <a href="http://architectnow.net/" target="_blank"><img src="https://nestjs.com/img/architectnow.png" height="20" valign="middle" /></a> &nbsp; <a href="https://quander.io/" target="_blank"><img src="https://nestjs.com/img/quander.png" height="22" valign="middle" /></a> &nbsp; <a href="https://mantro.net/" target="_blank"><img src="https://nestjs.com/img/mantro-logo.svg" height="19" valign="middle" /></a> &nbsp; <a href="https://triplebyte.com/" target="_blank"><img src="https://nestjs.com/img/triplebyte.png" height="20" valign="middle" /></a> &nbsp;
69+
<a href="https://reposit.co.uk/" target="_blank"><img src="https://nestjs.com/img/reposit-logo.png" height="18" valign="middle" /></a> &nbsp; &nbsp; <a href="https://yakaz.com/" target="_blank"><img src="https://nestjs.com/img/yakaz.png" width="70" valign="middle" /></a> &nbsp;
70+
<a href="https://nearpod.com/" target="_blank"><img src="https://nestjs.com/img/nearpod-logo.svg" width="100" valign="middle" /></a> &nbsp;
71+
<a href="https://clay.global/" target="_blank"><img src="https://nestjs.com/img/clay-logo.svg" width="75" valign="middle" /></a> &nbsp;
72+
<a href="https://firesticktricks.com" target="_blank"><img src="https://nestjs.com/img/firesticktricks-logo.png" width="120" valign="middle" /></a> &nbsp;
73+
<a href="https://www.codeguesser.co.uk" target="_blank"><img src="https://nestjs.com/img/codeguesser-logo.svg" width="120" valign="middle" /></a> &nbsp;
74+
<a href="https://tekhattan.com" target="_blank"><img src="https://nestjs.com/img/tekhattan-logo.png" width="110" valign="middle" /></a>
7875

7976

8077
## Backers
8178

82-
<a href="https://opencollective.com/nest" target="_blank"><img src="https://opencollective.com/nest/backers.svg?width=1600"></a>
79+
<a href="https://opencollective.com/nest" target="_blank"><img src="https://opencollective.com/nest/backers.svg?width=1000"></a>
8380

8481
## Stay in touch
8582

gulpfile.js

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ const ts = require('gulp-typescript');
55
const sourcemaps = require('gulp-sourcemaps');
66
const clean = require('gulp-clean');
77
const deleteEmpty = require('delete-empty');
8+
const childProcess = require('child_process');
9+
const log = require('fancy-log');
10+
const clc = require('cli-color');
11+
12+
const { promisify } = require('util');
13+
14+
const exec = promisify(childProcess.exec);
15+
16+
const SAMPLE = path.join(__dirname, 'sample');
817

918
const packages = {
1019
common: ts.createProject('packages/common/tsconfig.json'),
@@ -101,9 +110,49 @@ function getFolders(dir) {
101110
return fs.statSync(path.join(dir, file)).isDirectory();
102111
});
103112
}
104-
gulp.task('move', function() {
105-
const getDirs = base => getFolders(base).map(path => `${base}/${path}`);
106113

114+
const getDirs = base => getFolders(base).map(path => `${base}/${path}`);
115+
116+
gulp.task('install:samples', async () => {
117+
const directories = getDirs(SAMPLE);
118+
119+
const promises = directories.map(async dir => {
120+
log.info(
121+
`Installing dependencies of ${clc.magenta(dir.replace(__dirname, ''))}`,
122+
);
123+
try {
124+
await exec(`npm install --no-shrinkwrap --prefix ${dir}`);
125+
} catch (err) {
126+
log.error(`Failed installing dependencies of ${dir}`);
127+
throw err;
128+
}
129+
});
130+
131+
await Promise.all(promises);
132+
});
133+
134+
gulp.task('build:samples', async () => {
135+
const directories = getDirs(SAMPLE);
136+
137+
const promises = directories.map(async dir => {
138+
log.info(
139+
`Building ${clc.magenta(dir.replace(__dirname, ''))}`,
140+
);
141+
try {
142+
await exec(`npm run build --prefix ${dir}`);
143+
} catch (err) {
144+
log.error(`Failed building ${clc.magenta(dir)}:`);
145+
if(err.stdout) {
146+
log.error(err.stdout);
147+
}
148+
throw err;
149+
}
150+
});
151+
152+
return await Promise.all(promises);
153+
});
154+
155+
gulp.task('move', function() {
107156
const examplesDirs = getDirs('sample');
108157
const integrationDirs = getDirs('integration');
109158
const directories = examplesDirs.concat(integrationDirs);

0 commit comments

Comments
 (0)