Upgrade graphql -> 14.0.3 and graphql-tools -> 4.0.3

keystonejs · Dec 17, 2018 · 31e52bc · 31e52bc
1 parent 18ce8bc
commit 31e52bc
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 14 deletions.
diff --git a/.changeset/cf544541/changes.json b/.changeset/cf544541/changes.json
@@ -0,0 +1,9 @@
+{
+  "releases": [
+    { "name": "@voussoir/admin-ui", "type": "patch" },
+    { "name": "@voussoir/core", "type": "patch" },
+    { "name": "@voussoir/fields", "type": "patch" },
+    { "name": "@voussoir/server", "type": "patch" }
+  ],
+  "dependents": []
+}
diff --git a/.changeset/cf544541/changes.md b/.changeset/cf544541/changes.md
@@ -0,0 +1 @@
+- Dependency upgrade: graphql -> 14.0.3, graphql-tools -> 4.0.3
diff --git a/package.json b/package.json
@@ -80,11 +80,11 @@
     "flushable": "^1.0.0",
     "focus-trap": "^2.4.3",
     "fs-extra": "^7.0.0",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "graphql-anywhere": "^4.1.23",
     "graphql-playground-html": "^1.6.6",
     "graphql-tag": "^2.8.0",
-    "graphql-tools": "^3.0.0",
+    "graphql-tools": "^4.0.3",
     "graphql-type-json": "^0.2.1",
     "hoist-non-react-statics": "^3.0.1",
     "html-webpack-plugin": "^3.2.0",

diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json
@@ -35,7 +35,7 @@
     "express": "^4.16.3",
     "express-session": "^1.15.6",
     "file-loader": "^1.1.11",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.8.0",
     "html-webpack-plugin": "^3.2.0",
     "lodash.debounce": "^4.0.8",
@@ -59,4 +59,4 @@
     "webpack": "^4.5.0",
     "webpack-dev-middleware": "^3.1.2"
   }
-}
+}
diff --git a/packages/core/adapters/index.js b/packages/core/adapters/index.js
@@ -38,7 +38,14 @@ class BaseListAdapter {
     this.config = config;
 
     this.preSaveHooks = [];
-    this.postReadHooks = [];
+    this.postReadHooks = [
+      item => {
+        // FIXME: This can hopefully be removed once graphql 14.1.0 is released.
+        // https://github.com/graphql/graphql-js/pull/1520
+        if (item && item.id) item.id = item.id.toString();
+        return item;
+      },
+    ];
   }
 
   newFieldAdapter(fieldAdapterClass, name, path, getListByKey, config) {

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -13,14 +13,14 @@
     "@voussoir/utils": "^0.3.0",
     "apollo-errors": "^1.9.0",
     "fast-memoize": "^2.4.0",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.8.0",
-    "graphql-tools": "^3.0.0",
+    "graphql-tools": "^4.0.3",
     "graphql-type-json": "^0.2.1",
     "oauth-libre": "^0.9.17",
     "p-waterfall": "^1.0.0",
     "passport": "^0.4.0",
     "passport-twitter": "^1.0.4",
     "pluralize": "^7.0.0"
   }
-}
+}
diff --git a/packages/fields/package.json b/packages/fields/package.json
@@ -19,7 +19,7 @@
     "cuid": "^2.1.1",
     "date-fns": "^1.29.0",
     "dumb-passwords": "^0.2.1",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.8.0",
     "inflection": "^1.12.0",
     "intersection-observer": "^0.5.1",
@@ -41,4 +41,4 @@
     "cuid": "^2.1.1",
     "supertest-light": "^1.0.2"
   }
-}
+}
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -20,7 +20,7 @@
     "express-pino-logger": "^4.0.0",
     "express-session": "^1.15.6",
     "falsey": "^1.0.0",
-    "graphql": "^0.13.2",
+    "graphql": "^14.0.2",
     "graphql-playground-html": "^1.6.6"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -7432,7 +7432,7 @@ graphql-tag@^2.8.0, graphql-tag@^2.9.2:
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.10.0.tgz#87da024be863e357551b2b8700e496ee2d4353ae"
   integrity sha512-9FD6cw976TLLf9WYIUPCaaTpniawIjHWZSwIRZSjrfufJamcXbVVYfN2TWvJYbw0Xf2JjYbl1/f2+wDnBVw3/w==
 
-graphql-tools@^3.0.0, graphql-tools@^3.0.4:
+graphql-tools@^3.0.4:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-3.1.1.tgz#d593358f01e7c8b1671a17b70ddb034dea9dbc50"
   integrity sha512-yHvPkweUB0+Q/GWH5wIG60bpt8CTwBklCSzQdEHmRUgAdEQKxw+9B7zB3dG7wB3Ym7M7lfrS4Ej+jtDZfA2UXg==
@@ -7443,7 +7443,7 @@ graphql-tools@^3.0.0, graphql-tools@^3.0.4:
     iterall "^1.1.3"
     uuid "^3.1.0"
 
-graphql-tools@^4.0.0:
+graphql-tools@^4.0.0, graphql-tools@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.3.tgz#23b5cb52c519212b1b2e4630a361464396ad264b"
   integrity sha512-NNZM0WSnVLX1zIMUxu7SjzLZ4prCp15N5L2T2ro02OVyydZ0fuCnZYRnx/yK9xjGWbZA0Q58yEO//Bv/psJWrg==
@@ -7476,6 +7476,13 @@ graphql@^0.13.0, graphql@^0.13.2:
   dependencies:
     iterall "^1.2.1"
 
+graphql@^14.0.2:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.0.2.tgz#7dded337a4c3fd2d075692323384034b357f5650"
+  integrity sha512-gUC4YYsaiSJT1h40krG3J+USGlwhzNTXSb4IOZljn9ag5Tj+RkoXrWp+Kh7WyE3t1NCfab5kzCuxBIvOMERMXw==
+  dependencies:
+    iterall "^1.2.2"
+
 gray-matter@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.1.tgz#375263c194f0d9755578c277e41b1c1dfdf22c7d"
@@ -8843,7 +8850,7 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-iterall@^1.1.3, iterall@^1.2.1:
+iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Dependency upgrade: graphql -> 14.0.3, graphql-tools -> 4.0.3