Skip to content

Commit

Permalink
chore(): resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Jun 15, 2022
2 parents e3ddfaf + 36eda24 commit 7501e3f
Show file tree
Hide file tree
Showing 34 changed files with 4,505 additions and 6,590 deletions.
7 changes: 4 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
<td>
<a href="https://nx.dev" target="_blank"><img src="https://nestjs.com/img/nx-logo.png" height="45" valign="middle" /></a></td>
<td>
<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>
<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><td>
<a href="https://amplication.com/" target="_blank"><img src="https://nestjs.com/img/amplication-logo.svg" width="190" valign="middle" /></a></td>
</tr></table>

#### Gold Sponsors

<table style="text-align:center;"><tr><td>
<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>
<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
<td>
<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
<td>
<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td><td>
<a href="https://fuseautotech.com/" target="_blank"><img src="https://nestjs.com/img/fuse-logo.svg" width="105" valign="middle" /></a></td></</tr></table>

#### Silver Sponsors

Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"packages": [
"packages/*"
],
"version": "8.4.5"
"version": "8.4.7"
}
467 changes: 280 additions & 187 deletions package-lock.json

Large diffs are not rendered by default.

49 changes: 25 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"cli-color": "2.0.2",
"cors": "2.8.5",
"express": "4.18.1",
"fast-json-stringify": "3.2.0",
"fast-json-stringify": "4.2.0",
"fast-safe-stringify": "2.1.1",
"graphql-subscriptions": "2.0.0",
"iterare": "1.2.1",
Expand All @@ -72,51 +72,51 @@
},
"devDependencies": {
"@codechecks/client": "0.1.12",
"@commitlint/cli": "17.0.1",
"@commitlint/cli": "17.0.2",
"@commitlint/config-angular": "17.0.0",
"@fastify/cors": "7.0.0",
"@fastify/formbody": "6.0.0",
"@fastify/multipart": "6.0.0",
"@fastify/static": "5.0.0",
"@grpc/grpc-js": "1.6.7",
"@grpc/proto-loader": "0.6.12",
"@nestjs/apollo": "10.0.13",
"@nestjs/graphql": "10.0.13",
"@nestjs/mongoose": "9.1.0",
"@grpc/proto-loader": "0.6.13",
"@nestjs/apollo": "10.0.14",
"@nestjs/graphql": "10.0.15",
"@nestjs/mongoose": "9.1.1",
"@nestjs/typeorm": "8.0.4",
"@types/amqplib": "0.8.2",
"@types/bytes": "3.1.1",
"@types/cache-manager": "3.4.3",
"@types/cache-manager": "4.0.0",
"@types/chai": "4.3.1",
"@types/chai-as-promised": "7.1.5",
"@types/cors": "2.8.12",
"@types/express": "4.17.13",
"@types/gulp": "4.0.9",
"@types/http-errors": "1.8.2",
"@types/mocha": "9.1.1",
"@types/node": "17.0.36",
"@types/node": "17.0.43",
"@types/reflect-metadata": "0.1.0",
"@types/sinon": "10.0.11",
"@types/supertest": "2.0.12",
"@types/ws": "8.5.3",
"@typescript-eslint/eslint-plugin": "4.33.0",
"@typescript-eslint/parser": "4.33.0",
"amqp-connection-manager": "4.1.3",
"amqplib": "0.9.1",
"apollo-server-core": "3.8.1",
"apollo-server-express": "3.8.1",
"amqplib": "0.10.0",
"apollo-server-core": "3.8.2",
"apollo-server-express": "3.8.2",
"artillery": "1.7.9",
"body-parser": "1.20.0",
"bytes": "3.1.2",
"cache-manager": "3.6.3",
"cache-manager": "4.0.1",
"cache-manager-redis-store": "2.0.0",
"chai": "4.3.6",
"chai-as-promised": "7.1.1",
"clang-format": "1.8.0",
"commitlint-circle": "1.0.0",
"concurrently": "7.2.1",
"concurrently": "7.2.2",
"conventional-changelog": "3.1.25",
"core-js": "3.22.7",
"core-js": "3.23.1",
"coveralls": "3.1.1",
"delete-empty": "3.0.0",
"engine.io-client": "6.2.2",
Expand All @@ -127,7 +127,7 @@
"fancy-log": "2.0.0",
"fastify": "3.29.0",
"graphql": "15.8.0",
"graphql-tools": "8.2.11",
"graphql-tools": "8.2.12",
"gulp": "4.0.2",
"gulp-clang-format": "1.0.27",
"gulp-clean": "0.4.0",
Expand All @@ -139,36 +139,37 @@
"imports-loader": "4.0.0",
"ioredis": "5.0.4",
"json-loader": "0.5.7",
"kafkajs": "2.0.1",
"kafkajs": "2.0.2",
"lerna": "2.11.0",
"lerna-changelog": "2.2.0",
"light-my-request": "5.0.0",
"lint-staged": "12.4.3",
"lint-staged": "13.0.1",
"markdown-table": "2.0.0",
"merge-graphql-schemas": "1.7.8",
"middie": "6.1.0",
"mocha": "10.0.0",
"mongoose": "6.3.5",
"mongoose": "6.3.8",
"mqtt": "4.3.7",
"multer": "1.4.4",
"mysql2": "2.3.3",
"nats": "2.7.1",
"nodemon": "2.0.16",
"nyc": "15.1.0",
"point-of-view": "5.3.0",
"prettier": "2.6.2",
"point-of-view": "6.3.0",
"prettier": "2.7.0",
"redis": "3.1.2",
"rxjs-compat": "6.6.7",
"sinon": "14.0.0",
"sinon-chai": "3.7.0",
"socket.io-client": "4.5.1",
"subscriptions-transport-ws": "0.11.0",
"supertest": "6.2.3",
"ts-morph": "15.0.0",
"ts-node": "10.8.0",
"ts-morph": "15.1.0",
"ts-node": "10.8.1",
"typeorm": "0.2.45",
"typescript": "4.7.2",
"typescript": "4.7.3",
"wrk": "1.2.1",
"ws": "8.7.0"
"ws": "8.8.0"
},
"engines": {
"node": ">= 12.9.0"
Expand Down
7 changes: 4 additions & 3 deletions packages/common/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
<td>
<a href="https://nx.dev" target="_blank"><img src="https://nestjs.com/img/nx-logo.png" height="45" valign="middle" /></a></td>
<td>
<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>
<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><td>
<a href="https://amplication.com/" target="_blank"><img src="https://nestjs.com/img/amplication-logo.svg" width="190" valign="middle" /></a></td>
</tr></table>

#### Gold Sponsors

<table style="text-align:center;"><tr><td>
<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>
<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
<td>
<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
<td>
<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td><td>
<a href="https://fuseautotech.com/" target="_blank"><img src="https://nestjs.com/img/fuse-logo.svg" width="105" valign="middle" /></a></td></</tr></table>

#### Silver Sponsors

Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestjs/common",
"version": "8.4.5",
"version": "8.4.7",
"description": "Nest - modern, fast, powerful node.js web framework (@common)",
"author": "Kamil Mysliwiec",
"homepage": "https://nestjs.com",
Expand Down
23 changes: 18 additions & 5 deletions packages/common/pipes/validation.pipe.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { iterate } from 'iterare';
import { types } from 'util';
import { Optional } from '../decorators';
import { Injectable } from '../decorators/core';
import { HttpStatus } from '../enums/http-status.enum';
Expand Down Expand Up @@ -190,12 +191,24 @@ export class ValidationPipe implements PipeTransform<any> {
return isNil(value) ? {} : value;
}

protected stripProtoKeys(value: Record<string, any>) {
protected stripProtoKeys(value: any) {
if (
value == null ||
typeof value !== 'object' ||
types.isTypedArray(value)
) {
return;
}
if (Array.isArray(value)) {
for (const v of value) {
this.stripProtoKeys(v);
}
return;
}
delete value.__proto__;
const keys = Object.keys(value);
iterate(keys)
.filter(key => isObject(value[key]) && value[key])
.forEach(key => this.stripProtoKeys(value[key]));
for (const key in value) {
this.stripProtoKeys(value[key]);
}
}

protected isPrimitive(value: unknown): boolean {
Expand Down
7 changes: 4 additions & 3 deletions packages/core/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
<td>
<a href="https://nx.dev" target="_blank"><img src="https://nestjs.com/img/nx-logo.png" height="45" valign="middle" /></a></td>
<td>
<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>
<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><td>
<a href="https://amplication.com/" target="_blank"><img src="https://nestjs.com/img/amplication-logo.svg" width="190" valign="middle" /></a></td>
</tr></table>

#### Gold Sponsors

<table style="text-align:center;"><tr><td>
<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>
<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
<td>
<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
<td>
<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td><td>
<a href="https://fuseautotech.com/" target="_blank"><img src="https://nestjs.com/img/fuse-logo.svg" width="105" valign="middle" /></a></td></</tr></table>

#### Silver Sponsors

Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestjs/core",
"version": "8.4.5",
"version": "8.4.7",
"description": "Nest - modern, fast, powerful node.js web framework (@core)",
"author": "Kamil Mysliwiec",
"license": "MIT",
Expand Down Expand Up @@ -36,7 +36,7 @@
"uuid": "8.3.2"
},
"devDependencies": {
"@nestjs/common": "8.4.5"
"@nestjs/common": "8.4.7"
},
"peerDependencies": {
"@nestjs/common": "^8.0.0",
Expand Down
7 changes: 4 additions & 3 deletions packages/microservices/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
<td>
<a href="https://nx.dev" target="_blank"><img src="https://nestjs.com/img/nx-logo.png" height="45" valign="middle" /></a></td>
<td>
<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>
<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><td>
<a href="https://amplication.com/" target="_blank"><img src="https://nestjs.com/img/amplication-logo.svg" width="190" valign="middle" /></a></td>
</tr></table>

#### Gold Sponsors

<table style="text-align:center;"><tr><td>
<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>
<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
<td>
<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
<td>
<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td><td>
<a href="https://fuseautotech.com/" target="_blank"><img src="https://nestjs.com/img/fuse-logo.svg" width="105" valign="middle" /></a></td></</tr></table>

#### Silver Sponsors

Expand Down
3 changes: 3 additions & 0 deletions packages/microservices/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ export const MQTT_WILDCARD_ALL = '#';
export const ECONNREFUSED = 'ECONNREFUSED';
export const CONN_ERR = 'CONN_ERR';
export const EADDRINUSE = 'EADDRINUSE';

export const CONNECTION_FAILED_MESSAGE =
'Connection to transport failed. Trying to reconnect...';
1 change: 1 addition & 0 deletions packages/microservices/ctx-host/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export * from './nats.context';
export * from './redis.context';
export * from './rmq.context';
export * from './tcp.context';
export * from './base-rpc.context';
6 changes: 3 additions & 3 deletions packages/microservices/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestjs/microservices",
"version": "8.4.5",
"version": "8.4.7",
"description": "Nest - modern, fast, powerful node.js web framework (@microservices)",
"author": "Kamil Mysliwiec",
"license": "MIT",
Expand All @@ -21,8 +21,8 @@
"tslib": "2.4.0"
},
"devDependencies": {
"@nestjs/common": "8.4.5",
"@nestjs/core": "8.4.5"
"@nestjs/common": "8.4.7",
"@nestjs/core": "8.4.7"
},
"peerDependencies": {
"@grpc/grpc-js": "*",
Expand Down
8 changes: 7 additions & 1 deletion packages/microservices/server/server-rmq.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import {
} from '@nestjs/common/utils/shared.utils';
import {
CONNECT_EVENT,
DISCONNECTED_RMQ_MESSAGE,
CONNECT_FAILED_EVENT,
CONNECTION_FAILED_MESSAGE,
DISCONNECT_EVENT,
DISCONNECTED_RMQ_MESSAGE,
NO_MESSAGE_HANDLER,
RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT,
RQM_DEFAULT_NOACK,
Expand Down Expand Up @@ -95,6 +97,10 @@ export class ServerRMQ extends Server implements CustomTransportStrategy {
this.logger.error(DISCONNECTED_RMQ_MESSAGE);
this.logger.error(err);
});
this.server.on(CONNECT_FAILED_EVENT, (err: any) => {
this.logger.error(CONNECTION_FAILED_MESSAGE);
this.logger.error(err);
});
}

public createClient<T = any>(): T {
Expand Down
4 changes: 4 additions & 0 deletions packages/microservices/test/server/server-rmq.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ describe('ServerRMQ', () => {
server.listen(callbackSpy);
expect(onStub.getCall(1).args[0]).to.be.equal('disconnect');
});
it('should bind "connectFailed" event to handler', () => {
server.listen(callbackSpy);
expect(onStub.getCall(2).args[0]).to.be.equal('connectFailed');
});
describe('when "start" throws an exception', () => {
it('should call callback with a thrown error as an argument', () => {
const error = new Error('random error');
Expand Down
7 changes: 4 additions & 3 deletions packages/platform-express/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,20 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
<td>
<a href="https://nx.dev" target="_blank"><img src="https://nestjs.com/img/nx-logo.png" height="45" valign="middle" /></a></td>
<td>
<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>
<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><td>
<a href="https://amplication.com/" target="_blank"><img src="https://nestjs.com/img/amplication-logo.svg" width="190" valign="middle" /></a></td>
</tr></table>

#### Gold Sponsors

<table style="text-align:center;"><tr><td>
<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>
<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
<td>
<a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
<td>
<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td><td>
<a href="https://fuseautotech.com/" target="_blank"><img src="https://nestjs.com/img/fuse-logo.svg" width="105" valign="middle" /></a></td></</tr></table>

#### Silver Sponsors

Expand Down

0 comments on commit 7501e3f

Please sign in to comment.