Merge branch 'main' into release-3.4.

CopyJosh · Jun 2, 2021 · f12dc3b · f12dc3b
2 parents 8c80f1c + 67fe4e8
commit f12dc3b
Show file tree

Hide file tree

Showing 10 changed files with 399 additions and 108 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   Filesize:
     docker:
-      - image: circleci/node:15
+      - image: circleci/node:16
     steps:
       - checkout
       - restore_cache:
@@ -26,7 +26,7 @@ jobs:
 
   Tests:
     docker:
-      - image: circleci/node:15
+      - image: circleci/node:16
     steps:
       - checkout
       - restore_cache:

diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -34,6 +34,7 @@ module.exports = {
             'data/subscriptions',
             'data/fragments',
             'data/error-handling',
+            'data/operation-best-practices'
           ],
           Caching: [
             'caching/cache-configuration',

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -8,10 +8,10 @@
   },
   "dependencies": {
     "gatsby": "2.32.13",
-    "gatsby-theme-apollo-docs": "4.7.4",
-    "react": "17.0.1",
+    "gatsby-theme-apollo-docs": "4.7.9",
+    "react": "17.0.2",
     "react-dom": "17.0.1",
-    "webpack-virtual-modules": "0.4.2"
+    "webpack-virtual-modules": "0.4.3"
   },
   "devDependencies": {
     "typedoc": "0.15.8",

diff --git a/docs/source/api/link/apollo-link-schema.md b/docs/source/api/link/apollo-link-schema.md
@@ -76,3 +76,4 @@ The `SchemaLink` constructor can be called with an object with the following pro
 | `schema` | An executable graphql schema |
 | `rootValue` | The root value that is passed to the resolvers (i.e. the first parameter for the [rootQuery](http://graphql.org/learn/execution/#root-fields-resolvers)) |
 | `context` | An object passed to the resolvers, following the [graphql specification](http://graphql.org/learn/execution/#root-fields-resolvers) or a function that accepts the operation and returns the resolver context. The resolver context may contain all the data-fetching connectors for an operation. |
+| `validate` | Enable validation of incoming queries against the local schema before execution, returning validation errors in `result.errors`, just like a non-local GraphQL endpoint typically would. |