ardatan · Jul 28, 2021 · Jul 28, 2021 · Jul 28, 2021 · Jul 28, 2021 · Jul 28, 2021
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -39,7 +39,10 @@ jobs:
         run: node scripts/install-typedocs-typescript-version.js
       - name: Install Dependencies using Yarn
         run: yarn install --ignore-engines && git checkout yarn.lock
+      - name: Build Website
+        run: cd website/ && yarn build && yarn export && touch out/.nojekyll
       - name: Deploy 🚀
-        run: yarn deploy:website
-        env:
-          GIT_USER: theguild-bot
+        uses: JamesIves/github-pages-deploy-action@4.1.4
+        with:
+          branch: gh-pages # The branch the action should deploy to.
+          folder: website/out # The folder the action should deploy.
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,6 @@ junit.xml
 
 package-lock.json
 website/yarn.lock
+website/api-sidebar.json
+website/docs/api
+website/out
diff --git a/README.md b/README.md
@@ -13,15 +13,16 @@ This package provides a few useful ways to create a GraphQL schema:
 
 1. Use the GraphQL schema language to [generate a schema](https://graphql-tools.com/docs/generate-schema) with full support for resolvers, interfaces, unions, and custom scalars. The schema produced is completely compatible with [GraphQL.js](https://github.com/graphql/graphql-js).
 2. [Mock your GraphQL API](https://graphql-tools.com/docs/mocking) with fine-grained per-type mocking
-3. Automatically [stitch multiple schemas together](https://graphql-tools.com/docs/stitch-combining-schemas) into one larger API
+3. Automatically [stitch multiple schemas together](https://www.graphql-tools.com/docs/schema-stitching/stitch-1-combining-schemas
+) into one larger API
 
 ## Documentation
 
 [Read the docs.](https://graphql-tools.com/docs/introduction)
 
 ## Binding to HTTP
 
-If you want to bind your JavaScript GraphQL schema to an HTTP server, you can use [`express-graphql`](https://github.com/graphql/express-graphql).
+If you want to bind your JavaScript GraphQL schema to an HTTP server, you can use [`express-graphql`](https://github.com/graphql/express-graphql) .
 
 You can develop your JavaScript based GraphQL API with `graphql-tools` and `express-graphql` together: One to write the schema and resolver code, and the other to connect it to a web server.
 
@@ -133,7 +134,7 @@ app.listen(4000);
 console.log('Running a GraphQL API server at http://localhost:4000/graphql');
 ```
 
-This example has the entire type definition in one string and all resolvers in one file, but you can combine types and resolvers from multiple files and objects, as documented in the [modularizing type definitions](https://graphql-tools.com/docs/merge-typedefs) and [merging resolvers](https://graphql-tools.com/docs/merge-resolvers) section of the docs.
+This example has the entire type definition in one string and all resolvers in one file, but you can combine types and resolvers from multiple files and objects, as documented in the [modularizing type definitions](https://graphql-tools.com/docs/schema-merging#merging-type-definitions) and [merging resolvers](https://graphql-tools.com/docs/schema-merging#merging-resolvers) section of the docs.
 
 ## Contributions
 

diff --git a/benchmark/federation/CHANGELOG.md b/benchmark/federation/CHANGELOG.md
@@ -1,6 +1,29 @@
 # federation-benchmark
 
+## 0.0.4
+
+### Patch Changes
+
+- @graphql-tools/stitch@8.0.3
+- @graphql-tools/stitching-directives@2.0.3
+
+## 0.0.3
+
+### Patch Changes
+
+- @graphql-tools/stitch@8.0.2
+- @graphql-tools/stitching-directives@2.0.2
+
+## 0.0.2
+
+### Patch Changes
+
+- Updated dependencies [c36defbe]
+  - @graphql-tools/stitch@8.0.1
+  - @graphql-tools/stitching-directives@2.0.1
+
 ## 0.0.1
+
 ### Patch Changes
 
 - Updated dependencies [91155ab6]

diff --git a/benchmark/federation/package.json b/benchmark/federation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "federation-benchmark",
-  "version": "0.0.1",
+  "version": "0.0.4",
   "private": true,
   "scripts": {
     "start": "cross-env NODE_ENV=production node index.js",
@@ -11,8 +11,8 @@
   "dependencies": {
     "@apollo/gateway": "0.34.0",
     "@apollo/federation": "0.27.0",
-    "@graphql-tools/stitch": "8.0.0",
-    "@graphql-tools/stitching-directives": "2.0.0",
+    "@graphql-tools/stitch": "8.0.3",
+    "@graphql-tools/stitching-directives": "2.0.3",
     "express": "4.17.1",
     "graphql": "15.5.1",
     "graphql-tag": "2.12.5",

diff --git a/package.json b/package.json
@@ -97,6 +97,7 @@
   },
   "resolutions": {
     "graphql": "15.5.1",
+    "esbuild": "^0.12.8",
     "@changesets/apply-release-plan": "5.0.0"
   }
 }
diff --git a/packages/batch-delegate/CHANGELOG.md b/packages/batch-delegate/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @graphql-tools/batch-delegate
 
+## 8.0.3
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+  - @graphql-tools/delegate@8.0.3
+
+## 8.0.2
+
+### Patch Changes
+
+- Updated dependencies [d93945fa]
+  - @graphql-tools/delegate@8.0.2
+
+## 8.0.1
+
+### Patch Changes
+
+- c36defbe: fix(delegate): fix ESM import
+- Updated dependencies [c36defbe]
+  - @graphql-tools/delegate@8.0.1
+
 ## 8.0.0
 
 ### Major Changes

diff --git a/packages/batch-delegate/README.md b/packages/batch-delegate/README.md
@@ -1,5 +1,6 @@
 Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/batch-delegate
+https://www.graphql-tools.com/docs/api/modules/batch_delegate_src
 
 You can also learn more about Batch Delegation in this chapter;
-https://www.graphql-tools.com/docs/stitch-schema-extensions#batch-delegation
+https://www.graphql-tools.com/docs/schema-stitching/stitch-4-schema-extensions
+#batch-delegation
diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-delegate",
-  "version": "8.0.0",
+  "version": "8.0.3",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -32,14 +32,14 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^8.0.0",
-    "@graphql-tools/utils": "^8.0.0",
+    "@graphql-tools/delegate": "8.0.3",
+    "@graphql-tools/utils": "8.0.1",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0"
   },
   "devDependencies": {
-    "@graphql-tools/schema": "^8.0.0",
-    "@graphql-tools/stitch": "^8.0.0"
+    "@graphql-tools/schema": "^8.0.1",
+    "@graphql-tools/stitch": "^8.0.3"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/batch-execute/CHANGELOG.md b/packages/batch-execute/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-tools/batch-execute
 
+## 8.0.1
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+
 ## 8.0.0
 
 ### Major Changes

diff --git a/packages/batch-execute/README.md b/packages/batch-execute/README.md
@@ -1,5 +1,6 @@
 Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/batch-execute
+https://www.graphql-tools.com/docs/api/modules/batch_execute_src
 
 You can also learn more about Batch Delegation in this chapter;
-https://www.graphql-tools.com/docs/stitch-schema-extensions#batch-delegation
+https://www.graphql-tools.com/docs/schema-stitching/stitch-4-schema-extensions#batch-delegation
+
diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/batch-execute",
-  "version": "8.0.0",
+  "version": "8.0.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -32,7 +32,7 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^8.0.0",
+    "@graphql-tools/utils": "8.0.1",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"

diff --git a/packages/delegate/CHANGELOG.md b/packages/delegate/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @graphql-tools/delegate
 
+## 8.0.3
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+  - @graphql-tools/batch-execute@8.0.1
+  - @graphql-tools/schema@8.0.1
+
+## 8.0.2
+
+### Patch Changes
+
+- d93945fa: fix(delegate): ignore if stitchingInfo is not in extensions
+
+## 8.0.1
+
+### Patch Changes
+
+- c36defbe: fix(delegate): fix ESM import
+
 ## 8.0.0
 
 ### Major Changes

diff --git a/packages/delegate/README.md b/packages/delegate/README.md
@@ -1,6 +1,7 @@
 Check API Reference for more information about this package;
-https://www.graphql-tools.com/docs/api/modules/delegate
+https://www.graphql-tools.com/docs/api/modules/delegate_src
 
 You can also learn more about Schema Delegation in this chapter;
 https://www.graphql-tools.com/docs/schema-delegation
 
+
diff --git a/packages/delegate/package.json b/packages/delegate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/delegate",
-  "version": "8.0.0",
+  "version": "8.0.3",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -32,9 +32,9 @@
     "input": "./src/index.ts"
   },
   "dependencies": {
-    "@graphql-tools/batch-execute": "^8.0.0",
-    "@graphql-tools/schema": "^8.0.0",
-    "@graphql-tools/utils": "^8.0.0",
+    "@graphql-tools/batch-execute": "^8.0.1",
+    "@graphql-tools/schema": "^8.0.1",
+    "@graphql-tools/utils": "8.0.1",
     "dataloader": "2.0.0",
     "tslib": "~2.3.0",
     "value-or-promise": "1.0.10"

diff --git a/packages/delegate/src/mergeFields.ts b/packages/delegate/src/mergeFields.ts
@@ -15,7 +15,7 @@ import {
 import { ExternalObject, MergedTypeInfo, SubschemaConfig } from './types';
 import { memoize4, memoize3, memoize2 } from './memoize';
 import { Subschema } from './Subschema';
-import { collectFields, ExecutionContext } from 'graphql/execution/execute';
+import { collectFields, ExecutionContext } from 'graphql/execution/execute.js';
 import { relocatedError } from '@graphql-tools/utils';
 import { FIELD_SUBSCHEMA_MAP_SYMBOL, OBJECT_SUBSCHEMA_SYMBOL, UNPATHED_ERRORS_SYMBOL } from './symbols';
 

diff --git a/packages/delegate/src/prepareGatewayDocument.ts b/packages/delegate/src/prepareGatewayDocument.ts
@@ -336,9 +336,9 @@ const getSchemaMetaData = memoize2(
       possibleTypesMap,
       reversePossibleTypesMap: reversePossibleTypesMap(possibleTypesMap),
       interfaceExtensionsMap,
-      fieldNodesByType: sourceSchema.extensions?.['stitchingInfo'].fieldNodesByType ?? {},
-      fieldNodesByField: sourceSchema.extensions?.['stitchingInfo'].fieldNodesByField ?? {},
-      dynamicSelectionSetsByField: sourceSchema.extensions?.['stitchingInfo'].dynamicSelectionSetsByField ?? {},
+      fieldNodesByType: sourceSchema.extensions?.['stitchingInfo']?.fieldNodesByType ?? {},
+      fieldNodesByField: sourceSchema.extensions?.['stitchingInfo']?.fieldNodesByField ?? {},
+      dynamicSelectionSetsByField: sourceSchema.extensions?.['stitchingInfo']?.dynamicSelectionSetsByField ?? {},
     };
   }
 );

diff --git a/packages/graphql-tag-pluck/CHANGELOG.md b/packages/graphql-tag-pluck/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-tools/graphql-tag-pluck
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+
 ## 7.0.0
 
 ### Major Changes

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": "7.0.0",
+  "version": "7.0.1",
   "description": "Pluck graphql-tag template literals",
   "license": "MIT",
   "repository": {
@@ -32,7 +32,7 @@
     "@babel/parser": "7.14.8",
     "@babel/traverse": "7.14.8",
     "@babel/types": "7.14.8",
-    "@graphql-tools/utils": "^8.0.0",
+    "@graphql-tools/utils": "8.0.1",
     "tslib": "~2.3.0"
   },
   "devDependencies": {

diff --git a/packages/links/CHANGELOG.md b/packages/links/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @graphql-tools/links
 
+## 8.0.3
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+  - @graphql-tools/delegate@8.0.3
+
+## 8.0.2
+
+### Patch Changes
+
+- Updated dependencies [d93945fa]
+  - @graphql-tools/delegate@8.0.2
+
+## 8.0.1
+
+### Patch Changes
+
+- c36defbe: fix(delegate): fix ESM import
+- Updated dependencies [c36defbe]
+  - @graphql-tools/delegate@8.0.1
+
 ## 8.0.0
 
 ### Major Changes

diff --git a/packages/links/package.json b/packages/links/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/links",
-  "version": "8.0.0",
+  "version": "8.0.3",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -45,8 +45,8 @@
     "graphql-upload": "12.0.0"
   },
   "dependencies": {
-    "@graphql-tools/delegate": "^8.0.0",
-    "@graphql-tools/utils": "^8.0.0",
+    "@graphql-tools/delegate": "8.0.3",
+    "@graphql-tools/utils": "8.0.1",
     "apollo-upload-client": "16.0.0",
     "cross-fetch": "3.1.4",
     "form-data": "4.0.0",

diff --git a/packages/load/CHANGELOG.md b/packages/load/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-tools/load
 
+## 7.0.1
+
+### Patch Changes
+
+- Updated dependencies [b823dbaf]
+  - @graphql-tools/utils@8.0.1
+  - @graphql-tools/merge@6.2.16
+
 ## 7.0.0
 
 ### Major Changes

diff --git a/packages/load/package.json b/packages/load/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-tools/load",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "A set of utils for faster development of GraphQL tools",
   "repository": {
     "type": "git",
@@ -34,8 +34,8 @@
     "graphql-type-json": "0.3.2"
   },
   "dependencies": {
-    "@graphql-tools/utils": "^8.0.0",
-    "@graphql-tools/merge": "^6.2.15",
+    "@graphql-tools/utils": "8.0.1",
+    "@graphql-tools/merge": "^6.2.16",
     "import-from": "4.0.0",
     "p-limit": "3.1.0",
     "tslib": "~2.3.0"