chore(): resolve conflicts

Author: kamilmysliwiec

integration/graphql-code-first/e2e/pipes.spec.ts

@@ -30,28 +30,16 @@ describe('GraphQL Pipes', () => {
         errors: [
           {
             extensions: {
-              code: 'INTERNAL_SERVER_ERROR',
-              exception: {
-                message: 'Bad Request Exception',
-                name: 'BadRequestException',
-                response: {
-                  message: [
-                    'description must be longer than or equal to 30 characters',
-                  ],
-                  error: 'Bad Request',
-                  statusCode: 400,
-                },
-                status: 400,
+              code: 'BAD_USER_INPUT',
+              response: {
+                error: 'Bad Request',
+                message: [
+                  'description must be longer than or equal to 30 characters',
+                ],
+                statusCode: 400,
               },
             },
-            locations: [
-              {
-                column: 3,
-                line: 2,
-              },
-            ],
             message: 'Bad Request Exception',
-            path: ['addRecipe'],
           },
         ],
       });

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.0.2"
+  "version": "8.0.4"
 }

package-lock.json

@@ -71,10 +71,10 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@codechecks/client": "0.1.10",
+    "@codechecks/client": "0.1.11",
     "@commitlint/cli": "12.1.4",
     "@commitlint/config-angular": "12.1.4",
-    "@grpc/grpc-js": "1.3.4",
+    "@grpc/grpc-js": "1.3.5",
     "@grpc/proto-loader": "0.6.4",
     "@nestjs/graphql": "8.0.2",
     "@nestjs/mongoose": "8.0.0",
@@ -96,8 +96,8 @@
     "@types/sinon": "10.0.2",
     "@types/socket.io": "3.0.2",
     "@types/ws": "7.4.6",
-    "@typescript-eslint/eslint-plugin": "4.28.2",
-    "@typescript-eslint/parser": "4.28.2",
+    "@typescript-eslint/eslint-plugin": "4.28.3",
+    "@typescript-eslint/parser": "4.28.3",
     "amqp-connection-manager": "3.2.2",
     "amqplib": "0.8.0",
     "apollo-server-express": "2.25.2",
@@ -122,8 +122,8 @@
     "eslint-plugin-import": "2.23.4",
     "eventsource": "1.1.0",
     "fancy-log": "1.3.3",
-    "fastify": "3.19.0",
-    "fastify-cors": "6.0.1",
+    "fastify": "3.19.1",
+    "fastify-cors": "6.0.2",
     "fastify-formbody": "5.0.0",
     "fastify-multipart": "4.0.7",
     "fastify-static": "4.2.2",
@@ -142,7 +142,7 @@
     "kafkajs": "1.15.0",
     "lerna": "2.11.0",
     "light-my-request": "4.4.1",
-    "lint-staged": "11.0.0",
+    "lint-staged": "11.0.1",
     "markdown-table": "2.0.0",
     "merge-graphql-schemas": "1.7.8",
     "middie": "5.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/common",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@common)",
   "author": "Kamil Mysliwiec",
   "homepage": "https://nestjs.com",

packages/common/package.json

@@ -248,11 +248,13 @@ export class Module {
     | ValueProvider
     | ExistingProvider {
     return !isNil(
-      (provider as
-        | ClassProvider
-        | FactoryProvider
-        | ValueProvider
-        | ExistingProvider).provide,
+      (
+        provider as
+          | ClassProvider
+          | FactoryProvider
+          | ValueProvider
+          | ExistingProvider
+      ).provide,
     );
   }
 
@@ -396,8 +398,8 @@ export class Module {
     } else if (isString(provider) || isSymbol(provider)) {
       return addExportedUnit(provider);
     } else if (this.isDynamicModule(provider)) {
-      const { module } = provider;
-      return addExportedUnit(module.name);
+      const { module: moduleClassRef } = provider;
+      return addExportedUnit(moduleClassRef);
     }
     addExportedUnit(provider as Type<any>);
   }

packages/core/injector/module.ts

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.2"
+    "@nestjs/common": "8.0.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

packages/core/package.json

@@ -54,7 +54,8 @@ interface ApplicationProviderWrapper {
 }
 
 export class DependenciesScanner {
-  private readonly applicationProvidersApplyMap: ApplicationProviderWrapper[] = [];
+  private readonly applicationProvidersApplyMap: ApplicationProviderWrapper[] =
+    [];
 
   constructor(
     private readonly container: NestContainer,
@@ -255,10 +256,9 @@ export class DependenciesScanner {
       component.prototype,
       method => Reflect.getMetadata(metadataKey, component, method),
     );
-    const paramsInjectables = this.flatten(
-      paramsMetadata,
-    ).map((param: Record<string, any>) =>
-      flatten(Object.keys(param).map(k => param[k].pipes)).filter(isFunction),
+    const paramsInjectables = this.flatten(paramsMetadata).map(
+      (param: Record<string, any>) =>
+        flatten(Object.keys(param).map(k => param[k].pipes)).filter(isFunction),
     );
     flatten(paramsInjectables).forEach((injectable: Type<Injectable>) =>
       this.insertInjectable(injectable, token, component),
@@ -292,7 +292,7 @@ export class DependenciesScanner {
     modulesGenerator.next();
 
     const modulesStack = [];
-    const calculateDistance = (moduleRef: Module, distance = 0) => {
+    const calculateDistance = (moduleRef: Module, distance = 1) => {
       if (modulesStack.includes(moduleRef)) {
         return;
       }
@@ -336,11 +336,13 @@ export class DependenciesScanner {
     }
     const applyProvidersMap = this.getApplyProvidersMap();
     const providersKeys = Object.keys(applyProvidersMap);
-    const type = (provider as
-      | ClassProvider
-      | ValueProvider
-      | FactoryProvider
-      | ExistingProvider).provide;
+    const type = (
+      provider as
+        | ClassProvider
+        | ValueProvider
+        | FactoryProvider
+        | ExistingProvider
+    ).provide;
 
     if (!providersKeys.includes(type as string)) {
       return this.container.addProvider(provider as any, token);

packages/core/scanner.ts

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/microservices",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@microservices)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -22,8 +22,8 @@
     "tslib": "2.3.0"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.2",
-    "@nestjs/core": "8.0.2"
+    "@nestjs/common": "8.0.4",
+    "@nestjs/core": "8.0.4"
   },
   "peerDependencies": {
     "@grpc/grpc-js": "*",

packages/microservices/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -24,8 +24,8 @@
     "tslib": "2.3.0"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.2",
-    "@nestjs/core": "8.0.2"
+    "@nestjs/common": "8.0.4",
+    "@nestjs/core": "8.0.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",