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

simonh88 · Jul 22, 2019 · 25db843 · 25db843
2 parents c5e54bf + a0a5130
commit 25db843
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 35 deletions.
diff --git a/integration/graphql/package-lock.json b/integration/graphql/package-lock.json
diff --git a/integration/graphql/package.json b/integration/graphql/package.json
@@ -19,7 +19,7 @@
     "rxjs": "6.5.2",
     "subscriptions-transport-ws": "0.9.16",
     "typescript": "3.5.3",
-    "ws": "7.1.0"
+    "ws": "7.1.1"
   },
   "devDependencies": {
     "@types/node": "7.10.7",

diff --git a/integration/mongoose/package-lock.json b/integration/mongoose/package-lock.json
diff --git a/integration/mongoose/package.json b/integration/mongoose/package.json
@@ -18,7 +18,7 @@
     "typescript": "3.5.3"
   },
   "devDependencies": {
-    "@types/mongoose": "5.5.8",
+    "@types/mongoose": "5.5.9",
     "@types/node": "7.10.7",
     "ts-node": "8.3.0",
     "tslint": "5.18.0"

diff --git a/integration/typegraphql/package-lock.json b/integration/typegraphql/package-lock.json
diff --git a/integration/typegraphql/package.json b/integration/typegraphql/package.json
@@ -22,7 +22,7 @@
     "subscriptions-transport-ws": "0.9.16",
     "type-graphql": "0.17.4",
     "typescript": "3.5.3",
-    "ws": "7.1.0"
+    "ws": "7.1.1"
   },
   "devDependencies": {
     "@types/node": "7.10.7",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "grpc": "1.22.2",
     "http2": "3.3.7",
     "iterare": "1.2.0",
-    "merge-graphql-schemas": "1.5.8",
+    "merge-graphql-schemas": "1.6.1",
     "mqtt": "3.0.0",
     "multer": "1.4.2",
     "nats": "1.3.0",

diff --git a/packages/platform-ws/package.json b/packages/platform-ws/package.json
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "ws": "7.1.0"
+    "ws": "7.1.1"
   },
   "peerDependencies": {
     "@nestjs/common": "^6.0.0",

diff --git a/sample/06-mongoose/package.json b/sample/06-mongoose/package.json
@@ -20,7 +20,7 @@
     "typescript": "3.5.3"
   },
   "devDependencies": {
-    "@types/mongoose": "5.5.8",
+    "@types/mongoose": "5.5.9",
     "@types/node": "10.14.13",
     "ts-node": "8.3.0",
     "tslint": "5.18.0"