fix(): resolve merge conflicts

nestjs · Jan 26, 2020 · 5d24da3 · 5d24da3
2 parents 3912cf3 + accf580
commit 5d24da3
Show file tree

Hide file tree

Showing 58 changed files with 850 additions and 317 deletions.
diff --git a/package.json b/package.json
@@ -105,8 +105,8 @@
     "@types/sinon": "7.5.1",
     "@types/socket.io": "2.1.4",
     "@types/ws": "7.2.0",
-    "@typescript-eslint/eslint-plugin": "^2.17.0",
-    "@typescript-eslint/parser": "^2.17.0",
+    "@typescript-eslint/eslint-plugin": "2.17.0",
+    "@typescript-eslint/parser": "2.17.0",
     "artillery": "1.6.0-29",
     "awesome-typescript-loader": "5.2.1",
     "body-parser": "1.19.0",
@@ -121,9 +121,9 @@
     "coveralls": "3.0.9",
     "csv-write-stream": "2.0.0",
     "delete-empty": "3.0.0",
-    "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.9.0",
-    "eslint-plugin-import": "^2.20.0",
+    "eslint": "6.8.0",
+    "eslint-config-prettier": "6.9.0",
+    "eslint-plugin-import": "2.20.0",
     "fancy-log": "1.3.3",
     "fastify-static": "2.5.1",
     "gulp": "4.0.1",

diff --git a/sample/01-cats-app/package-lock.json b/sample/01-cats-app/package-lock.json
diff --git a/sample/01-cats-app/package.json b/sample/01-cats-app/package.json
@@ -45,7 +45,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/02-gateways/package-lock.json b/sample/02-gateways/package-lock.json
diff --git a/sample/02-gateways/package.json b/sample/02-gateways/package.json
@@ -50,7 +50,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/03-microservices/package-lock.json b/sample/03-microservices/package-lock.json
diff --git a/sample/03-microservices/package.json b/sample/03-microservices/package.json
@@ -46,7 +46,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

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
@@ -47,7 +47,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/05-sql-typeorm/package-lock.json b/sample/05-sql-typeorm/package-lock.json
diff --git a/sample/05-sql-typeorm/package.json b/sample/05-sql-typeorm/package.json
@@ -46,7 +46,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/06-mongoose/package-lock.json b/sample/06-mongoose/package-lock.json
diff --git a/sample/06-mongoose/package.json b/sample/06-mongoose/package.json
@@ -46,7 +46,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/07-sequelize/package-lock.json b/sample/07-sequelize/package-lock.json
diff --git a/sample/07-sequelize/package.json b/sample/07-sequelize/package.json
@@ -48,7 +48,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

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
@@ -24,7 +24,7 @@
     "ts-node": "8.6.2",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "webpack": "4.41.5",

diff --git a/sample/10-fastify/package-lock.json b/sample/10-fastify/package-lock.json
diff --git a/sample/10-fastify/package.json b/sample/10-fastify/package.json
@@ -45,7 +45,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

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
@@ -46,7 +46,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/12-graphql-apollo/package-lock.json b/sample/12-graphql-apollo/package-lock.json
diff --git a/sample/12-graphql-apollo/package.json b/sample/12-graphql-apollo/package.json
@@ -48,7 +48,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/13-mongo-typeorm/package-lock.json b/sample/13-mongo-typeorm/package-lock.json
diff --git a/sample/13-mongo-typeorm/package.json b/sample/13-mongo-typeorm/package.json
@@ -45,7 +45,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/14-mongoose-base/package-lock.json b/sample/14-mongoose-base/package-lock.json
diff --git a/sample/14-mongoose-base/package.json b/sample/14-mongoose-base/package.json
@@ -43,7 +43,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/15-mvc/package-lock.json b/sample/15-mvc/package-lock.json
diff --git a/sample/15-mvc/package.json b/sample/15-mvc/package.json
@@ -44,7 +44,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/16-gateways-ws/package-lock.json b/sample/16-gateways-ws/package-lock.json
diff --git a/sample/16-gateways-ws/package.json b/sample/16-gateways-ws/package.json
@@ -48,7 +48,7 @@
     "tsconfig-paths": "3.9.0",
     "@typescript-eslint/eslint-plugin": "2.12.0",
     "@typescript-eslint/parser": "2.12.0",
-    "eslint": "6.7.2",
+    "eslint": "6.8.0",
     "eslint-config-prettier": "6.7.0",
     "eslint-plugin-import": "2.19.1",
     "typescript": "3.7.2"

diff --git a/sample/17-mvc-fastify/package-lock.json b/sample/17-mvc-fastify/package-lock.json