Skip to content

Commit f988b79

Browse files
kamilmysliwieckamilmysliwiec
authored
Merge branch 'master' into patch-1
2 parents 976cf68 + e550b67 commit f988b79

File tree

103 files changed

+6000
-4836
lines changed

Some content is hidden

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

103 files changed

+6000
-4836
lines changed

‎.github/workflows/lighthouse.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- name: Use Node.js 12.x
15-
uses: actions/setup-node@v2
15+
uses: actions/setup-node@v3
1616
with:
1717
node-version: 12.x
1818
# Build needs around 400 seconds on Netlify.

‎.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

‎.husky/commit-msg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install commitlint --edit $1

‎.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npx --no-install lint-staged

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
14.16.0
1+
16.15.1

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Stack Overflow is a much better place to ask questions since:
2727

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

30-
If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
30+
If you would like to chat about the question in real-time, you can reach out via [our discord channel][discord].
3131

3232
## <a name="issue"></a> Found a Bug?
3333
If you find a bug in the source code, you can help us by
@@ -229,7 +229,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
229229
[corporate-cla]: http://code.google.com/legal/corporate-cla-v1.0.html
230230
[dev-doc]: https://github.com/nestjs/nest/blob/master/docs/DEVELOPER.md
231231
[github]: https://github.com/nestjs/nest
232-
[gitter]: https://gitter.im/nestjs/nest
232+
[discord]: https://discord.gg/nestjs
233233
[individual-cla]: http://code.google.com/legal/individual-cla-v1.0.html
234234
[js-style-guide]: https://google.github.io/styleguide/jsguide.html
235235
[jsfiddle]: http://jsfiddle.net

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<a href="http://nestjs.com/" target="_blank"><img src="https://nestjs.com/img/logo_text.svg" width="320" alt="Nest Logo" /></a>
2+
<a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
33
</p>
44

55
[travis-image]: https://api.travis-ci.org/nestjs/nest.svg?branch=master

‎content/application-context.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Following is a summary of the methods available for retrieving instance referenc
4747
<code>select()</code>
4848
</td>
4949
<td>
50-
Navigates through the modules graph to pull out a specific instance from the selected module (used together with strict mode as described above).
50+
Navigates through the module's graph to pull out a specific instance of the selected module (used together with strict mode as described above).
5151
</td>
5252
</tr>
5353
</table>
@@ -66,6 +66,6 @@ async function bootstrap() {
6666
bootstrap();
6767
```
6868

69-
#### Example
69+
#### Example
7070

7171
A working example is available [here](https://github.com/nestjs/nest/tree/master/sample/18-context).

‎content/cli/usages.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Creates and initializes a new Nest project. Prompts for package manager.
2626

2727
##### Options
2828

29-
| Option | Description |
30-
| ------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
31-
| `--dry-run` | Reports changes that would be made, but does not change the filesystem.<br/> Alias: `-d` |
32-
| `--skip-git` | Skip git repository initialization.<br/> Alias: `-g` |
33-
| `--skip-install` | Skip package installation.<br/> Alias: `-s` |
34-
| `--package-manager [package-manager]` | Specify package manager. Use `npm`, `yarn`, or `pnpm`. Package manager must be installed globally.<br/> Alias: `-p` |
35-
| `--language [language]` | Specify programming language (`TS` or `JS`).<br/> Alias: `-l` |
36-
| `--collection [collectionName]` | Specify schematics collection. Use package name of installed npm package containing schematic.<br/> Alias: `-c` |
29+
| Option | Description |
30+
| ------------------------------------- | ------------------------------------------------------------------------------------------------------------------- |
31+
| `--dry-run` | Reports changes that would be made, but does not change the filesystem.<br/> Alias: `-d` |
32+
| `--skip-git` | Skip git repository initialization.<br/> Alias: `-g` |
33+
| `--skip-install` | Skip package installation.<br/> Alias: `-s` |
34+
| `--package-manager [package-manager]` | Specify package manager. Use `npm`, `yarn`, or `pnpm`. Package manager must be installed globally.<br/> Alias: `-p` |
35+
| `--language [language]` | Specify programming language (`TS` or `JS`).<br/> Alias: `-l` |
36+
| `--collection [collectionName]` | Specify schematics collection. Use package name of installed npm package containing schematic.<br/> Alias: `-c` |
3737

3838
#### nest generate
3939

@@ -53,25 +53,25 @@ $ nest g <schematic> <name> [options]
5353

5454
##### Schematics
5555

56-
| Name | Alias | Description |
57-
| ------------- | ----- | --------------------------------------------------------------------------------------------------- |
58-
| `app` | | Generate a new application within a monorepo (converting to monorepo if it's a standard structure). |
59-
| `library` | `lib` | Generate a new library within a monorepo (converting to monorepo if it's a standard structure). |
60-
| `class` | `cl` | Generate a new class. |
61-
| `controller` | `co` | Generate a controller declaration. |
62-
| `decorator` | `d` | Generate a custom decorator. |
63-
| `filter` | `f` | Generate a filter declaration. |
64-
| `gateway` | `ga` | Generate a gateway declaration. |
65-
| `guard` | `gu` | Generate a guard declaration. |
66-
| `interface` | | Generate an interface. |
67-
| `interceptor` | `in` | Generate an interceptor declaration. |
68-
| `middleware` | `mi` | Generate a middleware declaration. |
69-
| `module` | `mo` | Generate a module declaration. |
70-
| `pipe` | `pi` | Generate a pipe declaration. |
71-
| `provider` | `pr` | Generate a provider declaration. |
72-
| `resolver` | `r` | Generate a resolver declaration.
73-
| `resource` | `res` | Generate a new CRUD resource. See the [CRUD (resource) generator](/recipes/crud-generator) for more details. |
74-
| `service` | `s` | Generate a service declaration. |
56+
| Name | Alias | Description |
57+
| ------------- | ----- | ------------------------------------------------------------------------------------------------------------ |
58+
| `app` | | Generate a new application within a monorepo (converting to monorepo if it's a standard structure). |
59+
| `library` | `lib` | Generate a new library within a monorepo (converting to monorepo if it's a standard structure). |
60+
| `class` | `cl` | Generate a new class. |
61+
| `controller` | `co` | Generate a controller declaration. |
62+
| `decorator` | `d` | Generate a custom decorator. |
63+
| `filter` | `f` | Generate a filter declaration. |
64+
| `gateway` | `ga` | Generate a gateway declaration. |
65+
| `guard` | `gu` | Generate a guard declaration. |
66+
| `interface` | | Generate an interface. |
67+
| `interceptor` | `in` | Generate an interceptor declaration. |
68+
| `middleware` | `mi` | Generate a middleware declaration. |
69+
| `module` | `mo` | Generate a module declaration. |
70+
| `pipe` | `pi` | Generate a pipe declaration. |
71+
| `provider` | `pr` | Generate a provider declaration. |
72+
| `resolver` | `r` | Generate a resolver declaration. |
73+
| `resource` | `res` | Generate a new CRUD resource. See the [CRUD (resource) generator](/recipes/crud-generator) for more details. |
74+
| `service` | `s` | Generate a service declaration. |
7575

7676
##### Options
7777

@@ -158,10 +158,10 @@ Updates `@nestjs` dependencies in the `package.json` `"dependencies"` list to th
158158

159159
##### Options
160160

161-
| Option | Description |
162-
| --------- | ------------------------------------------------------------------------ |
163-
| `--force` | Do **upgrade** instead of update <br/>Alias `-f` |
164-
| `--tag` | Update to tagged version (use `@latest`, `@<tag>`, etc) <br/>Alias `-t` | |
161+
| Option | Description |
162+
| --------- | ----------------------------------------------------------------------- |
163+
| `--force` | Do **upgrade** instead of update <br/>Alias `-f` |
164+
| `--tag` | Update to tagged version (use `@latest`, `@<tag>`, etc) <br/>Alias `-t` |
165165

166166
#### nest info
167167

‎content/cli/workspaces.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ module.exports = {
279279
Since the webpack config file is a JavaScript file, you can even expose a function that takes default options and returns a modified object:
280280

281281
```javascript
282-
module.exports = function(options) {
282+
module.exports = function (options) {
283283
return {
284284
...options,
285285
externals: [],

0 commit comments

Comments
 (0)