Merge branch 'master' into lambda-async

.circleci/config.yml

@@ -65,14 +65,17 @@ jobs:
     docker: [{ image: 'circleci/node:8' }]
     <<: *common_test_steps
 
-  # NODE: Note certain tests are currently being skipped for Node.js 10.
   Node.js 10:
     docker: [{ image: 'circleci/node:10' }]
     <<: *common_test_steps
 
+  Node.js 12:
+    docker: [{ image: 'circleci/node:12' }]
+    <<: *common_test_steps
+
   # Other tests, unrelated to typical code tests.
   Linting:
-    docker: [{ image: 'circleci/node:8' }]
+    docker: [{ image: 'circleci/node:10' }]
     steps:
       # (speed) Intentionally omitted, unnecessary, run_install_desired_npm.
       - checkout
@@ -99,5 +102,7 @@ workflows:
           <<: *ignore_doc_branches
       - Node.js 10:
           <<: *ignore_doc_branches
+      - Node.js 12:
+          <<: *ignore_doc_branches
       - Linting:
           <<: *ignore_doc_branches

.vscode/settings.json

@@ -3,16 +3,7 @@
   "editor.tabSize": 2,
   "editor.rulers": [80],
   "editor.wordWrapColumn": 80,
-  "editor.formatOnSave": true,
   "files.trimTrailingWhitespace": true,
   "files.insertFinalNewline": true,
-  "files.exclude": {
-    "**/.git": true,
-    "**/.DS_Store": true,
-    "**/node_modules/": true,
-    "**/dist/": true,
-    "coverage": true,
-    "coverage.lcov": true
-  },
   "typescript.tsdk": "./node_modules/typescript/lib"
 }

CONTRIBUTING.md

@@ -66,7 +66,7 @@ For significant changes to a repository, it’s important to settle on a design
 2.  **Reach consensus.** Some contributors and community members should reach an agreement that this feature or bug is important, and that someone should work on implementing or fixing it.
 3.  **Agree on intended behavior.** On the issue, reach an agreement about the desired behavior. In the case of a bug fix, it should be clear what it means for the bug to be fixed, and in the case of a feature, it should be clear what it will be like for developers to use the new feature.
 4.  **Agree on implementation plan.** Write a plan for how this feature or bug fix should be implemented. What modules need to be added or rewritten? Should this be one pull request or multiple incremental improvements? Who is going to do each part?
-5.  **Submit PR.** In the case where multiple dependent patches need to be made to implement the change, only submit one at a time. Otherwise, the others might get stale while the first is reviewed and merged. Make sure to avoid “while we’re here” type changes - if something isn’t relevant to the improvement at hand, it should be in a separate PR; this especially includes code style changes of unrelated code.
+5.  **Submit PR.** In the case where multiple dependent patches need to be made to implement the change, only submit one at a time. Otherwise, the others might get stale while the first is reviewed and merged. Make sure to avoid “while we’re here” type changes - if something isn’t relevant to the improvement at hand, it should be in a separate PR; this especially includes code style changes of unrelated code. Keep in mind that, upon opening a PR, if the _Contributor License Agreement (CLA)_ hasn't been previously signed, it will be requested that you sign it. The CLA [can be previewed here](https://contribute.meteor.com).
 6.  **Review.** At least one core contributor should sign off on the change before it’s merged. Look at the “code review” section below to learn about factors are important in the code review. If you want to expedite the code being merged, try to review your own code first!
 7.  **Merge and release!**
 
@@ -85,4 +85,4 @@ It’s important that every piece of code in Apollo packages is reviewed by at l
 
 If you want to contribute to Apollo server, but aren't quite sure where to start, take a look at the [roadmap and design docs](./ROADMAP.md). Just pick one of the upcoming features that you're interested in, and start working on it. If the design doc isn't clear enough (which it probably won't be), open an issue thread so we can discuss it.
 
-Last but not least, make sure to join the [Apollo Slack channel](http://slack.apollostack.com), where there are lots of other friendly contributors to talk to.
+Last but not least, make sure to join the [Apollo Spectrum community](https://spectrum.chat/apollo), where there are lots of other friendly contributors to talk to.

docs/gatsby-config.js

@@ -46,6 +46,7 @@ module.exports = {
             'federation/errors',
             'federation/migrating-from-stitching',
             'federation/federation-spec',
+            'federation/metrics',
           ],
           // 'Schema stitching': [
           //   'features/schema-stitching',