Skip to content

Commit 209e44a

Browse files
kamilmysliwieckamilmysliwiec
committed
Merge branch 'master' of https://github.com/nestjs/nest 
2 parents 6f8d206 + 0af59a2 commit 209e44a

File tree

79 files changed

+10265
-12766
lines changed

Some content is hidden

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

79 files changed

+10265
-12766
lines changed

‎Readme.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ Nest is a framework for building efficient, scalable <a href="http://nodejs.org"
3838
* To check out the [guide](https://docs.nestjs.com), visit [docs.nestjs.com](https://docs.nestjs.com). :books:
3939
* 要查看中文 [指南](readme_zh.md), 请访问 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
4040
* [가이드](readme_kr.md)를 확인하려면, [docs.nestjs.com](https://docs.nestjs.com)를 방문하세요.:books:
41+
* チェックするには [ガイド](readme_jp.md), 詳しくは [docs.nestjs.com](https://docs.nestjs.com). :books:
4142

4243
## Questions
4344

@@ -65,6 +66,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
6566
#### Gold Sponsors
6667

6768
<table style="text-align:center;"><tr><td>
69+
<a href="https://careers.labster.com/departments/platform" target="_blank"><img src="https://nestjs.com/img/labster-logo.png" width="170" valign="middle" /></a></td><td>
6870
<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td></tr></table>
6971

7072
#### Silver Sponsors
@@ -73,7 +75,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
7375
<a href="https://neoteric.eu/" target="_blank"><img src="https://nestjs.com/img/neoteric-cut.png" width="120" valign="middle" /></a> </td><td>
7476
<a href="http://gojob.com" target="_blank"><img src="http://nestjs.com/img/gojob-logo.png" valign="middle" width="100" /></a> </td><td>
7577
<a href="http://www.leogistics.com" target="_blank"><img src="https://nestjs.com/img/leogistics-logo.jpeg" width="150" valign="middle" /></td><td>
76-
<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td></tr></table>
78+
<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td><td>
79+
<a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td></tr></table>
7780

7881
#### Sponsors
7982

@@ -101,6 +104,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
101104
<td align="center" valign="middle"><a href="https://thestandarddaily.com/" target="_blank"><img src="https://nestjs.com/img/the-standard-daily-logo.png" width="180" valign="middle" /></a></td>
102105
<td align="center" valign="middle"><a href="https://houseofangular.io/" target="_blank"><img src="https://nestjs.com/img/house-of-angular.png" width="100" valign="middle" /></a></td>
103106
<td align="center" valign="middle"><a href="https://rocketech.it/cases/?utm_source=google&utm_medium=badge&utm_campaign=nestjs" target="_blank"><img src="https://nestjs.com/img/rocketech-logo.svg" width="110" valign="middle" /></a></td>
107+
<td align="center" valign="middle"><a href="https://www.bystored.com/" target="_blank"><img src="https://nestjs.com/img/stored-logo.svg" width="110" valign="middle" /></a></td>
108+
<td align="center" valign="middle"><a href="https://studyclerk.com/pay-for-research-paper" target="_blank"><img src="https://nestjs.com/img/studyclerk-logo.png" width="125" valign="middle" /></a></td>
104109
</tr></table>
105110

106111
## Backers

‎integration/docker-compose.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
- "9001:9001"
2424
restart: always
2525
mysql:
26-
image: mysql:5.7.33
26+
image: mysql:5.7.34
2727
environment:
2828
MYSQL_ROOT_PASSWORD: root
2929
MYSQL_DATABASE: test
@@ -48,7 +48,7 @@ services:
4848
zookeeper:
4949
container_name: test-zookeeper
5050
hostname: zookeeper
51-
image: confluentinc/cp-zookeeper:5.5.3
51+
image: confluentinc/cp-zookeeper:6.1.1
5252
ports:
5353
- "2181:2181"
5454
environment:
@@ -57,7 +57,7 @@ services:
5757
kafka:
5858
container_name: test-kafka
5959
hostname: kafka
60-
image: confluentinc/cp-kafka:5.5.3
60+
image: confluentinc/cp-kafka:6.1.1
6161
depends_on:
6262
- zookeeper
6363
ports:

‎package-lock.json

+1,955-2,560
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+37-37
Original file line numberDiff line numberDiff line change
@@ -59,113 +59,113 @@
5959
"cli-color": "2.0.0",
6060
"cors": "2.8.5",
6161
"express": "4.17.1",
62-
"fast-json-stringify": "2.5.2",
62+
"fast-json-stringify": "2.7.3",
6363
"fast-safe-stringify": "2.0.7",
6464
"iterare": "1.2.1",
6565
"object-hash": "2.1.1",
6666
"path-to-regexp": "3.2.0",
6767
"reflect-metadata": "0.1.13",
68-
"rxjs": "6.6.6",
68+
"rxjs": "6.6.7",
6969
"socket.io": "2.4.1",
70-
"tslib": "2.1.0",
70+
"tslib": "2.2.0",
7171
"uuid": "8.3.2"
7272
},
7373
"devDependencies": {
7474
"@codechecks/client": "0.1.10",
75-
"@commitlint/cli": "12.0.1",
76-
"@commitlint/config-angular": "12.0.1",
77-
"@grpc/proto-loader": "0.5.6",
78-
"@nestjs/graphql": "7.10.3",
75+
"@commitlint/cli": "12.1.4",
76+
"@commitlint/config-angular": "12.1.4",
77+
"@grpc/proto-loader": "0.6.2",
78+
"@nestjs/graphql": "7.10.6",
7979
"@nestjs/mongoose": "7.2.4",
8080
"@nestjs/typeorm": "7.1.5",
8181
"@types/amqplib": "0.5.17",
8282
"@types/bytes": "3.1.0",
8383
"@types/cache-manager": "3.4.0",
84-
"@types/chai": "4.2.15",
85-
"@types/chai-as-promised": "7.1.3",
84+
"@types/chai": "4.2.18",
85+
"@types/chai-as-promised": "7.1.4",
8686
"@types/cors": "2.8.10",
8787
"@types/express": "4.17.11",
8888
"@types/gulp": "4.0.8",
8989
"@types/mocha": "8.2.2",
90-
"@types/mongoose": "5.10.4",
91-
"@types/node": "14.14.35",
90+
"@types/mongoose": "5.10.5",
91+
"@types/node": "14.14.45",
9292
"@types/redis": "2.8.28",
9393
"@types/reflect-metadata": "0.1.0",
94-
"@types/sinon": "9.0.11",
94+
"@types/sinon": "10.0.0",
9595
"@types/socket.io": "2.1.13",
96-
"@types/ws": "7.4.0",
97-
"@typescript-eslint/eslint-plugin": "4.19.0",
98-
"@typescript-eslint/parser": "4.19.0",
96+
"@types/ws": "7.4.4",
97+
"@typescript-eslint/eslint-plugin": "4.23.0",
98+
"@typescript-eslint/parser": "4.23.0",
9999
"amqp-connection-manager": "3.2.2",
100100
"amqplib": "0.7.1",
101-
"apollo-server-express": "2.22.1",
102-
"artillery": "1.6.2",
101+
"apollo-server-express": "2.24.0",
102+
"artillery": "1.7.2",
103103
"awesome-typescript-loader": "5.2.1",
104104
"body-parser": "1.19.0",
105105
"bytes": "3.1.0",
106-
"cache-manager": "3.4.1",
106+
"cache-manager": "3.4.3",
107107
"chai": "4.3.4",
108108
"chai-as-promised": "7.1.1",
109109
"clang-format": "1.5.0",
110110
"commitlint-circle": "1.0.0",
111-
"concurrently": "6.0.0",
111+
"concurrently": "6.1.0",
112112
"conventional-changelog": "3.1.24",
113-
"core-js": "3.9.1",
113+
"core-js": "3.12.1",
114114
"coveralls": "3.1.0",
115115
"delete-empty": "3.0.0",
116-
"engine.io-client": "5.0.0",
117-
"eslint": "7.22.0",
118-
"eslint-config-prettier": "8.1.0",
116+
"engine.io-client": "5.1.1",
117+
"eslint": "7.26.0",
118+
"eslint-config-prettier": "8.3.0",
119119
"eslint-plugin-import": "2.22.1",
120120
"eventsource": "1.1.0",
121121
"fancy-log": "1.3.3",
122122
"fastify": "3.14.0",
123-
"fastify-cors": "5.2.0",
123+
"fastify-cors": "6.0.1",
124124
"fastify-formbody": "5.0.0",
125-
"fastify-multipart": "4.0.3",
125+
"fastify-multipart": "4.0.5",
126126
"fastify-static": "4.0.1",
127127
"graphql": "15.5.0",
128-
"graphql-tools": "7.0.4",
129-
"grpc": "1.24.6",
128+
"graphql-tools": "7.0.5",
129+
"grpc": "1.24.9",
130130
"gulp": "4.0.2",
131131
"gulp-clang-format": "1.0.27",
132132
"gulp-clean": "0.4.0",
133133
"gulp-sourcemaps": "3.0.0",
134134
"gulp-typescript": "5.0.1",
135135
"gulp-watch": "5.0.1",
136-
"husky": "5.2.0",
136+
"husky": "6.0.0",
137137
"imports-loader": "2.0.0",
138138
"json-loader": "0.5.7",
139139
"kafkajs": "1.15.0",
140140
"lerna": "2.11.0",
141141
"light-my-request": "4.4.1",
142-
"lint-staged": "10.5.4",
142+
"lint-staged": "11.0.0",
143143
"markdown-table": "2.0.0",
144144
"merge-graphql-schemas": "1.7.8",
145145
"middie": "5.2.0",
146-
"mocha": "8.3.2",
147-
"mongoose": "5.12.2",
146+
"mocha": "8.4.0",
147+
"mongoose": "5.12.8",
148148
"mqtt": "4.2.6",
149149
"multer": "1.4.2",
150150
"mysql": "2.18.1",
151151
"nats": "1.4.12",
152152
"nodemon": "2.0.7",
153153
"nyc": "15.1.0",
154154
"point-of-view": "4.14.0",
155-
"prettier": "2.2.1",
156-
"redis": "3.0.2",
157-
"rxjs-compat": "6.6.6",
155+
"prettier": "2.3.0",
156+
"redis": "3.1.2",
157+
"rxjs-compat": "6.6.7",
158158
"sinon": "10.0.0",
159159
"sinon-chai": "3.6.0",
160160
"socket.io-client": "2.4.0",
161161
"subscriptions-transport-ws": "0.9.18",
162162
"supertest": "6.1.3",
163163
"ts-morph": "10.0.2",
164164
"ts-node": "9.1.1",
165-
"typeorm": "0.2.31",
166-
"typescript": "4.2.3",
165+
"typeorm": "0.2.32",
166+
"typescript": "4.2.4",
167167
"wrk": "1.2.1",
168-
"ws": "7.4.4"
168+
"ws": "7.4.5"
169169
},
170170
"engines": {
171171
"node": ">= 10.13.0"

‎packages/common/enums/http-status.enum.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export enum HttpStatus {
1+
export const enum HttpStatus {
22
CONTINUE = 100,
33
SWITCHING_PROTOCOLS = 101,
44
PROCESSING = 102,

‎packages/common/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dependencies": {
2020
"axios": "0.21.1",
2121
"iterare": "1.2.1",
22-
"tslib": "2.1.0",
22+
"tslib": "2.2.0",
2323
"uuid": "8.3.2"
2424
},
2525
"peerDependencies": {

‎packages/core/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"iterare": "1.2.1",
3333
"object-hash": "2.1.1",
3434
"path-to-regexp": "3.2.0",
35-
"tslib": "2.1.0",
35+
"tslib": "2.2.0",
3636
"uuid": "8.3.2"
3737
},
3838
"devDependencies": {

‎packages/core/router/router-execution-context.ts

+2
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,8 @@ export class RouterExecutionContext {
343343
type === RouteParamtypes.BODY ||
344344
type === RouteParamtypes.QUERY ||
345345
type === RouteParamtypes.PARAM ||
346+
type === RouteParamtypes.FILE ||
347+
type === RouteParamtypes.FILES ||
346348
isString(type)
347349
);
348350
}

‎packages/core/test/router/router-execution-context.spec.ts

+2
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ describe('RouterExecutionContext', () => {
262262
expect(contextCreator.isPipeable(RouteParamtypes.BODY)).to.be.true;
263263
expect(contextCreator.isPipeable(RouteParamtypes.QUERY)).to.be.true;
264264
expect(contextCreator.isPipeable(RouteParamtypes.PARAM)).to.be.true;
265+
expect(contextCreator.isPipeable(RouteParamtypes.FILE)).to.be.true;
266+
expect(contextCreator.isPipeable(RouteParamtypes.FILES)).to.be.true;
265267
expect(contextCreator.isPipeable('custom')).to.be.true;
266268
});
267269
});

‎packages/microservices/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"dependencies": {
2020
"iterare": "1.2.1",
2121
"json-socket": "0.3.0",
22-
"tslib": "2.1.0"
22+
"tslib": "2.2.0"
2323
},
2424
"devDependencies": {
2525
"@nestjs/common": "7.6.15",

‎packages/platform-express/multer/interfaces/files-upload-module.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Type } from '@nestjs/common';
22
import { ModuleMetadata } from '@nestjs/common/interfaces';
3-
import { MulterOptions } from '../interfaces/multer-options.interface';
3+
import { MulterOptions } from './multer-options.interface';
44

55
export type MulterModuleOptions = MulterOptions;
66

‎packages/platform-express/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"cors": "2.8.5",
2222
"express": "4.17.1",
2323
"multer": "1.4.2",
24-
"tslib": "2.1.0"
24+
"tslib": "2.2.0"
2525
},
2626
"devDependencies": {
2727
"@nestjs/common": "7.6.15",

‎packages/platform-fastify/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
},
1919
"dependencies": {
2020
"fastify": "3.14.0",
21-
"fastify-cors": "5.2.0",
21+
"fastify-cors": "6.0.1",
2222
"fastify-formbody": "5.0.0",
2323
"light-my-request": "4.4.1",
2424
"middie": "5.2.0",
2525
"path-to-regexp": "3.2.0",
26-
"tslib": "2.1.0"
26+
"tslib": "2.2.0"
2727
},
2828
"peerDependencies": {
2929
"@nestjs/common": "^7.0.0",

‎packages/platform-socket.io/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"socket.io": "2.4.1",
21-
"tslib": "2.1.0"
21+
"tslib": "2.2.0"
2222
},
2323
"peerDependencies": {
2424
"@nestjs/common": "^7.0.0",

‎packages/platform-ws/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"access": "public"
1818
},
1919
"dependencies": {
20-
"tslib": "2.1.0",
21-
"ws": "7.4.4"
20+
"tslib": "2.2.0",
21+
"ws": "7.4.5"
2222
},
2323
"peerDependencies": {
2424
"@nestjs/common": "^7.0.0",

‎packages/testing/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
},
1919
"dependencies": {
2020
"optional": "0.1.4",
21-
"tslib": "2.1.0"
21+
"tslib": "2.2.0"
2222
},
2323
"peerDependencies": {
2424
"@nestjs/common": "^7.0.0",

‎packages/websockets/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"dependencies": {
1515
"iterare": "1.2.1",
16-
"tslib": "2.1.0"
16+
"tslib": "2.2.0"
1717
},
1818
"devDependencies": {
1919
"@nestjs/common": "7.6.15",

‎readme_jp.md

+11-10
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,50 @@
2222
<!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
2323
[![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
2424

25-
## Description
25+
## 概要
2626

2727
すばやくスケーラブルなサーバーサイドアプリケーションを構築するための革新的な<a href="http://nodejs.org" target="_blank">Node.js</a>フレームワークです。最新のJavaScriptを使用し、<a href="http://www.typescriptlang.org" target="_blank">TypeScript</a>（JavaScriptを拡張したスーパーセット）で構築され 、OOP（オブジェクト指向プログラミング）、FP（関数型プログラミング）、およびFRP（関数型リアクティブプログラミング）の要素を取り入れています。
2828

2929
<p>Nestは<a href="https://expressjs.com/" target="_blank">Express</a>(デフォルト)や<a href="https://github.com/fastify/fastify" target="_blank">Fastify</a>などのさまざまなライブラリとの互換性を提供することで、たくさんのサードパーティプラグインを簡単に使用することができます。
3030
</p>
3131

32-
## Philosophy
32+
## 哲学
3333

3434
<p>
3535
近年、Node.jsの発展によって、JavaScriptはフロントエンドとバックエンドの両方でWebの「共通言語」になりました。そしてフロントエンドでは、<a href="https://angular.io/" target="_blank">Angular</a>、<a href="https://github.com/facebook/react" target="_blank">React</a>、<a href="https://github.com/vuejs/vue" target="_blank">Vue</a>などの素晴らしいプロジェクトが生まれ、開発効率が飛躍的に向上しました。一方で、サーバーサイドでは、Node.jsエコシステム上に優れたライブラリ、ヘルパー、ツールがたくさんありますが、それらのどれもが主要な問題であるアーキテクチャを効果的に解決するものではありませんでした。
3636
</p>
3737

3838
<p>Nestは、実用的なアーキテクチャをすぐに構築できることを目的としています。具体的には、テストフレンドリーで、スケーラブルで、疎結合で、運用にやさしいアプリケーションを構築できるようになっています。また、アーキテクチャはAngularにインスパイアされています。</p>
3939

40-
## Getting started
40+
## 入門
4141

4242
* To check out the [guide](https://docs.nestjs.com), visit [docs.nestjs.com](https://docs.nestjs.com). :books:
4343
* 要查看中文 [指南](readme_zh.md), 请访问 [docs.nestjs.cn](https://docs.nestjs.cn). :books:
44-
* 日本語ガイドは現在準備中です。 :books:
44+
* [가이드](readme_kr.md)를 확인하려면, [docs.nestjs.com](https://docs.nestjs.com)를 방문하세요.:books:
45+
* チェックするには [ガイド](readme_jp.md), 詳しくは [docs.nestjs.com](https://docs.nestjs.com).:books:
4546

46-
## Questions
47+
## 質問
4748

4849
質問やサポートについては、公式の[Discordチャンネル](https://discord.gg/G7Qnnhy)を使用してください。また、このリポジトリのissueリストは、バグレポートと機能リクエスト **専用** です。
4950

50-
## Issues
51+
## 問題(Issues)
5152

5253
issueを開く前に、必ず[Issue Reporting Checklist](https://github.com/nestjs/nest/blob/master/CONTRIBUTING.md#-submitting-an-issue)をお読みください。ガイドラインに準拠していないissueは、クローズされる場合があります。
5354

54-
## Consulting
55+
## コンサルティング
5556

5657
公式サポートを利用することで、Nestコアチームからのテクニカルサポート、移行戦略、ベストプラクティスの提供、アーキテクチャの相談、PRレビュー、メンタリングを受けることができます。詳しくは[こちら](https://enterprise.nestjs.com)をご覧ください。
5758

58-
## Support
59+
## サポート
5960

6061
Nestは、MITライセンスのオープンソースプロジェクトです。スポンサーと支援者による素晴らしいサポートによって、その発展を支えられています。参加したい場合は[こちら](https://docs.nestjs.com/support)をご覧ください。
6162

62-
## Stay in touch
63+
## 連絡する
6364

6465
* Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
6566
* Website - [https://nestjs.com](https://nestjs.com/)
6667
* Twitter - [@nestframework](https://twitter.com/nestframework)
6768

68-
## License
69+
## ライセンス
6970

7071
Nest is [MIT licensed](LICENSE).

0 commit comments

Comments
 (0)