Merge branch 'master' into evans/context-error

CHANGELOG.md

@@ -4,6 +4,10 @@ All of the packages in the `apollo-server` repo are released with the same versi
 
 ### vNEXT
 
+### 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)
+
 ### v1.3.5
 
 * `apollo-server-adonis`: The `Content-type` of an operation response will now be correctly set to `application/json`. [PR #842](https://github.com/apollographql/apollo-server/pull/842) [PR #910](https://github.com/apollographql/apollo-server/pull/910)

docs/.gitignore

@@ -4,7 +4,6 @@ db.json
 *.log
 node_modules/
 public/*
-!public/_redirects
 .deploy*/
 docs.json
 _multiconfig.yml

docs/_config.yml

@@ -4,6 +4,7 @@ subtitle: Apollo Server
 description: A guide to using Apollo Server.
 versions:
   - '1'
+  - '2'
 sidebar_categories:
   null:
     - index
@@ -44,3 +45,6 @@ url: https://www.apollographql.com/docs/apollo-server/
 root: /docs/apollo-server/
 
 public_dir: public/docs/apollo-server
+
+versioned-netlify-redirects:
+  netlify_site_id: apollo-server-docs

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",
@@ -14,12 +14,15 @@
     "hexo-renderer-less": "0.2.0",
     "hexo-renderer-marked": "0.3.2",
     "hexo-server": "0.3.1",
-    "meteor-theme-hexo": "1.0.6"
+    "meteor-theme-hexo": "1.0.9"
   },
   "scripts": {
     "start": "npm run build && chexo apollo-hexo-config -- server",
     "build": "chexo apollo-hexo-config -- generate",
     "clean": "hexo clean",
     "test": "npm run clean; npm run build"
+  },
+  "dependencies": {
+    "hexo-versioned-netlify-redirects": "^1.0.7"
   }
 }

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "changelog": {
     "repo": "apollographql/apollo-server",
     "labels": {

package.json

@@ -40,19 +40,19 @@
     "@types/chai": "4.1.3",
     "@types/graphql": "^0.13.0",
     "@types/mocha": "5.2.0",
-    "@types/node": "9.6.6",
+    "@types/node": "9.6.9",
     "@types/sinon": "4.3.0",
     "chai": "4.1.2",
     "graphql": "0.13.2",
     "husky": "0.14.3",
     "istanbul": "1.1.0-alpha.1",
-    "lerna": "2.10.2",
+    "lerna": "2.11.0",
     "lint-staged": "6.1.1",
     "mocha": "5.1.1",
     "prettier": "1.12.1",
     "prettier-check": "2.0.0",
-    "remap-istanbul": "0.11.0",
-    "sinon": "4.5.0",
+    "remap-istanbul": "0.11.1",
+    "sinon": "5.0.3",
     "supertest": "3.0.0",
     "supertest-as-promised": "4.0.2",
     "typescript": "2.8.3"

packages/apollo-server-adonis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-adonis",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for Adonis Framework",
   "main": "dist/index.js",
   "scripts": {
@@ -25,16 +25,16 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
-    "@adonisjs/bodyparser": "2.0.2",
+    "@adonisjs/bodyparser": "2.0.3",
     "@adonisjs/fold": "4.0.8",
     "@adonisjs/framework": "4.0.31",
     "@adonisjs/sink": "1.0.16",
     "@types/graphql": "0.12.7",
-    "apollo-server-integration-testsuite": "^1.3.5"
+    "apollo-server-integration-testsuite": "^1.3.6"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/apollo-server-azure-functions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-azure-functions",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Node.js GraphQl server for Azure Functions",
   "main": "dist/index.js",
   "scripts": {
@@ -25,12 +25,12 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
-    "apollo-server-integration-testsuite": "^1.3.5",
+    "apollo-server-integration-testsuite": "^1.3.6",
     "azure-functions-typescript": "0.0.1"
   },
   "typings": "dist/index.d.ts",

packages/apollo-server-express/package.json

@@ -35,13 +35,14 @@
     "graphql-playground-middleware-express": "^1.6.1"
   },
   "devDependencies": {
-    "@types/body-parser": "1.16.8",
+    "@types/body-parser": "1.17.0",
     "@types/connect": "3.4.32",
     "@types/cors": "^2.8.4",
     "@types/express": "4.11.1",
     "@types/graphql": "0.12.7",
     "@types/multer": "1.3.6",
-    "apollo-server-integration-testsuite": "^1.3.5",
+    "apollo-server-integration-testsuite": "^1.3.6",
+    "body-parser": "1.18.2",
     "connect": "3.6.6",
     "connect-query": "1.0.0",
     "express": "4.16.3",

packages/apollo-server-hapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-hapi",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for Hapi",
   "main": "dist/index.js",
   "scripts": {
@@ -25,14 +25,14 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4",
     "boom": "^7.1.0"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
-    "apollo-server-integration-testsuite": "^1.3.5",
-    "hapi": "17.3.1"
+    "apollo-server-integration-testsuite": "^1.3.6",
+    "hapi": "17.4.0"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/apollo-server-integration-testsuite/package.json

@@ -1,7 +1,7 @@
 {
   "name": "apollo-server-integration-testsuite",
   "private": true,
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Apollo Server Integrations testsuite",
   "main": "dist/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4",
     "apollo-server-module-operation-store": "^1.3.5",
     "supertest": "^3.0.0"

packages/apollo-server-koa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-koa",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for Koa",
   "main": "dist/index.js",
   "scripts": {
@@ -25,16 +25,16 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
     "@types/koa": "2.0.45",
     "@types/koa-bodyparser": "4.2.0",
-    "@types/koa-router": "7.0.27",
-    "apollo-server-integration-testsuite": "^1.3.5",
-    "koa": "2.5.0",
+    "@types/koa-router": "7.0.28",
+    "apollo-server-integration-testsuite": "^1.3.6",
+    "koa": "2.5.1",
     "koa-bodyparser": "4.2.0",
     "koa-router": "7.4.0"
   },

packages/apollo-server-lambda/README.md

@@ -30,7 +30,7 @@ exports.graphiqlHandler = server.graphiqlLambda({
 
 #### 2. Create an S3 bucket
 
-The bucket name name must be universally unique.
+The bucket name must be universally unique.
 
 ```bash
 aws s3 mb s3://<bucket name>

packages/apollo-server-lambda/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-lambda",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for AWS Lambda",
   "main": "dist/index.js",
   "scripts": {
@@ -25,13 +25,13 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
-    "@types/aws-lambda": "8.10.1",
+    "@types/aws-lambda": "8.10.3",
     "@types/graphql": "0.12.7",
-    "apollo-server-integration-testsuite": "^1.3.5"
+    "apollo-server-integration-testsuite": "^1.3.6"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/apollo-server-micro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-micro",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for Micro",
   "main": "dist/index.js",
   "scripts": {
@@ -25,13 +25,13 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
     "@types/micro": "7.3.1",
-    "apollo-server-integration-testsuite": "^1.3.5",
+    "apollo-server-integration-testsuite": "^1.3.6",
     "micro": "8.0.4",
     "microrouter": "2.2.3"
   },

packages/apollo-server-restify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-server-restify",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Production-ready Node.js GraphQL server for Restify",
   "main": "dist/index.js",
   "scripts": {
@@ -25,13 +25,13 @@
   },
   "homepage": "https://github.com/apollographql/apollo-server#readme",
   "dependencies": {
-    "apollo-server-core": "^1.3.5",
+    "apollo-server-core": "^1.3.6",
     "apollo-server-module-graphiql": "^1.3.4"
   },
   "devDependencies": {
     "@types/graphql": "0.12.7",
     "@types/restify": "5.0.7",
-    "apollo-server-integration-testsuite": "^1.3.5",
+    "apollo-server-integration-testsuite": "^1.3.6",
     "restify": "5.2.1"
   },
   "typings": "dist/index.d.ts",