Merge branch 'Namielusi-fix/graphql-tools-pkg'

nestjs · Nov 9, 2020 · 7349926 · 7349926
2 parents 243b963 + 84991fa
commit 7349926
Show file tree

Hide file tree

Showing 5 changed files with 466 additions and 3,078 deletions.
diff --git a/lib/federation/graphql-federation.factory.ts b/lib/federation/graphql-federation.factory.ts
@@ -20,7 +20,7 @@ import {
   isScalarType,
   isUnionType,
 } from 'graphql';
-import { mergeSchemas } from 'graphql-tools';
+import { mergeSchemas } from '@graphql-tools/merge';
 import { forEach, isEmpty } from 'lodash';
 import { GraphQLSchemaBuilder } from '../graphql-schema.builder';
 import { GqlModuleOptions } from '../interfaces';

diff --git a/lib/graphql-definitions.factory.ts b/lib/graphql-definitions.factory.ts
@@ -3,7 +3,7 @@ import { isEmpty } from '@nestjs/common/utils/shared.utils';
 import { gql } from 'apollo-server-core';
 import * as chokidar from 'chokidar';
 import { printSchema } from 'graphql';
-import { makeExecutableSchema } from 'graphql-tools';
+import { makeExecutableSchema } from '@graphql-tools/schema';
 import {
   DefinitionsGeneratorOptions,
   GraphQLAstExplorer,

diff --git a/lib/graphql.factory.ts b/lib/graphql.factory.ts
@@ -9,11 +9,9 @@ import {
   lexicographicSortSchema,
   printSchema,
 } from 'graphql';
-import {
-  makeExecutableSchema,
-  mergeSchemas,
-  SchemaDirectiveVisitor,
-} from 'graphql-tools';
+import { mergeSchemas } from '@graphql-tools/merge';
+import { makeExecutableSchema } from '@graphql-tools/schema';
+import { SchemaDirectiveVisitor } from '@graphql-tools/utils';
 import { forEach, isEmpty } from 'lodash';
 import {
   DefinitionsGeneratorOptions,