Update to @graphql-tools/merge #302

electerious · Dec 9, 2021 · d6af010 · d6af010
1 parent d0a7c17
commit d6af010
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 816 deletions.
diff --git a/package.json b/package.json
@@ -33,6 +33,7 @@
     "lint": "eslint \"{functions,src,test}/**/*.js\""
   },
   "dependencies": {
+    "@graphql-tools/merge": "^8.2.1",
     "ackee-tracker": "^5.1.0",
     "apollo-server-lambda": "^2.25.1",
     "apollo-server-micro": "^2.25.1",
@@ -43,7 +44,6 @@
     "dotenv": "^10.0.0",
     "graphql": "^15.5.3",
     "graphql-scalars": "^1.14.1",
-    "graphql-tools": "^7.0.5",
     "is-url": "^1.2.4",
     "micro": "^9.3.4",
     "microrouter": "^3.1.3",

diff --git a/src/resolvers/index.js b/src/resolvers/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { mergeResolvers } = require('graphql-tools')
+const { mergeResolvers } = require('@graphql-tools/merge')
 
 module.exports = mergeResolvers([
 	require('./tokens'),

diff --git a/src/types/index.js b/src/types/index.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const { mergeTypeDefs } = require('graphql-tools')
+const { mergeTypeDefs } = require('@graphql-tools/merge')
 
 module.exports = mergeTypeDefs([
 	require('./tokens'),