Merge branch 'master' into hwillson/preserve-stitching-errors

ardatan · Mar 26, 2019 · 1aee6c2 · 1aee6c2
2 parents 7fa081e + 305466b
commit 1aee6c2
Show file tree

Hide file tree

Showing 15 changed files with 13,538 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 * Fixes a bug where schemas with scalars could not be merged when passed to
   `mergeSchemas` as a string or `GraphQLSchema`.  <br/>
   [@hayes](https://github.com/hayes) in [#1062](https://github.com/apollographql/graphql-tools/pull/1062)
+* Make `mergeSchemas` optionally merge directive definitions.  <br/>
+  [@freiksenet](https://github.com/freiksenet) in [#1003](https://github.com/apollographql/graphql-tools/pull/1003)
 
 ### 4.0.4
 

diff --git a/docs/.gitignore b/docs/.gitignore
@@ -4,7 +4,8 @@ db.json
 *.log
 node_modules/
 public/*
-!public/_redirects
 .deploy*/
 docs.json
 _multiconfig.yml
+.cache
+!package-lock.json
diff --git a/docs/.nvmrc b/docs/.nvmrc
@@ -1 +1 @@
-8
+10
diff --git a/docs/_config.yml b/docs/_config.yml
diff --git a/docs/assets/theme-colors.less b/docs/assets/theme-colors.less
diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -0,0 +1,50 @@
+module.exports = {
+  __experimentalThemes: [
+    {
+      resolve: 'gatsby-theme-apollo-docs',
+      options: {
+        root: __dirname,
+        subtitle: 'GraphQL Tools',
+        description: 'A guide to using GraphQL Tools',
+        contentDir: 'docs/source',
+        basePath: '/docs/graphql-tools',
+        githubRepo: 'apollographql/graphql-tools',
+        sidebarCategories: {
+          null: [
+            'index',
+            'generate-schema',
+            'resolvers',
+            'scalars',
+            'mocking',
+            'connectors',
+            'schema-directives',
+            'schema-delegation',
+            'remote-schemas',
+            'schema-transforms',
+            'schema-stitching'
+          ],
+          Related: [
+            {
+              title: 'Monitoring and caching',
+              href: 'https://www.apollographql.com/docs/engine/setup-node.html'
+            },
+            {
+              title: 'Apollo Server',
+              href: 'https://www.apollographql.com/docs/apollo-server/'
+            },
+            {
+
+              title: 'GraphQL Subscriptions',
+              href: 'https://www.apollographql.com/docs/graphql-subscriptions/'
+            },
+            {
+
+              title: 'Production deployment',
+              href: 'https://dev-blog.apollodata.com/graphql-over-rest-with-node-heroku-and-apollo-engine-fb8581f8d77f'
+            }
+          ]
+        }
+      }
+    }
+  ]
+};