From 8bd1ad0a6d633f804afafa385bc345ba507445d9 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Apr 2018 11:32:30 -0700 Subject: [PATCH 01/30] CHANGELOG update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aaa7b97e4b1..e2b71896b15 100644 --- a/CHANGELOG.md +++ b/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) From b32e89c06008719d2fb45e5e22a767625ea13c0a Mon Sep 17 00:00:00 2001 From: David Glasser Date: Tue, 24 Apr 2018 11:35:14 -0700 Subject: [PATCH 02/30] v1.3.6 --- lerna.json | 2 +- packages/apollo-server-adonis/package.json | 6 +++--- packages/apollo-server-azure-functions/package.json | 6 +++--- packages/apollo-server-core/package.json | 2 +- packages/apollo-server-express/package.json | 6 +++--- packages/apollo-server-hapi/package.json | 6 +++--- packages/apollo-server-integration-testsuite/package.json | 4 ++-- packages/apollo-server-koa/package.json | 6 +++--- packages/apollo-server-lambda/package.json | 6 +++--- packages/apollo-server-micro/package.json | 6 +++--- packages/apollo-server-restify/package.json | 6 +++--- packages/graphql-server-core/package.json | 4 ++-- packages/graphql-server-express/package.json | 4 ++-- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-koa/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 4 ++-- packages/graphql-server-micro/package.json | 4 ++-- packages/graphql-server-restify/package.json | 4 ++-- 18 files changed, 42 insertions(+), 42 deletions(-) diff --git a/lerna.json b/lerna.json index ff2fd038ec4..12af0b7c26e 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0", - "version": "1.3.5", + "version": "1.3.6", "changelog": { "repo": "apollographql/apollo-server", "labels": { diff --git a/packages/apollo-server-adonis/package.json b/packages/apollo-server-adonis/package.json index c741a7a60e0..9ea220e4533 100644 --- a/packages/apollo-server-adonis/package.json +++ b/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,7 +25,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" }, "devDependencies": { @@ -34,7 +34,7 @@ "@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": { diff --git a/packages/apollo-server-azure-functions/package.json b/packages/apollo-server-azure-functions/package.json index edd3a074cb6..7e07c030c37 100644 --- a/packages/apollo-server-azure-functions/package.json +++ b/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", diff --git a/packages/apollo-server-core/package.json b/packages/apollo-server-core/package.json index 84f71ba58b6..e6d5b07d844 100644 --- a/packages/apollo-server-core/package.json +++ b/packages/apollo-server-core/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-core", - "version": "1.3.5", + "version": "1.3.6", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 0cfe1ff1bf1..6f73f2a7178 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -1,6 +1,6 @@ { "name": "apollo-server-express", - "version": "1.3.5", + "version": "1.3.6", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,7 +26,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" }, "devDependencies": { @@ -35,7 +35,7 @@ "@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", diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 7d5c474630a..5ac1dbabf91 100644 --- a/packages/apollo-server-hapi/package.json +++ b/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,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", "boom": "^7.1.0" }, "devDependencies": { "@types/graphql": "0.12.7", - "apollo-server-integration-testsuite": "^1.3.5", + "apollo-server-integration-testsuite": "^1.3.6", "hapi": "17.3.1" }, "typings": "dist/index.d.ts", diff --git a/packages/apollo-server-integration-testsuite/package.json b/packages/apollo-server-integration-testsuite/package.json index 6acc18d911e..9515dd5d538 100644 --- a/packages/apollo-server-integration-testsuite/package.json +++ b/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" diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 9999d433c82..3d097ffda6e 100644 --- a/packages/apollo-server-koa/package.json +++ b/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,7 +25,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" }, "devDependencies": { @@ -33,7 +33,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", + "apollo-server-integration-testsuite": "^1.3.6", "koa": "2.5.0", "koa-bodyparser": "4.2.0", "koa-router": "7.4.0" diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index e0e3ae27d61..5fc2fe8c3b7 100644 --- a/packages/apollo-server-lambda/package.json +++ b/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/graphql": "0.12.7", - "apollo-server-integration-testsuite": "^1.3.5" + "apollo-server-integration-testsuite": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/apollo-server-micro/package.json b/packages/apollo-server-micro/package.json index 779f17acc7d..b4bf6ba5f9f 100644 --- a/packages/apollo-server-micro/package.json +++ b/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" }, diff --git a/packages/apollo-server-restify/package.json b/packages/apollo-server-restify/package.json index e0e0a07b391..c81b148006e 100644 --- a/packages/apollo-server-restify/package.json +++ b/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", diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 632778b605e..7ab3f85b718 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-core", - "version": "1.3.5", + "version": "1.3.6", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { @@ -24,7 +24,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-core": "^1.3.5" + "apollo-server-core": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index 9333ca479b4..add52eb812b 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-express", - "version": "1.3.5", + "version": "1.3.6", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-express": "^1.3.5" + "apollo-server-express": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 8ec4f2d9cf0..be5a9ad6b14 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "graphql-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,7 +25,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-hapi": "^1.3.5" + "apollo-server-hapi": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index 02fad2f8e8c..0ce73237580 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "graphql-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,7 +25,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-koa": "^1.3.5" + "apollo-server-koa": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 108111e96c5..c2a7b2bd77b 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "graphql-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,7 +25,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-lambda": "^1.3.5" + "apollo-server-lambda": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index 018ef4b4627..c479808995f 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "graphql-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,7 +25,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-micro": "^1.3.5" + "apollo-server-micro": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index 08d8a587282..9a4e08f09e9 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -1,6 +1,6 @@ { "name": "graphql-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,7 +25,7 @@ }, "homepage": "https://github.com/apollographql/apollo-server#readme", "dependencies": { - "apollo-server-restify": "^1.3.5" + "apollo-server-restify": "^1.3.6" }, "typings": "dist/index.d.ts", "typescript": { From 363171bff2db84538b86fa59cd54adf64796e9e0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Apr 2018 05:02:14 +0000 Subject: [PATCH 03/30] chore(deps): update dependency @types/aws-lambda to v8.10.2 --- packages/apollo-server-lambda/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index 5fc2fe8c3b7..d311a21334f 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -29,7 +29,7 @@ "apollo-server-module-graphiql": "^1.3.4" }, "devDependencies": { - "@types/aws-lambda": "8.10.1", + "@types/aws-lambda": "8.10.2", "@types/graphql": "0.12.7", "apollo-server-integration-testsuite": "^1.3.6" }, From d8fecdc5c8bf6140332d5e24c75b16fc1a3034af Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Apr 2018 06:52:45 +0000 Subject: [PATCH 04/30] chore(deps): update dependency @types/body-parser to v1.17.0 --- packages/apollo-server-express/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-express/package.json b/packages/apollo-server-express/package.json index 6f73f2a7178..65537cd6a7c 100644 --- a/packages/apollo-server-express/package.json +++ b/packages/apollo-server-express/package.json @@ -30,7 +30,7 @@ "apollo-server-module-graphiql": "^1.3.4" }, "devDependencies": { - "@types/body-parser": "1.16.8", + "@types/body-parser": "1.17.0", "@types/connect": "3.4.32", "@types/express": "4.11.1", "@types/graphql": "0.12.7", From 3815aa63cf3c72ccbd74a44c8fad27f72d39e146 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Apr 2018 09:01:26 +0000 Subject: [PATCH 05/30] chore(deps): update dependency @types/koa-router to v7.0.28 --- packages/apollo-server-koa/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 3d097ffda6e..3abcf5a9ced 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -32,7 +32,7 @@ "@types/graphql": "0.12.7", "@types/koa": "2.0.45", "@types/koa-bodyparser": "4.2.0", - "@types/koa-router": "7.0.27", + "@types/koa-router": "7.0.28", "apollo-server-integration-testsuite": "^1.3.6", "koa": "2.5.0", "koa-bodyparser": "4.2.0", From 297e501231d14321fe5f8161c767a96b647201b7 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 25 Apr 2018 09:47:00 +0000 Subject: [PATCH 06/30] chore(deps): update dependency lerna to v2.11.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 763c94aab6a..748d5883d36 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "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", From c43d9bda0452d8600a0e56863a73e161b9566449 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Apr 2018 05:02:12 +0000 Subject: [PATCH 07/30] chore(deps): update dependency remap-istanbul to v0.11.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 748d5883d36..1d29a53876f 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "mocha": "5.1.1", "prettier": "1.12.1", "prettier-check": "2.0.0", - "remap-istanbul": "0.11.0", + "remap-istanbul": "0.11.1", "sinon": "4.5.0", "supertest": "3.0.0", "supertest-as-promised": "4.0.2", From 91d630f6a63ef31c89ee57a8f3af4c5bda64776a Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 26 Apr 2018 10:05:12 +0000 Subject: [PATCH 08/30] chore(deps): update dependency @adonisjs/bodyparser to v2.0.3 --- packages/apollo-server-adonis/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-adonis/package.json b/packages/apollo-server-adonis/package.json index 9ea220e4533..b675b807c3b 100644 --- a/packages/apollo-server-adonis/package.json +++ b/packages/apollo-server-adonis/package.json @@ -29,7 +29,7 @@ "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", From 12fae6caec61617abe3925c3ced425004149f597 Mon Sep 17 00:00:00 2001 From: Brian Dennis Date: Fri, 27 Apr 2018 00:48:13 -0500 Subject: [PATCH 09/30] docs: Fix typo in lambda package README (#999) --- packages/apollo-server-lambda/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-lambda/README.md b/packages/apollo-server-lambda/README.md index d690b206030..4761f31b50b 100755 --- a/packages/apollo-server-lambda/README.md +++ b/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:// From 55ac5105629cff777c65845a83b877187d0688dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Apr 2018 06:02:17 +0000 Subject: [PATCH 10/30] chore(deps): update dependency @types/aws-lambda to v8.10.3 --- packages/apollo-server-lambda/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-lambda/package.json b/packages/apollo-server-lambda/package.json index d311a21334f..cea453e8fb3 100644 --- a/packages/apollo-server-lambda/package.json +++ b/packages/apollo-server-lambda/package.json @@ -29,7 +29,7 @@ "apollo-server-module-graphiql": "^1.3.4" }, "devDependencies": { - "@types/aws-lambda": "8.10.2", + "@types/aws-lambda": "8.10.3", "@types/graphql": "0.12.7", "apollo-server-integration-testsuite": "^1.3.6" }, From db244357ccc798581f9b6ed71c322302f51ade7f Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Apr 2018 07:02:56 +0000 Subject: [PATCH 11/30] chore(deps): update dependency @types/node to v9.6.7 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1d29a53876f..3640fd15ce0 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@types/chai": "4.1.3", "@types/mocha": "5.2.0", - "@types/node": "9.6.6", + "@types/node": "9.6.7", "@types/sinon": "4.3.0", "chai": "4.1.2", "graphql": "0.13.2", From c847bed76c0032ef0eda32965effee92ba5e31a6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 27 Apr 2018 09:03:21 +0000 Subject: [PATCH 12/30] chore(deps): update dependency koa to v2.5.1 --- packages/apollo-server-koa/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-koa/package.json b/packages/apollo-server-koa/package.json index 3abcf5a9ced..70b56a5ebac 100644 --- a/packages/apollo-server-koa/package.json +++ b/packages/apollo-server-koa/package.json @@ -34,7 +34,7 @@ "@types/koa-bodyparser": "4.2.0", "@types/koa-router": "7.0.28", "apollo-server-integration-testsuite": "^1.3.6", - "koa": "2.5.0", + "koa": "2.5.1", "koa-bodyparser": "4.2.0", "koa-router": "7.4.0" }, From 1244ce984c42b8ce8770f42d09408b2ad17bd4ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 30 Apr 2018 08:36:18 +0000 Subject: [PATCH 13/30] chore(deps): update dependency hapi to v17.4.0 (#1009) --- packages/apollo-server-hapi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/apollo-server-hapi/package.json b/packages/apollo-server-hapi/package.json index 5ac1dbabf91..813009217bd 100644 --- a/packages/apollo-server-hapi/package.json +++ b/packages/apollo-server-hapi/package.json @@ -32,7 +32,7 @@ "devDependencies": { "@types/graphql": "0.12.7", "apollo-server-integration-testsuite": "^1.3.6", - "hapi": "17.3.1" + "hapi": "17.4.0" }, "typings": "dist/index.d.ts", "typescript": { From 1154351aeffae7e38f7d5f33e93d52557ec646ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" Date: Mon, 30 Apr 2018 16:51:54 -0700 Subject: [PATCH 14/30] chore(deps): update dependency sinon to v5 (#1010) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3640fd15ce0..4e45df4f76f 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "prettier": "1.12.1", "prettier-check": "2.0.0", "remap-istanbul": "0.11.1", - "sinon": "4.5.0", + "sinon": "5.0.1", "supertest": "3.0.0", "supertest-as-promised": "4.0.2", "typescript": "2.8.3" From a04eb903b9d9ee37571188f1219de72955cedd94 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 May 2018 05:02:41 +0000 Subject: [PATCH 15/30] chore(deps): update dependency @types/node to v9.6.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e45df4f76f..0f0f56388b3 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@types/chai": "4.1.3", "@types/mocha": "5.2.0", - "@types/node": "9.6.7", + "@types/node": "9.6.8", "@types/sinon": "4.3.0", "chai": "4.1.2", "graphql": "0.13.2", From c53d742d07bbffd95c25b4ab39b470fdf72ca240 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 1 May 2018 10:24:16 +0000 Subject: [PATCH 16/30] chore(deps): update dependency sinon to v5.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f0f56388b3..2af2fe0f89d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "prettier": "1.12.1", "prettier-check": "2.0.0", "remap-istanbul": "0.11.1", - "sinon": "5.0.1", + "sinon": "5.0.2", "supertest": "3.0.0", "supertest-as-promised": "4.0.2", "typescript": "2.8.3" From b2691adaa4a95e52ccf4247bba02489b81c10511 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Apr 2018 14:22:41 +0300 Subject: [PATCH 17/30] docs: Add v2 to the `versions` property in _config.yml. This should enable the dropdown box in the sidebar of the documentation. Currently, that sidebar will be a terrible color, since it has never appeared on Apollo documentation before and nobody has ever defined style on it. That'll have to be fixed in the theme itself[0]. [0]: https://github.com/meteor/meteor-theme-hexo --- docs/_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_config.yml b/docs/_config.yml index f2a91278008..4220997a265 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -4,6 +4,7 @@ subtitle: Apollo Server description: A guide to using Apollo Server. versions: - '1' + - '2' sidebar_categories: null: - index From b9d49ae7230b06b2674bc906f5aff09233fd3589 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 26 Apr 2018 23:01:34 +0300 Subject: [PATCH 18/30] Enable version support via Netlify redirects. This uses `hexo-versioned-netlify-redirects`[0], a package I wrote just for this purpose (on Meteor) a few months back. With any luck, this will do the trick for Apollo too. [0]: https://github.com/meteor/hexo-versioned-netlify-redirects --- docs/_config.yml | 3 +++ docs/package.json | 3 +++ 2 files changed, 6 insertions(+) diff --git a/docs/_config.yml b/docs/_config.yml index 4220997a265..3ef3b8513e7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -45,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 diff --git a/docs/package.json b/docs/package.json index 09895a8a18b..2803c35cbfb 100644 --- a/docs/package.json +++ b/docs/package.json @@ -21,5 +21,8 @@ "build": "chexo apollo-hexo-config -- generate", "clean": "hexo clean", "test": "npm run clean; npm run build" + }, + "dependencies": { + "hexo-versioned-netlify-redirects": "^1.0.2" } } From 0ccf2141618573840152b13a4f8a6ace0c3d74c9 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 08:35:28 -0700 Subject: [PATCH 19/30] Update `hexo-versioned-netlify-redirects` to 1.0.3. In order to include the changes from https://github.com/meteor/hexo-versioned-netlify-redirects/pull/1, which should properly handle the sub-path roots of this Hexo deployment. --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 2803c35cbfb..0a1c779a295 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,6 +23,6 @@ "test": "npm run clean; npm run build" }, "dependencies": { - "hexo-versioned-netlify-redirects": "^1.0.2" + "hexo-versioned-netlify-redirects": "^1.0.3" } } From fbe56d8846c2d891d3b84b924e733e91a9d4554d Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 08:58:36 -0700 Subject: [PATCH 20/30] Update `hexo-versioned-netlify-redirects` to 1.0.4. Follows-up on 07efd96d15f93f3e30fd63942d75ce65e26eb672. --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 0a1c779a295..b37a815bfab 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,6 +23,6 @@ "test": "npm run clean; npm run build" }, "dependencies": { - "hexo-versioned-netlify-redirects": "^1.0.3" + "hexo-versioned-netlify-redirects": "^1.0.4" } } From 5a2034ea9d87f55f212c135d5fea002e20b714e7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 12:34:55 -0700 Subject: [PATCH 21/30] Update `hexo-versioned-netlify-redirects` to 1.0.5. --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index b37a815bfab..1ccf7aeb29d 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,6 +23,6 @@ "test": "npm run clean; npm run build" }, "dependencies": { - "hexo-versioned-netlify-redirects": "^1.0.4" + "hexo-versioned-netlify-redirects": "^1.0.5" } } From 063edd7b059e93186d7af68dfe852c59f0b2e165 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 16:34:20 -0700 Subject: [PATCH 22/30] Update `hexo-versioned-netlify-redirects` to 1.0.6. --- docs/package.json | 2 +- docs/public/_redirects | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 docs/public/_redirects diff --git a/docs/package.json b/docs/package.json index 1ccf7aeb29d..e9a9d0dcaa0 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,6 +23,6 @@ "test": "npm run clean; npm run build" }, "dependencies": { - "hexo-versioned-netlify-redirects": "^1.0.5" + "hexo-versioned-netlify-redirects": "^1.0.6" } } diff --git a/docs/public/_redirects b/docs/public/_redirects deleted file mode 100644 index 1cafcab3dd3..00000000000 --- a/docs/public/_redirects +++ /dev/null @@ -1 +0,0 @@ -/ /docs/apollo-server/ From f871d32b70328080b0bb08b6e461e4f285eb1a3a Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 21:31:34 -0700 Subject: [PATCH 23/30] Start ignoring `_redirects` again, since it's dynamically generated. --- docs/.gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/.gitignore b/docs/.gitignore index 118c36622f1..71086268b3e 100644 --- a/docs/.gitignore +++ b/docs/.gitignore @@ -4,7 +4,6 @@ db.json *.log node_modules/ public/* -!public/_redirects .deploy*/ docs.json _multiconfig.yml From 9c19dec4bda0f5cd425bbb58216e01b03c0644c2 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Tue, 1 May 2018 21:32:20 -0700 Subject: [PATCH 24/30] Update `hexo-versioned-netlify-deploys` to 1.0.7. Hopefully for the last time! --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index e9a9d0dcaa0..ee67e1a2d03 100644 --- a/docs/package.json +++ b/docs/package.json @@ -23,6 +23,6 @@ "test": "npm run clean; npm run build" }, "dependencies": { - "hexo-versioned-netlify-redirects": "^1.0.6" + "hexo-versioned-netlify-redirects": "^1.0.7" } } From 6f50769d4f6964db91da5b3380c3da4f555b7b62 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 2 May 2018 18:06:31 -0700 Subject: [PATCH 25/30] Temporarily remove version 2. --- docs/_config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index 3ef3b8513e7..c56073f5034 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -4,7 +4,6 @@ subtitle: Apollo Server description: A guide to using Apollo Server. versions: - '1' - - '2' sidebar_categories: null: - index From e4d1b6a3a7bc0b99f01c73c8f17b37dfdf8e3a7f Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Wed, 2 May 2018 18:07:04 -0700 Subject: [PATCH 26/30] Update meteor-theme-hexo to 1.0.9. --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index ee67e1a2d03..c8c13194ab3 100644 --- a/docs/package.json +++ b/docs/package.json @@ -14,7 +14,7 @@ "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", From a2dd47687f83eb686304fd9bc818366a0161f9de Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 3 May 2018 01:07:47 +0000 Subject: [PATCH 27/30] chore(deps): update dependency sinon to v5.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2af2fe0f89d..9cc04a6a8f2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "prettier": "1.12.1", "prettier-check": "2.0.0", "remap-istanbul": "0.11.1", - "sinon": "5.0.2", + "sinon": "5.0.3", "supertest": "3.0.0", "supertest-as-promised": "4.0.2", "typescript": "2.8.3" From e92a3528a1b2a7613b0a0ab95974a99392169b86 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 3 May 2018 05:02:13 +0000 Subject: [PATCH 28/30] chore(deps): update dependency @types/node to v9.6.9 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9cc04a6a8f2..4312640d4b5 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@types/chai": "4.1.3", "@types/mocha": "5.2.0", - "@types/node": "9.6.8", + "@types/node": "9.6.9", "@types/sinon": "4.3.0", "chai": "4.1.2", "graphql": "0.13.2", From 6acb6ffed1392045fb4537c8575cc70bbde64026 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 3 May 2018 07:16:33 -0700 Subject: [PATCH 29/30] Revert "Temporarily remove version 2." This reverts commit 6f50769d4f6964db91da5b3380c3da4f555b7b62. --- docs/_config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/_config.yml b/docs/_config.yml index c56073f5034..3ef3b8513e7 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -4,6 +4,7 @@ subtitle: Apollo Server description: A guide to using Apollo Server. versions: - '1' + - '2' sidebar_categories: null: - index From 80497d56fa677f719a0d12c44fa0c18fd9ba198e Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 3 May 2018 07:29:18 -0700 Subject: [PATCH 30/30] Update package.json's hexo.version to 3.7.1. --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index c8c13194ab3..69937f58b35 100644 --- a/docs/package.json +++ b/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",