Merge pull request #98 from ExpediaGroup/prune-update

Schema pruning update
ExpediaGroup · May 18, 2022 · 8b54967 · 8b54967
2 parents 25e1d30 + 93a7959
commit 8b54967
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v3.0.4
+
+- Updated schema pruning dependency and TS definitions
 
 ### v3.0.3
 

diff --git a/lib/__tests__.js b/lib/__tests__.js
@@ -2,7 +2,7 @@
 
 const Test = require('tape');
 const gql = require('graphql-tag');
-const { SchemaDirectiveVisitor } = require('@graphql-tools/utils');
+const { SchemaDirectiveVisitor } = require('graphql-tools');
 const graphql = require('graphql');
 const GraphQLComponent = require('./index');
 

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -23,21 +23,11 @@ interface IContextWrapper extends ContextFunction {
 }
 
 interface IGraphQLComponentOptions {
-  types?: (string | Source | DocumentNode)[] | (string | Source | DocumentNode);
+  types?: (string | Source | DocumentNode | GraphQLSchema)[] | (string | Source | DocumentNode | GraphQLSchema);
   resolvers?: IResolvers<any, any>;
   mocks?: boolean | MocksConfigFunction;
   directives?: DirectiveUseMap;
   federation?: boolean;
-  makeExecutableSchema?: <TContext = any>({
-    typeDefs,
-    resolvers,
-    resolverValidationOptions,
-    parseOptions,
-    inheritResolversFromInterfaces,
-    pruningOptions,
-    updateResolversInPlace,
-    schemaExtensions
-  }) => IExecutableSchemaDefinition<TContext>;
   imports?: GraphQLComponent[] | IGraphQLComponentConfigObject[];
   context?: IContextConfig;
   dataSources?: any[];

diff --git a/lib/index.js b/lib/index.js
@@ -8,9 +8,9 @@ const {
   mergeTypeDefs,
   addMocksToSchema,
   makeExecutableSchema,
-  pruneSchema,
   SchemaDirectiveVisitor
 } = require('graphql-tools');
+const { pruneSchema } = require('@graphql-tools/utils');
 
 const { bindResolvers } = require('./resolvers');
 const { wrapContext, createContext } = require('./context');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-component",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "description": "Build, customize and compose GraphQL schemas in a componentized fashion",
   "keywords": [
     "graphql",
@@ -23,7 +23,8 @@
   "dependencies": {
     "@apollo/federation": "^0.28.0",
     "debug": "^4.3.1",
-    "graphql-tools": "^7.0.5"
+    "graphql-tools": "^7.0.5",
+    "@graphql-tools/utils": "^8.6.10"
   },
   "peerDependencies": {
     "graphql": "^15.0.0"