deps(global): try to bump graphql to 16.x (#34)

* deps(global): try to bump graphql to 16.x

* fix(global): fix cache-hints and errors

* fix(global): fix types * missmatch

* fix(global): fix eslint

Author: SavelevMatthew

examples/blog/package.json

@@ -39,7 +39,7 @@
     "date-fns": "^2.22.1",
     "dotenv": "^8.6.0",
     "express": "^4.17.1",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "isomorphic-unfetch": "^3.1.0",
     "next": "10.2.3",
     "react": "^17.0.2",

examples/meetup/package.json

@@ -37,7 +37,7 @@
     "express": "^4.17.1",
     "facepaint": "^1.2.1",
     "get-contrast": "^2.0.0",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "isomorphic-unfetch": "^3.1.0",
     "lodash.uniqby": "^4.7.0",
     "next": "10.2.3",

packages/app-admin-ui/package.json

@@ -56,7 +56,7 @@
     "express-history-api-fallback": "^2.2.1",
     "falsey": "^1.0.0",
     "file-loader": "^6.2.0",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "html-webpack-plugin": "^4.5.2",
     "lodash.debounce": "^4.0.8",
     "lodash.set": "^4.3.2",

packages/app-graphql/index.js

@@ -25,8 +25,8 @@ class GraphQLApp {
   /**
    * @return Array<middlewares>
    */
-  prepareMiddleware({ keystone, dev }) {
-    const server = keystone.createApolloServer({
+  async prepareMiddleware({ keystone, dev }) {
+    const server = await keystone.createApolloServer({
       apolloConfig: this._apollo,
       schemaName: this._schemaName,
       dev,

packages/app-graphql/package.json

@@ -11,7 +11,7 @@
     "@open-keystone/app-graphql-playground": "workspace:^",
     "@open-keystone/session": "workspace:^",
     "@open-keystone/utils": "workspace:^",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "graphql-upload": "^15.0.2",
     "nanoassert": "^2.0.0"
   },

packages/fields/package.json

@@ -47,7 +47,7 @@
     "date-fns": "^2.22.1",
     "decimal.js": "^10.2.1",
     "dumb-passwords": "^0.2.1",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "image-extensions": "^1.1.0",
     "inflection": "^1.13.1",
     "intersection-observer": "^0.12.0",

packages/keystone/lib/Keystone/index.js

@@ -1,9 +1,11 @@
 const { ApolloServer, gql } = require('apollo-server-express');
+const { ApolloServerPluginCacheControl } = require('apollo-server-core');
 const flattenDeep = require('lodash.flattendeep');
 const memoize = require('micro-memoize');
 const falsey = require('falsey');
 const createCorsMiddleware = require('cors');
 const { execute, print } = require('graphql');
+const { makeExecutableSchema } = require('@graphql-tools/schema');
 const GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
 const { arrayToObject, objMerge, flatten, unique, filterValues } = require('@open-keystone/utils');
 const {
@@ -226,7 +228,8 @@ module.exports = class Keystone {
       query = gql(query);
     }
 
-    return execute(schema, query, null, context, variables);
+    // return execute(schema, query, null, context, variables);
+    return execute({ schema, document: query, contextValue: context, variableValues: variables });
   }
 
   createAuthStrategy(options) {
@@ -443,11 +446,20 @@ module.exports = class Keystone {
     }
   }
 
-  createApolloServer({ apolloConfig = {}, schemaName, dev }) {
+  async createApolloServer({ apolloConfig = {}, schemaName }) {
     // add the Admin GraphQL API
+
+    const typeDefs = this.getTypeDefs({ schemaName });
+    const resolvers = this.getResolvers({ schemaName });
+    const { parseOptions } = apolloConfig;
+    const schema = makeExecutableSchema({
+      typeDefs,
+      resolvers,
+      parseOptions,
+    });
+
     const server = new ApolloServer({
-      typeDefs: this.getTypeDefs({ schemaName }),
-      resolvers: this.getResolvers({ schemaName }),
+      schema,
       context: ({ req }) => ({
         ...this.createContext({
           schemaName,
@@ -457,22 +469,20 @@ module.exports = class Keystone {
         ...this._sessionManager.getContext(req),
         req,
       }),
-      ...(process.env.ENGINE_API_KEY || process.env.APOLLO_KEY
-        ? {
-            tracing: true,
-          }
-        : {
-            engine: false,
-            // Only enable tracing in dev mode so we can get local debug info, but
-            // don't bother returning that info on prod when the `engine` is
-            // disabled.
-            tracing: dev,
-          }),
       formatError,
       ...apolloConfig,
-      uploads: false, // User cannot override this as it would clash with the upload middleware
+      plugins: [
+        ...(apolloConfig.plugins || []),
+        ApolloServerPluginCacheControl({
+          calculateHttpHeaders: true,
+          defaultMaxAge: 0,
+        }),
+      ],
     });
-    this._schemas[schemaName] = server.schema;
+
+    await server.start();
+
+    this._schemas[schemaName] = schema;
 
     return server;
   }
@@ -607,7 +617,7 @@ module.exports = class Keystone {
     pinoOptions,
     cors = { origin: true, credentials: true },
   } = {}) {
-    this.createApolloServer({ schemaName: 'internal' });
+    await this.createApolloServer({ schemaName: 'internal' });
     const middlewares = await this._prepareMiddlewares({ dev, apps, distDir, pinoOptions, cors });
     // These function can't be called after prepare(), so make them throw an error from now on.
     ['extendGraphQLSchema', 'createList', 'createAuthStrategy'].forEach(f => {

packages/keystone/lib/ListTypes/list.js

@@ -489,6 +489,15 @@ module.exports = class List {
   }
 
   async listQueryMeta(args, context, gqlName, info, from) {
+    if (info?.cacheControl) {
+      const opName = info.operation?.name?.value;
+      const hint =
+        typeof this.cacheHint === 'function'
+          ? this.cacheHint({ results: [], operationName: opName, meta: true })
+          : this.cacheHint;
+      if (hint) info.cacheControl.setCacheHint(hint);
+    }
+
     return {
       // Return these as functions so they're lazily evaluated depending
       // on what the user requested

packages/keystone/package.json

@@ -9,12 +9,14 @@
   },
   "bin": "bin/cli.js",
   "dependencies": {
+    "@graphql-tools/schema": "^8.0.0",
     "@open-keystone/access-control": "workspace:^",
     "@open-keystone/app-version": "workspace:^",
     "@open-keystone/session": "workspace:^",
     "@open-keystone/utils": "workspace:^",
     "apollo-errors": "^1.9.0",
-    "apollo-server-express": "^2.23.0",
+    "apollo-server-core": "3.13.0",
+    "apollo-server-express": "3.13.0",
     "arg": "^5.0.0",
     "chalk": "^4.1.1",
     "ci-info": "^3.2.0",
@@ -27,7 +29,7 @@
     "falsey": "^1.0.0",
     "fs-extra": "^9.1.0",
     "globby": "^11.0.3",
-    "graphql": "^15.5.0",
+    "graphql": "^16.10.0",
     "graphql-type-json": "^0.3.2",
     "graphql-upload": "^15.0.2",
     "lodash.flattendeep": "^4.4.0",

packages/session/src/session.ts

@@ -121,6 +121,7 @@ export class SessionManager {
       next();
     };
 
+    // @ts-ignore
     return [injectAuthCookieMiddleware, sessionMiddleware, _populateAuthedItemMiddleware];
   }