Skip to content

Commit 9d4d2ab

Browse files
Merge branch '6.6.0' into feat/resolve-scoped-classes
2 parents 63644df + 036bc56 commit 9d4d2ab

150 files changed

Lines changed: 3574 additions & 2473 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.

.circleci/config.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
version: 2
2+
jobs:
3+
build:
4+
working_directory: ~/nest
5+
docker:
6+
- image: circleci/node:12
7+
steps:
8+
- checkout
9+
- run:
10+
name: Update NPM version
11+
command: 'sudo npm install -g npm@latest'
12+
- restore_cache:
13+
key: dependency-cache-{{ checksum "package.json" }}
14+
- run:
15+
name: Install dependencies
16+
command: npm ci
17+
- save_cache:
18+
key: dependency-cache-{{ checksum "package.json" }}
19+
paths:
20+
- ./node_modules
21+
- run:
22+
name: Build
23+
command: npm run build
24+
25+
test:
26+
working_directory: ~/nest
27+
docker:
28+
- image: circleci/node:12
29+
steps:
30+
- checkout
31+
- restore_cache:
32+
name: Restore node_modules cache
33+
key: dependency-cache-{{ checksum "package.json" }}
34+
- run:
35+
name: Install dependencies
36+
command: npm ci
37+
- run:
38+
name: Build (dev)
39+
command: npm run build
40+
- run:
41+
name: Test
42+
command: npm run test
43+
lint:
44+
working_directory: ~/nest
45+
docker:
46+
- image: circleci/node:12
47+
steps:
48+
- checkout
49+
- restore_cache:
50+
name: Restore node_modules cache
51+
key: dependency-cache-{{ checksum "package.json" }}
52+
- run:
53+
name: Install dependencies
54+
command: npm ci
55+
- run:
56+
name: Lint
57+
command: npm run lint
58+
workflows:
59+
version: 2
60+
build-and-test:
61+
jobs:
62+
- build
63+
- test:
64+
requires:
65+
- build
66+
- lint:
67+
requires:
68+
- build

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ before_install:
1212

1313
install:
1414
- npm ci
15-
- npm run build:dev
15+
- npm run build
1616

1717
jobs:
1818
include:

CONTRIBUTING.md

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ We would love for you to contribute to Nest and help make it even better than it
44
today! As a contributor, here are the guidelines we would like you to follow:
55

66
<!--* [Code of Conduct](#coc)-->
7-
* [Question or Problem?](#question)
8-
* [Issues and Bugs](#issue)
9-
* [Feature Requests](#feature)
10-
* [Submission Guidelines](#submit)
11-
* [Development Setup](#development)
12-
* [Coding Rules](#rules)
13-
* [Commit Message Guidelines](#commit)
7+
8+
- [Question or Problem?](#question)
9+
- [Issues and Bugs](#issue)
10+
- [Feature Requests](#feature)
11+
- [Submission Guidelines](#submit)
12+
- [Development Setup](#development)
13+
- [Coding Rules](#rules)
14+
- [Commit Message Guidelines](#commit)
1415
<!-- - [Signing the CLA](#cla) -->
1516

1617
<!-- ## <a name="coc"></a> Code of Conduct
@@ -24,8 +25,8 @@ Stack Overflow is a much better place to ask questions since:
2425

2526
<!-- - there are thousands of people willing to help on Stack Overflow [maybe one day] -->
2627

27-
* questions and answers stay available for public viewing so your question / answer might help someone else
28-
* Stack Overflow's voting system assures that the best answers are prominently visible.
28+
- questions and answers stay available for public viewing so your question / answer might help someone else
29+
- Stack Overflow's voting system assures that the best answers are prominently visible.
2930

3031
To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow.
3132

@@ -44,10 +45,10 @@ Repository. If you would like to _implement_ a new feature, please submit an iss
4445
a proposal for your work first, to be sure that we can use it.
4546
Please consider what kind of change it is:
4647

47-
* For a **Major Feature**, first open an issue and outline your proposal so that it can be
48+
- For a **Major Feature**, first open an issue and outline your proposal so that it can be
4849
discussed. This will also allow us to better coordinate our efforts, prevent duplication of work,
4950
and help you to craft the change so that it is successfully accepted into the project. For your issue name, please prefix your proposal with `[discussion]`, for example "[discussion]: your feature idea".
50-
* **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
51+
- **Small Features** can be crafted and directly [submitted as a Pull Request](#submit-pr).
5152

5253
## <a name="submit"></a> Submission Guidelines
5354

@@ -57,9 +58,9 @@ Before you submit an issue, please search the issue tracker, maybe an issue for
5758

5859
We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs we will systematically ask you to provide a minimal reproduction scenario using a repository or [Gist](https://gist.github.com/). Having a live, reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like:
5960

60-
* version of NestJS used
61-
* 3rd-party libraries and their versions
62-
* and most importantly - a use-case that fails
61+
- version of NestJS used
62+
- 3rd-party libraries and their versions
63+
- and most importantly - a use-case that fails
6364

6465
<!--
6566
// TODO we need to create a playground, similar to plunkr
@@ -114,11 +115,11 @@ We cannot accept code without this.
114115

115116
1. In GitHub, send a pull request to `nestjs:master`.
116117

117-
* If we suggest changes then:
118+
- If we suggest changes then:
118119

119-
* Make the required updates.
120-
* Re-run the Nest test suites to ensure tests are still passing.
121-
* Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
120+
- Make the required updates.
121+
- Re-run the Nest test suites to ensure tests are still passing.
122+
- Rebase your branch and force push to your GitHub repository (this will update your Pull Request):
122123

123124
```shell
124125
git rebase master -i
@@ -132,25 +133,25 @@ That's it! Thank you for your contribution!
132133
After your pull request is merged, you can safely delete your branch and pull the changes
133134
from the main (upstream) repository:
134135
135-
* Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
136+
- Delete the remote branch on GitHub either through the GitHub web UI or your local shell as follows:
136137
137138
```shell
138139
git push origin --delete my-fix-branch
139140
```
140141
141-
* Check out the master branch:
142+
- Check out the master branch:
142143
143144
```shell
144145
git checkout master -f
145146
```
146147
147-
* Delete the local branch:
148+
- Delete the local branch:
148149
149150
```shell
150151
git branch -D my-fix-branch
151152
```
152153
153-
* Update your master with the latest upstream version:
154+
- Update your master with the latest upstream version:
154155
155156
```shell
156157
git pull --ff upstream master
@@ -177,13 +178,8 @@ That will compile fresh packages and afterward, move them to all `sample` direct
177178
### <a name="common-scripts"></a>Commonly used NPM scripts
178179
179180
```bash
180-
# build all packages and put them near to their source .ts files
181-
$ npm run build
182-
183181
# build all packages and move to "sample" and "integration" directories
184-
# if cross-packages breaking changes were performed you may face irrelevant errors
185-
# in order to verify the build, you can run this command again then
186-
$ npm run build:dev
182+
$ npm run build
187183
188184
# run the full unit tests suite
189185
$ npm run test
@@ -194,6 +190,9 @@ $ sh scripts/run-integration.sh
194190
195191
# run linter
196192
$ npm run lint
193+
194+
# build all packages and put them near to their source .ts files
195+
$ npm run build:prod
197196
```
198197
199198
## <a name="rules"></a> Coding Rules
@@ -204,8 +203,8 @@ To ensure consistency throughout the source code, keep these rules in mind as yo
204203
// We're working on auto-documentation.
205204
* All public API methods **must be documented**. (Details TBC). -->
206205

207-
* All features or bug fixes **must be tested** by one or more specs (unit-tests).
208-
* We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
206+
- All features or bug fixes **must be tested** by one or more specs (unit-tests).
207+
- We follow [Google's JavaScript Style Guide][js-style-guide], but wrap all code at
209208
**100 characters**. An automated formatter is available (`npm run format`).
210209
211210
## <a name="commit"></a> Commit Message Guidelines
@@ -249,44 +248,44 @@ If the commit reverts a previous commit, it should begin with `revert:`, followe
249248
250249
Must be one of the following:
251250
252-
* **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
253-
* **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
254-
* **docs**: Documentation only changes
255-
* **feature**: A new feature
256-
* **bugfix**: A bug fix
257-
* **perf**: A code change that improves performance
258-
* **refactor**: A code change that neither fixes a bug nor adds a feature
259-
* **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
260-
* **test**: Adding missing tests or correcting existing tests
251+
- **build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
252+
- **ci**: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)
253+
- **docs**: Documentation only changes
254+
- **feature**: A new feature
255+
- **bugfix**: A bug fix
256+
- **perf**: A code change that improves performance
257+
- **refactor**: A code change that neither fixes a bug nor adds a feature
258+
- **style**: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
259+
- **test**: Adding missing tests or correcting existing tests
261260
262261
### Scope
263262
264263
The scope should be the name of the npm package affected (as perceived by person reading changelog generated from commit messages.
265264
266265
The following is the list of supported scopes:
267266
268-
* **common**
269-
* **core**
270-
* **sample**
271-
* **microservices**
272-
* **testing**
273-
* **websockets**
267+
- **common**
268+
- **core**
269+
- **sample**
270+
- **microservices**
271+
- **testing**
272+
- **websockets**
274273
275274
There are currently a few exceptions to the "use package name" rule:
276275
277-
* **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
278-
* **changelog**: used for updating the release notes in CHANGELOG.md
279-
* **sample/#**: for the example apps directory, replacing # with the example app number
280-
* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
281-
<!-- * **aio**: used for docs-app (angular.io) related changes within the /aio directory of the repo -->
276+
- **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
277+
- **changelog**: used for updating the release notes in CHANGELOG.md
278+
- **sample/#**: for the example apps directory, replacing # with the example app number
279+
- none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
280+
<!-- * **aio**: used for docs-app (angular.io) related changes within the /aio directory of the repo -->
282281
283282
### Subject
284283
285284
The subject contains succinct description of the change:
286285
287-
* use the imperative, present tense: "change" not "changed" nor "changes"
288-
* don't capitalize first letter
289-
* no dot (.) at the end
286+
- use the imperative, present tense: "change" not "changed" nor "changes"
287+
- don't capitalize first letter
288+
- no dot (.) at the end
290289

291290
### Body
292291

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[linux-image]: https://img.shields.io/travis/nestjs/nest/master.svg?label=linux
88
[linux-url]: https://travis-ci.org/nestjs/nest
99

10-
<p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications, heavily inspired by <a href="https://angular.io" target="blank">Angular</a>.</p>
10+
<p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
1111
<p align="center">
1212
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
1313
<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>

0 commit comments

Comments
 (0)