Merge branch 'master' into master

apollographql · Mar 16, 2020 · 5ba31cf · 5ba31cf
2 parents a316622 + 38ad438
commit 5ba31cf
Show file tree

Hide file tree

Showing 17 changed files with 2,067 additions and 1,364 deletions.
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -29,15 +29,16 @@ module.exports = {
             'schema/creating-directives',
           ],
           'Fetching Data': [
-            'data/data',
+            'data/resolvers',
             'data/data-sources',
             'data/errors',
             'data/file-uploads',
             'data/subscriptions',
           ],
           'Apollo Federation': [
             'federation/introduction',
-            'federation/implementing',
+            'federation/implementing-services',
+            'federation/gateway',
             'federation/entities',
             'federation/value-types',
             'federation/errors',

diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -6,7 +6,7 @@
     "serve": "gatsby serve"
   },
   "dependencies": {
-    "gatsby": "2.19.32",
+    "gatsby": "2.19.43",
     "gatsby-theme-apollo-docs": "4.0.14",
     "react": "16.13.0",
     "react-dom": "16.13.0"

diff --git a/docs/shared/diagrams/federation-architecture.mdx b/docs/shared/diagrams/federation-architecture.mdx
@@ -0,0 +1,12 @@
+```mermaid
+graph BT;
+  webapp(Web app);
+  iosapp(iOS app);
+  gateway([Gateway]);
+  serviceA[Products service];
+  serviceB[Reviews service];
+  serviceC[Inventory service];
+  webapp & iosapp -.- gateway;
+  gateway --- serviceA & serviceB & serviceC;
+  class webapp,iosapp tertiary;
+```
diff --git a/docs/source/api/apollo-gateway.mdx b/docs/source/api/apollo-gateway.mdx
@@ -7,7 +7,7 @@ description: Apollo Gateway API reference
 ## `ApolloGateway`
 
 The core class of Apollo Server's federated gateway implementation. For an
-example of using `ApolloGateway`, see [Implementing a federated graph](/federation/implementing/).
+example of using `ApolloGateway`, see [The gateway](/federation/gateway/).
 
 ### `constructor(options)`: `ApolloGateway`
 

diff --git a/docs/source/api/graphql-tools.md b/docs/source/api/graphql-tools.md
@@ -61,7 +61,7 @@ const jsSchema = makeExecutableSchema({
 
 - `typeDefs` is a required argument and should be a GraphQL schema language string or array of GraphQL schema language strings or a function that takes no arguments and returns an array of GraphQL schema language strings. The order of the strings in the array is not important, but it must include a schema definition.
 
-- `resolvers` is an optional argument _(empty object by default)_ and should be an object that follows the pattern explained in the [resolvers documentation](/data/data/).
+- `resolvers` is an optional argument _(empty object by default)_ and should be an object that follows the pattern explained in the [resolvers documentation](/data/resolvers/).
 
 - `logger` is an optional argument, which can be used to print errors to the server console that are usually swallowed by GraphQL. The `logger` argument should be an object with a `log` function, eg. `const logger = { log: e => console.log(e) }`
 

diff --git a/docs/source/data/data.md b/docs/source/data/data.md