Merge branch 'master' of https://github.com/nestjs/nest

kamilmysliwiec · kamilmysliwiec · commit a6c0d19b1dbf · 2019-03-26T11:48:05.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "@types/fastify-cors": "2.1.0",
     "@types/kafka-node": "2.0.8",
     "@types/mocha": "5.2.6",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "@types/redis": "2.8.11",
     "@types/reflect-metadata": "0.0.5",
     "@types/sinon": "7.0.10",
diff --git a/packages/core/exceptions/external-exception-filter-context.ts b/packages/core/exceptions/external-exception-filter-context.ts
@@ -11,7 +11,7 @@ import { ExternalExceptionsHandler } from './external-exceptions-handler';
 export class ExternalExceptionFilterContext extends BaseExceptionFilterContext {
   constructor(
     container: NestContainer,
-    private readonly config: ApplicationConfig,
+    private readonly config?: ApplicationConfig,
   ) {
     super(container);
   }
@@ -41,6 +41,9 @@ export class ExternalExceptionFilterContext extends BaseExceptionFilterContext {
   }
 
   public getGlobalMetadata<T extends any[]>(): T {
+    if (!this.config) {
+      return [] as T;
+    }
     return this.config.getGlobalFilters() as T;
   }
 }
diff --git a/packages/core/test/helpers/external-context-creator.spec.ts b/packages/core/test/helpers/external-context-creator.spec.ts
@@ -43,8 +43,7 @@ describe('ExternalContextCreator', () => {
       new PipesContextCreator(new NestContainer()),
       consumer,
       new ExternalExceptionFilterContext(
-        new NestContainer(),
-        new ApplicationConfig(),
+        new NestContainer()
       ),
     );
   });
diff --git a/sample/01-cats-app/package.json b/sample/01-cats-app/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.11",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "jest": "24.5.0",
     "supertest": "4.0.2",
     "ts-jest": "24.0.0",
diff --git a/sample/03-microservices/package.json b/sample/03-microservices/package.json
@@ -23,7 +23,7 @@
   },
   "devDependencies": {
     "@types/amqplib": "0.5.11",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/04-grpc/package-lock.json b/sample/04-grpc/package-lock.json
diff --git a/sample/04-grpc/package.json b/sample/04-grpc/package.json
@@ -23,7 +23,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/06-mongoose/package.json b/sample/06-mongoose/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "@types/mongoose": "5.3.24",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/07-sequelize/package.json b/sample/07-sequelize/package.json
@@ -21,7 +21,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "@types/sequelize": "4.27.44",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
diff --git a/sample/08-webpack/package-lock.json b/sample/08-webpack/package-lock.json
diff --git a/sample/08-webpack/package.json b/sample/08-webpack/package.json
@@ -16,7 +16,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-loader": "5.3.3",
     "ts-node": "8.0.3",
     "tslint": "5.14.0",
diff --git a/sample/10-fastify/package.json b/sample/10-fastify/package.json
@@ -20,7 +20,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/11-swagger/package-lock.json b/sample/11-swagger/package-lock.json
diff --git a/sample/11-swagger/package.json b/sample/11-swagger/package.json
@@ -21,7 +21,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "supertest": "4.0.2",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
diff --git a/sample/12-graphql-apollo/package.json b/sample/12-graphql-apollo/package.json
@@ -24,7 +24,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/13-mongo-typeorm/package.json b/sample/13-mongo-typeorm/package.json
@@ -21,7 +21,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }
diff --git a/sample/16-gateways-ws/package.json b/sample/16-gateways-ws/package.json
@@ -23,7 +23,7 @@
     "ws": "6.2.0"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "@types/ws": "6.0.1",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
diff --git a/sample/18-context/package.json b/sample/18-context/package.json
@@ -17,7 +17,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-loader": "5.3.3",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
diff --git a/sample/19-auth/package.json b/sample/19-auth/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.11",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "jest": "24.5.0",
     "supertest": "4.0.2",
     "ts-jest": "24.0.0",
diff --git a/sample/20-cache/package.json b/sample/20-cache/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.11",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "jest": "24.5.0",
     "supertest": "4.0.2",
     "ts-jest": "24.0.0",
diff --git a/sample/21-serializer/package.json b/sample/21-serializer/package.json
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@types/jest": "24.0.11",
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "jest": "24.5.0",
     "supertest": "4.0.2",
     "ts-jest": "24.0.0",
diff --git a/sample/23-type-graphql/package-lock.json b/sample/23-type-graphql/package-lock.json
diff --git a/sample/23-type-graphql/package.json b/sample/23-type-graphql/package.json
@@ -25,7 +25,7 @@
     "typescript": "3.3.4000"
   },
   "devDependencies": {
-    "@types/node": "10.14.3",
+    "@types/node": "10.14.4",
     "ts-node": "8.0.3",
     "tslint": "5.14.0"
   }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import { ExternalExceptionsHandler } from './external-exceptions-handler';`
`11`	`11`	`export class ExternalExceptionFilterContext extends BaseExceptionFilterContext {`
`12`	`12`	`constructor(`
`13`	`13`	`container: NestContainer,`
`14`		`- private readonly config: ApplicationConfig,`
	`14`	`+ private readonly config?: ApplicationConfig,`
`15`	`15`	`) {`
`16`	`16`	`super(container);`
`17`	`17`	`}`
`@@ -41,6 +41,9 @@ export class ExternalExceptionFilterContext extends BaseExceptionFilterContext {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public getGlobalMetadata<T extends any[]>(): T {`
	`44`	`+ if (!this.config) {`
	`45`	`+ return [] as T;`
	`46`	`+ }`
`44`	`47`	`return this.config.getGlobalFilters() as T;`
`45`	`48`	`}`
`46`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`},`
`24`	`24`	`"devDependencies": {`
`25`	`25`	`"@types/amqplib": "0.5.11",`
`26`		`- "@types/node": "10.14.3",`
	`26`	`+ "@types/node": "10.14.4",`
`27`	`27`	`"ts-node": "8.0.3",`
`28`	`28`	`"tslint": "5.14.0"`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`},`
`22`	`22`	`"devDependencies": {`
`23`	`23`	`"@types/mongoose": "5.3.24",`
`24`		`- "@types/node": "10.14.3",`
	`24`	`+ "@types/node": "10.14.4",`
`25`	`25`	`"ts-node": "8.0.3",`
`26`	`26`	`"tslint": "5.14.0"`
`27`	`27`	`}`