Apollo Server 2.0

.circleci/config.yml

@@ -1,20 +1,13 @@
 version: 2
 
-#
 # Reusable Snippets!
 #
 # These are re-used by the various tests below, to avoid repetition.
 #
 run_install_desired_npm: &run_install_desired_npm
   run:
-    # Due to a bug, npm upgrades from the version of npm that ships with
-    # Node.js 6 (npm v3.10.10) go poorly and generally causes other problems
-    # with the environment.  Since yarn is already available here we can just
-    # use that to work-around the issue.  It's possible that npm cleanup might
-    # prevent this from being necessary, but this can be removed once Node 6 is
-    # no longer being built below.
-    name: Install npm@5, but with yarn.
-    command: sudo yarn global add npm@5
+    name: Install npm@6
+    command: sudo npm install -g npm@6
 
 # These are the steps used for each version of Node which we're testing
 # against.  Thanks to YAMLs inability to merge arrays (though it is able
@@ -36,20 +29,12 @@ jobs:
   # Platform tests, each with the same tests but different platform or version.
   # The docker tag represents the Node.js version and the full list is available
   # at https://hub.docker.com/r/circleci/node/.
-  Node.js 4:
-    docker: [ { image: 'circleci/node:4' } ]
-    <<: *common_test_steps
-
-  Node.js 6:
-    docker: [ { image: 'circleci/node:6' } ]
-    <<: *common_test_steps
-
   Node.js 8:
     docker: [ { image: 'circleci/node:8' } ]
     <<: *common_test_steps
 
-  Node.js 9:
-    docker: [ { image: 'circleci/node:9' } ]
+  Node.js 10:
+    docker: [ { image: 'circleci/node:10' } ]
     <<: *common_test_steps
 
   # Other tests, unrelated to typical code tests.
@@ -69,13 +54,20 @@ jobs:
       # (speed) Ignore scripts to skip the Lerna build stuff for linting.
       - run: npm install-test --prefix ./docs
 
+ignore_doc_branches: &ignore_doc_branches
+  filters:
+    branches:
+      # If 'docs' is found, with word boundaries on either side, skip.
+      ignore: /.*?\bdocs\b.*/
+
 workflows:
   version: 2
   Build and Test:
     jobs:
-      - Node.js 4
-      - Node.js 6
-      - Node.js 8
-      - Node.js 9
-      - Linting
+      - Node.js 8:
+          <<: *ignore_doc_branches
+      - Node.js 10:
+          <<: *ignore_doc_branches
+      - Linting:
+          <<: *ignore_doc_branches
       - Docs

CHANGELOG.md

@@ -4,6 +4,9 @@ All of the packages in the `apollo-server` repo are released with the same versi
 
 ### vNEXT
 
+* Upgrade `subscription-transport-ws` to 0.9.9 for Graphiql
+* Remove tests and guaranteed support for Node 4 [PR #1024](https://github.com/apollographql/apollo-server/pull/1024)
+
 ### v1.3.6
 
 * Recognize requests with Apollo Persisted Queries and return `PersistedQueryNotSupported` to the client instead of a confusing error. [PR #982](https://github.com/apollographql/apollo-server/pull/982)

README.md

@@ -235,7 +235,8 @@ store.put('query testquery{ testString }');
 graphqlOptions = {
   schema: Schema,
   formatParams(params) {
-    params['query'] = store.get(params.operationName);
+    params['parsedQuery'] = store.get(params.operationName);
+    delete params['queryString'];  // Or throw if this is provided.
     return params;
   },
 };

docs/_config.yml

@@ -4,36 +4,42 @@ subtitle: Apollo Server
 description: A guide to using Apollo Server.
 versions:
   - '1'
-  - '2'
 sidebar_categories:
   null:
     - index
-    - example
-    - setup
-    - requests
-    - graphiql
-  Servers:
-    - servers/express
-    - servers/hapi
-    - servers/koa
-    - servers/lambda
-    - servers/micro
-    - servers/restify
-    - servers/azure-functions
-    - servers/adonis
-  Related:
-    - title: Monitoring and caching
-      href: https://www.apollographql.com/docs/engine/setup-node.html
-    - title: graphql-tools
-      href: https://www.apollographql.com/docs/graphql-tools/
-    - 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
+    - getting-started
+    - whats-new
+  Essentials:
+    - essentials/schema
+    - essentials/server
+    - essentials/data
+  Features:
+    - features/mocking
+    - features/errors
+    - features/apq
+    - features/logging
+    - features/scalars-enums
+    - features/unions-interfaces
+    - features/directives
+    - features/creating-directives
+  # Schema stitching:
+  #   - features/schema-stitching
+  #   - features/remote-schemas
+  #   - features/schema-delegation
+  #   - features/schema-transforms
+  Deployment:
+    # - deployment/index
+    - deployment/heroku
+    # - deployment/lambda
+  API Reference:
+    - api/apollo-server
+    - title: graphql-subscriptions
+      href: https://www.apollographql.com/docs/graphql-subscriptions
+    - title: apollo-engine
+      href: https://www.apollographql.com/docs/engine/setup-node.html#api
+    - api/graphql-tools
   Migration:
-    - migration-one-dot
-    - migration-hapi
-    - migration
+    - migration-two-dot
 
 github_repo: apollographql/apollo-server
 content_root: docs/source

docs/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "hexo": {
-    "version": "3.6.0"
+    "version": "3.7.1"
   },
   "devDependencies": {
     "apollo-hexo-config": "1.0.7",
@@ -13,8 +13,8 @@
     "hexo-renderer-ejs": "0.3.1",
     "hexo-renderer-less": "0.2.0",
     "hexo-renderer-marked": "0.3.2",
-    "hexo-server": "0.3.1",
-    "meteor-theme-hexo": "1.0.6"
+    "hexo-server": "0.3.2",
+    "meteor-theme-hexo": "1.0.13"
   },
   "scripts": {
     "start": "npm run build && chexo apollo-hexo-config -- server",

docs/source/api/apollo-engine.md

@@ -0,0 +1,3 @@
+---
+title: apollo-engine
+---