upgrade graphql-tools to v6 (#6701)

* upgrade to v6

* remove old graphql-tools package

Co-authored-by: Antonio Davi Macedo Coelho de Castro <adavimacedo@gmail.com>

package.json

@@ -20,6 +20,8 @@
   "license": "BSD-3-Clause",
   "dependencies": {
     "@apollographql/graphql-playground-html": "1.6.24",
+    "@graphql-tools/stitch": "^6.0.0",
+    "@graphql-tools/utils": "^6.0.0",
     "@parse/fs-files-adapter": "1.0.1",
     "@parse/push-adapter": "3.2.0",
     "@parse/s3-files-adapter": "1.4.0",
@@ -35,7 +37,6 @@
     "graphql": "15.0.0",
     "graphql-list-fields": "2.0.2",
     "graphql-relay": "^0.6.0",
-    "graphql-tools": "^5.0.0",
     "graphql-upload": "11.0.0",
     "intersect": "1.0.1",
     "jsonwebtoken": "8.5.1",

spec/ParseGraphQLServer.spec.js

@@ -10987,8 +10987,8 @@ describe('ParseGraphQLServer', () => {
         httpServer = http.createServer(expressApp);
         parseGraphQLServer = new ParseGraphQLServer(parseServer, {
           graphQLPath: '/graphql',
-          graphQLCustomTypeDefs: ({ autoSchema, mergeSchemas }) =>
-            mergeSchemas({ schemas: [autoSchema] }),
+          graphQLCustomTypeDefs: ({ autoSchema, stitchSchemas }) =>
+            stitchSchemas({ subschemas: [autoSchema] }),
         });
 
         parseGraphQLServer.applyGraphQL(expressApp);

src/GraphQL/ParseGraphQLSchema.js

@@ -5,7 +5,8 @@ import {
   DocumentNode,
   GraphQLNamedType,
 } from 'graphql';
-import { mergeSchemas, SchemaDirectiveVisitor } from 'graphql-tools';
+import { stitchSchemas } from '@graphql-tools/stitch';
+import { SchemaDirectiveVisitor } from '@graphql-tools/utils';
 import requiredParameter from '../requiredParameter';
 import * as defaultGraphQLTypes from './loaders/defaultGraphQLTypes';
 import * as parseClassTypes from './loaders/parseClassTypes';
@@ -251,7 +252,7 @@ class ParseGraphQLSchema {
             }
           }
         );
-        this.graphQLSchema = mergeSchemas({
+        this.graphQLSchema = stitchSchemas({
           schemas: [
             this.graphQLSchemaDirectivesDefinitions,
             this.graphQLAutoSchema,
@@ -262,10 +263,10 @@ class ParseGraphQLSchema {
         this.graphQLSchema = await this.graphQLCustomTypeDefs({
           directivesDefinitionsSchema: this.graphQLSchemaDirectivesDefinitions,
           autoSchema: this.graphQLAutoSchema,
-          mergeSchemas,
+          stitchSchemas,
         });
       } else {
-        this.graphQLSchema = mergeSchemas({
+        this.graphQLSchema = stitchSchemas({
           schemas: [
             this.graphQLSchemaDirectivesDefinitions,
             this.graphQLAutoSchema,

src/GraphQL/loaders/schemaDirectives.js

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { SchemaDirectiveVisitor } from 'graphql-tools';
+import { SchemaDirectiveVisitor } from '@graphql-tools/utils';
 import { FunctionsRouter } from '../../Routers/FunctionsRouter';
 
 export const definitions = gql`