Merge branch 'master' of github.com:apollographql/graphql-tools

ardatan · Jun 2, 2020 · b6941f6 · b6941f6
2 parents a390979 + 670cd04
commit b6941f6
Show file tree

Hide file tree

Showing 44 changed files with 433 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,8 +2,10 @@
 
 ### Next
 
-- Fix visitEnumValue to allow modifying the enum value  <br/>
+- Fix visitEnumValue to allow modifying the enum value <br/>
   [@danielrearden](https://github.com/danielrearden) in [#1003](https://github.com/ardatan/graphql-tools/pull/1391)
+- Export `generateProxyingResolvers` from `@graphql-tools/wrap`.
+- Fix `stitchSchemas` from `@graphql-tools/stitch` from the case there the typeDefs array is empty. [#1575](https://github.com/ardatan/graphql-tools/pull/1575)
 
 ### 5.0.0
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-tools-monorepo",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Useful tools to create and manipulate GraphQL schemas.",
   "private": true,
   "scripts": {
@@ -43,8 +43,8 @@
     "jest": "26.0.1",
     "ts-jest": "26.1.0",
     "typescript": "3.9.3",
-    "@typescript-eslint/eslint-plugin": "3.0.2",
-    "@typescript-eslint/parser": "3.0.2",
+    "@typescript-eslint/eslint-plugin": "3.1.0",
+    "@typescript-eslint/parser": "3.1.0",
     "bob-the-bundler": "1.0.2",
     "eslint": "7.1.0",
     "eslint-config-prettier": "6.11.0",

diff --git a/packages/delegate/package.json b/packages/delegate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "license": "MIT",
@@ -18,8 +18,8 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/schema": "6.0.5",
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/schema": "6.0.6",
+    "@graphql-tools/utils": "6.0.6",
     "tslib": "~2.0.0"
   },
   "publishConfig": {

diff --git a/packages/delegate/src/results/handleNull.ts b/packages/delegate/src/results/handleNull.ts
@@ -1,6 +1,6 @@
 import { GraphQLError } from 'graphql';
 
-import { getErrorsByPathSegment, CombinedError } from '@graphql-tools/utils';
+import { getErrorsByPathSegment, CombinedError, relocatedError } from '@graphql-tools/utils';
 
 export function handleNull(errors: ReadonlyArray<GraphQLError>) {
   if (errors.length) {
@@ -10,7 +10,7 @@ export function handleNull(errors: ReadonlyArray<GraphQLError>) {
         return combinedError;
       }
       const error = errors[0];
-      return error.originalError || error;
+      return error.originalError || relocatedError(error, null);
     } else if (errors.some(error => typeof error.path[1] === 'string')) {
       const childErrors = getErrorsByPathSegment(errors);
 

diff --git a/packages/graphql-tag-pluck/package.json b/packages/graphql-tag-pluck/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/graphql-tag-pluck",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Pluck graphql-tag template literals",
   "license": "MIT",
   "repository": "git@github.com:ardatan/graphql-tools.git",
@@ -18,13 +18,13 @@
     "@babel/parser": "7.10.2",
     "@babel/traverse": "7.10.1",
     "@babel/types": "7.10.2",
-    "@graphql-tools/utils": "6.0.5"
+    "@graphql-tools/utils": "6.0.6"
   },
   "optionalDependencies": {
     "vue-template-compiler": "^2.6.11"
   },
   "devDependencies": {
-    "@types/babel__traverse": "7.0.11",
+    "@types/babel__traverse": "7.0.12",
     "vue-template-compiler": "2.6.11"
   },
   "publishConfig": {

diff --git a/packages/graphql-tools/package.json b/packages/graphql-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "graphql-tools",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "Useful tools to create and manipulate GraphQL schemas.",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "license": "MIT",
@@ -19,26 +19,26 @@
     "directory": "dist"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "6.0.5",
-    "@graphql-tools/graphql-tag-pluck": "6.0.5",
-    "@graphql-tools/import": "6.0.5",
-    "@graphql-tools/links": "6.0.5",
-    "@graphql-tools/load": "6.0.5",
-    "@graphql-tools/code-file-loader": "6.0.5",
-    "@graphql-tools/git-loader": "6.0.5",
-    "@graphql-tools/github-loader": "6.0.5",
-    "@graphql-tools/graphql-file-loader": "6.0.5",
-    "@graphql-tools/json-file-loader": "6.0.5",
-    "@graphql-tools/module-loader": "6.0.5",
-    "@graphql-tools/url-loader": "6.0.5",
-    "@graphql-tools/load-files": "6.0.5",
-    "@graphql-tools/merge": "6.0.5",
-    "@graphql-tools/mock": "6.0.5",
-    "@graphql-tools/relay-operation-optimizer": "6.0.5",
-    "@graphql-tools/resolvers-composition": "6.0.5",
-    "@graphql-tools/schema": "6.0.5",
-    "@graphql-tools/stitch": "6.0.5",
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/wrap": "6.0.5"
+    "@graphql-tools/delegate": "6.0.6",
+    "@graphql-tools/graphql-tag-pluck": "6.0.6",
+    "@graphql-tools/import": "6.0.6",
+    "@graphql-tools/links": "6.0.6",
+    "@graphql-tools/load": "6.0.6",
+    "@graphql-tools/code-file-loader": "6.0.6",
+    "@graphql-tools/git-loader": "6.0.6",
+    "@graphql-tools/github-loader": "6.0.6",
+    "@graphql-tools/graphql-file-loader": "6.0.6",
+    "@graphql-tools/json-file-loader": "6.0.6",
+    "@graphql-tools/module-loader": "6.0.6",
+    "@graphql-tools/url-loader": "6.0.6",
+    "@graphql-tools/load-files": "6.0.6",
+    "@graphql-tools/merge": "6.0.6",
+    "@graphql-tools/mock": "6.0.6",
+    "@graphql-tools/relay-operation-optimizer": "6.0.6",
+    "@graphql-tools/resolvers-composition": "6.0.6",
+    "@graphql-tools/schema": "6.0.6",
+    "@graphql-tools/stitch": "6.0.6",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/wrap": "6.0.6"
   }
 }
diff --git a/packages/import/package.json b/packages/import/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/import",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",

diff --git a/packages/links/package.json b/packages/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/links",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "graphql-upload": "11.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
     "apollo-link": "1.2.14",
     "apollo-upload-client": "13.0.0",
     "form-data": "3.0.0",

diff --git a/packages/load-files/package.json b/packages/load-files/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/load-files",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,7 +16,7 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "globby": "11.0.0",
+    "globby": "11.0.1",
     "unixify": "1.0.0",
     "fs-extra": "9.0.0"
   },

diff --git a/packages/load/package.json b/packages/load/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/load",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -22,9 +22,9 @@
     "graphql-type-json": "0.3.1"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/merge": "6.0.5",
-    "globby": "11.0.0",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/merge": "6.0.6",
+    "globby": "11.0.1",
     "import-from": "3.0.0",
     "is-glob": "4.0.1",
     "p-limit": "2.3.0",

diff --git a/packages/loaders/apollo-engine/package.json b/packages/loaders/apollo-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/apollo-engine-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,7 +16,7 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
     "cross-fetch": "3.0.4",
     "tslib": "~2.0.0"
   },

diff --git a/packages/loaders/code-file/package.json b/packages/loaders/code-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/code-file-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,8 +16,8 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/graphql-tag-pluck": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/graphql-tag-pluck": "6.0.6",
     "fs-extra": "9.0.0",
     "tslib": "~2.0.0"
   },

diff --git a/packages/loaders/git/package.json b/packages/loaders/git/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/git-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,8 +16,8 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/graphql-tag-pluck": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/graphql-tag-pluck": "6.0.6",
     "simple-git": "2.5.0"
   },
   "buildOptions": {

diff --git a/packages/loaders/github/package.json b/packages/loaders/github/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/github-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,8 +16,8 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/graphql-tag-pluck": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/graphql-tag-pluck": "6.0.6",
     "cross-fetch": "3.0.4"
   },
   "publishConfig": {

diff --git a/packages/loaders/graphql-file/package.json b/packages/loaders/graphql-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/graphql-file-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -19,8 +19,8 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/import": "6.0.5",
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/import": "6.0.6",
+    "@graphql-tools/utils": "6.0.6",
     "fs-extra": "9.0.0",
     "tslib": "~2.0.0"
   },

diff --git a/packages/loaders/json-file/package.json b/packages/loaders/json-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/json-file-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,7 +16,7 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
     "fs-extra": "9.0.0",
     "tslib": "~2.0.0"
   },

diff --git a/packages/loaders/module/package.json b/packages/loaders/module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/module-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,7 +16,7 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
     "tslib": "~2.0.0"
   },
   "publishConfig": {

diff --git a/packages/loaders/prisma/package.json b/packages/loaders/prisma/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/prisma-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -16,8 +16,8 @@
     "graphql": "^14.0.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/utils": "6.0.5",
-    "@graphql-tools/url-loader": "6.0.5",
+    "@graphql-tools/utils": "6.0.6",
+    "@graphql-tools/url-loader": "6.0.6",
     "fs-extra": "9.0.0",
     "prisma-yml": "1.34.10",
     "tslib": "~2.0.0"

diff --git a/packages/loaders/url/package.json b/packages/loaders/url/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/url-loader",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -23,8 +23,8 @@
     "supertest": "4.0.2"
   },
   "dependencies": {
-    "@graphql-tools/wrap": "6.0.5",
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/wrap": "6.0.6",
+    "@graphql-tools/utils": "6.0.6",
     "@types/websocket": "1.0.0",
     "cross-fetch": "3.0.4",
     "tslib": "~2.0.0",

diff --git a/packages/merge/package.json b/packages/merge/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/merge",
-  "version": "6.0.5",
+  "version": "6.0.6",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": "git@github.com:ardatan/graphql-tools.git",
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -19,8 +19,8 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/schema": "6.0.5",
-    "@graphql-tools/utils": "6.0.5",
+    "@graphql-tools/schema": "6.0.6",
+    "@graphql-tools/utils": "6.0.6",
     "tslib": "~2.0.0"
   },
   "publishConfig": {