Skip to content

Commit 2343f01

Browse files
authored
Merge branch 'master' into feature/message-pattern-bind-transport
2 parents 3bbcf1c + 8cb2d73 commit 2343f01

File tree

83 files changed

+5671
-3498
lines changed

Some content is hidden

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

83 files changed

+5671
-3498
lines changed
File renamed without changes.

.github/workflows/lighthouse.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Lighthouse
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'content/**/*.md'
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@v1
14+
- name: Use Node.js 12.x
15+
uses: actions/setup-node@v1
16+
with:
17+
node-version: 12.x
18+
# Build needs around 400 seconds on Netlify.
19+
# We can not rely on "Waiting for 200", since the user
20+
# might push another commit to an existing PR, meaning
21+
# the deploy preview is already online.
22+
- name: Sleep 400 seconds
23+
run: sleep 400
24+
- name: Waiting for 200 from the Netlify Preview
25+
uses: jakepartusch/wait-for-netlify-action@v1
26+
id: wait-for-netflify-preview
27+
with:
28+
site_name: 'docs-nestjs'
29+
max_timeout: 600
30+
- name: Run Lighthouse on urls and validate with lighthouserc
31+
uses: treosh/lighthouse-ci-action@v2
32+
with:
33+
urls: |
34+
${{ steps.wait-for-netflify-preview.outputs.url }}
35+
${{ steps.wait-for-netflify-preview.outputs.url }}/first-steps
36+
runs: 5
37+
configPath: './lighthouserc.json'
38+
uploadArtifacts: true
39+
temporaryPublicStorage: true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.16.3
1+
12.18.3

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
"schematics": {
132132
"@schematics/angular:component": {
133133
"prefix": "app",
134-
"styleext": "scss"
134+
"style": "scss"
135135
},
136136
"@schematics/angular:directive": {
137137
"prefix": "app"

content/cli/overview.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Read the sections on [Workspaces](/cli/monorepo) and [Libraries](/cli/libraries)
5858

5959
<app-banner-courses></app-banner-courses>
6060

61-
### CLI command syntax
61+
#### CLI command syntax
6262

6363
All `nest` commands follow the same format:
6464

@@ -80,7 +80,7 @@ $ nest n my-nest-project -d
8080

8181
Most commands, and some options, have aliases. Try running `nest new --help` to see these options and aliases, and to confirm your understanding of the above constructs.
8282

83-
### Command overview
83+
#### Command overview
8484

8585
Run `nest <command> --help` for any of the following commands to see command-specific options.
8686

content/cli/scripts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A Nest application is a **standard** TypeScript application that needs to be com
1010

1111
This goal is accomplished through a combination of the `nest` command, a locally installed TypeScript compiler, and `package.json` scripts. We describe how these technologies work together below. This should help you understand what's happening at each step of the build/execute process, and how to customize that behavior if necessary.
1212

13-
### The nest binary
13+
#### The nest binary
1414

1515
The `nest` command is an OS level binary (i.e., runs from the OS command line). This command actually encompasses 3 distinct areas, described below. We recommend that you run the build (`nest build`) and execution (`nest start`) sub-commands via the `package.json` scripts provided automatically when a project is scaffolded (see [typescript starter](https://github.com/nestjs/typescript-starter) if you wish to start by cloning a repo, instead of running `nest new`).
1616

@@ -30,7 +30,7 @@ See the [nest start](https://docs.nestjs.com/cli/usages#nest-start) documentatio
3030

3131
The `nest generate` commands, as the name implies, generate new Nest projects, or components within them.
3232

33-
### Package scripts
33+
#### Package scripts
3434

3535
Running the `nest` commands at the OS command level requires that the `nest` binary be installed globally. This is a standard feature of npm, and outside of Nest's direct control. One consequence of this is that the globally installed `nest` binary is **not** managed as a project dependency in `package.json`. For example, two different developers can be running two different versions of the `nest` binary. The standard solution for this is to use package scripts so that you can treat the tools used in the build and execute steps as development dependencies.
3636

@@ -54,11 +54,11 @@ These commands use npm's script running capabilities to execute `nest build` or
5454

5555
For most developers/teams, it is recommended to utilize the package scripts for building and executing their Nest projects. You can fully customize the behavior of these scripts via their options (`--path`, `--webpack`, `--webpackPath`) and/or customize the `tsc` or webpack compiler options files (e.g., `tsconfig.json`) as needed. You are also free to run a completely custom build process to compile the TypeScript (or even to execute TypeScript directly with `ts-node`).
5656

57-
### Backward compatibility
57+
#### Backward compatibility
5858

5959
Because Nest applications are pure TypeScript applications, previous versions of the Nest build/execute scripts will continue to operate. You are not required to upgrade them. You can choose to take advantage of the new `nest build` and `nest start` commands when you are ready, or continue running previous or customized scripts.
6060

61-
### Migration
61+
#### Migration
6262

6363
While you are not required to make any changes, you may want to migrate to using the new CLI commands instead of using tools such as `tsc-watch` or `ts-node`. In this case, simply install the latest version of the `@nestjs/cli`, both globally and locally:
6464

content/cli/usages.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Updates `@nestjs` dependencies in the `package.json` `"dependencies"` list to th
160160
| Option | Description |
161161
| --------- | ------------------------------------------------------------------------ |
162162
| `--force` | Do **upgrade** instead of update <br/>Alias `-f` |
163-
| `--tag` | Update to tagged version (use `@latest`, `@<tag>`, etc) <br/>Alias `-wt` | |
163+
| `--tag` | Update to tagged version (use `@latest`, `@<tag>`, etc) <br/>Alias `-t` | |
164164

165165
#### nest info
166166

content/controllers.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -442,37 +442,38 @@ export class CatsController {
442442
}
443443
}
444444
@@switch
445-
import { Controller, Get, Query, Post, Body, Put, Param, Delete } from '@nestjs/common';
445+
import { Controller, Get, Query, Post, Body, Put, Param, Delete, Bind } from '@nestjs/common';
446446
447447
@Controller('cats')
448448
export class CatsController {
449449
@Post()
450450
@Bind(Body())
451-
create(@Body() createCatDto) {
451+
create(createCatDto) {
452452
return 'This action adds a new cat';
453453
}
454454
455455
@Get()
456456
@Bind(Query())
457-
findAll(@Query() query) {
457+
findAll(query) {
458+
console.log(query);
458459
return `This action returns all cats (limit: ${query.limit} items)`;
459460
}
460461
461462
@Get(':id')
462463
@Bind(Param('id'))
463-
findOne(@Param('id') id) {
464+
findOne(id) {
464465
return `This action returns a #${id} cat`;
465466
}
466467
467468
@Put(':id')
468469
@Bind(Param('id'), Body())
469-
update(@Param('id') id, @Body() updateCatDto) {
470+
update(id, updateCatDto) {
470471
return `This action updates a #${id} cat`;
471472
}
472473
473474
@Delete(':id')
474475
@Bind(Param('id'))
475-
remove(@Param('id') id) {
476+
remove(id) {
476477
return `This action removes a #${id} cat`;
477478
}
478479
}

content/custom-decorators.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Nest is built around a language feature called **decorators**. Decorators are a
55
<blockquote class="external">
66
An ES2016 decorator is an expression which returns a function and can take a target, name and property descriptor as arguments.
77
You apply it by prefixing the decorator with an <code>@</code> character and placing this at the very top of what
8-
you are trying to decorate. Decorators can be defined for either a class or a property.
8+
you are trying to decorate. Decorators can be defined for either a class, a method or a property.
99
</blockquote>
1010

1111
#### Param decorators

content/discover/who-uses.json

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"logo": "/assets/logo/sanofi.png",
44-
"url": "https://www.sanofi.com/"
44+
"url": "https://github.com/Sanofi-IADC"
4545
},
4646
{
4747
"logo": "https://nestjs.com/img/valor-software.png",
@@ -151,6 +151,26 @@
151151
"logo": "/assets/logo/bedu.svg",
152152
"url": "https://bedu.org",
153153
"width": "100px"
154+
},
155+
{
156+
"logo": "/assets/logo/shopback.png",
157+
"url": "https://shopback.com",
158+
"width": "100px"
159+
},
160+
{
161+
"logo": "/assets/logo/facile.png",
162+
"url": "https://www.facile.it",
163+
"width": "100px"
164+
},
165+
{
166+
"logo": "/assets/logo/interfacewerk.png",
167+
"url": "https://interfacewerk.de",
168+
"width": "130px"
169+
},
170+
{
171+
"logo": "/assets/logo/ottonova.png",
172+
"url": "https://www.ottonova.de",
173+
"width": "130px"
154174
}
155175
],
156176
"Body": [
@@ -194,6 +214,10 @@
194214
"https://creatorsdaily.com",
195215
"https://autoscar.com.br",
196216
"https://www.mediktiv.com",
197-
"https://harmonize.health"
217+
"https://harmonize.health",
218+
"https://accerlery.be",
219+
"https://www.facile.it",
220+
"https://shopback.com",
221+
"https://www.ottonova.de"
198222
]
199223
}

0 commit comments

Comments
 (0)