From 699b3a959d2c28462e009bbaacd2c159a3c4230e Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 22:37:04 -0700 Subject: [PATCH 01/16] Update CHANGELOG.md --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 13290176be6..bbd66b72602 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ # Changelog ### VNEXT -* **Security Fix** GET queries did not run through validation ([@DxCx](https://github.com/DxCx)) on [#424](https://github.com/apollographql/graphql-server/pull/424) + +### v0.8.1 +* **Security Fix** Ensure queries submitted via HTTP GET run through validation ([@DxCx](https://github.com/DxCx)) on [#424](https://github.com/apollographql/graphql-server/pull/424) ### v0.8.0 * Persist `window.location.hash` on URL updates [#386](https://github.com/apollographql/graphql-server/issues/386) From f1245fc9046ba8475a1e27d2b69b584f6bd385b1 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 22:38:52 -0700 Subject: [PATCH 02/16] Update dependencies --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 8 ++++---- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index b2c5f5e3242..c2c9f955d73 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^3.5.2", + "@types/chai": "^4.0.0", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.22", - "@types/sinon": "^2.2.2", - "chai": "^4.0.0", + "@types/node": "^7.0.31", + "@types/sinon": "^2.3.1", + "chai": "^4.0.2", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.2", + "npm-check-updates": "^2.11.3", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.2", + "sinon": "^2.3.4", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.3.2", + "tslint": "^5.4.3", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 8a998ed4a93..ec1986bb0f0 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.0", - "fibers": "^1.0.15", - "meteor-promise": "^0.8.2" + "@types/graphql": "^0.9.1", + "fibers": "^2.0.0", + "meteor-promise": "^0.8.4" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.0" + "@types/graphql": "^0.9.1" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index 62dadfa37ac..d63b40ae2b9 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "0.0.33", + "@types/multer": "1.3.0", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index c37f8d160c0..2f3fa0436d6 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,18 +30,18 @@ "graphql-server-module-graphiql": "^0.8.0" }, "devDependencies": { - "@types/boom": "4.3.2", + "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.2", + "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.0", - "hapi": "^16.3.0" + "hapi": "^16.4.3" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.2" + "@types/hapi": "^16.1.4" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 7f8736bac86..1f9cfb0d9e8 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.0" }, "devDependencies": { - "@types/aws-lambda": "0.0.10", + "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.0" }, From 592895320bc33a2b892367fae3a53764892eefe0 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 22:38:59 -0700 Subject: [PATCH 03/16] v0.8.1 --- lerna.json | 2 +- packages/graphql-server-core/package.json | 2 +- packages/graphql-server-express/package.json | 8 ++++---- packages/graphql-server-hapi/package.json | 8 ++++---- .../graphql-server-integration-testsuite/package.json | 8 ++++---- packages/graphql-server-koa/package.json | 8 ++++---- packages/graphql-server-lambda/package.json | 8 ++++---- packages/graphql-server-micro/package.json | 8 ++++---- packages/graphql-server-module-graphiql/package.json | 2 +- .../graphql-server-module-operation-store/package.json | 2 +- packages/graphql-server-restify/package.json | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 2b7d25e1d1e..88b0ebc7c27 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0-rc.4", - "version": "0.8.0", + "version": "0.8.1", "changelog": { "repo": "apollostack/graphql-server", "labels": { diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index ec1986bb0f0..2df3a17e5dc 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-core", - "version": "0.8.0", + "version": "0.8.1", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index d63b40ae2b9..f358f02e0ee 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-express", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,8 +26,8 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { "@types/body-parser": "1.16.3", @@ -38,7 +38,7 @@ "connect": "^3.6.2", "connect-query": "^1.0.0", "express": "^4.15.3", - "graphql-server-integration-testsuite": "^0.8.0", + "graphql-server-integration-testsuite": "^0.8.1", "multer": "^1.3.0" }, "peerDependencies": { diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 2f3fa0436d6..b8479e30e13 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-hapi", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "scripts": { @@ -26,14 +26,14 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { "boom": "^5.1.0", - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", - "graphql-server-integration-testsuite": "^0.8.0", + "graphql-server-integration-testsuite": "^0.8.1", "hapi": "^16.4.3" }, "peerDependencies": { diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json index 466de7c21ac..96ff7cac125 100644 --- a/packages/graphql-server-integration-testsuite/package.json +++ b/packages/graphql-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "graphql-server-integration-testsuite", "private": true, - "version": "0.8.0", + "version": "0.8.1", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "scripts": { @@ -20,9 +20,9 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0", - "graphql-server-module-operation-store": "^0.8.0", + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1", + "graphql-server-module-operation-store": "^0.8.1", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.0" }, diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index ac40ec858e1..8f1288d2137 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-koa", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "scripts": { @@ -25,14 +25,14 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { "@types/koa": "^2.0.39", "@types/koa-bodyparser": "^3.0.23", "@types/koa-router": "^7.0.22", - "graphql-server-integration-testsuite": "^0.8.0", + "graphql-server-integration-testsuite": "^0.8.1", "koa": "^2.2.0", "koa-bodyparser": "^4.2.0", "koa-router": "^7.2.0" diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 1f9cfb0d9e8..0f48dc7674f 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-lambda", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "main": "dist/index.js", "scripts": { @@ -25,13 +25,13 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", - "graphql-server-integration-testsuite": "^0.8.0" + "graphql-server-integration-testsuite": "^0.8.1" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index 7c6824c2533..f846ec87b90 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-micro", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "scripts": { @@ -25,11 +25,11 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { - "graphql-server-integration-testsuite": "^0.8.0", + "graphql-server-integration-testsuite": "^0.8.1", "micro": "^7.3.3" }, "peerDependencies": { diff --git a/packages/graphql-server-module-graphiql/package.json b/packages/graphql-server-module-graphiql/package.json index 3725d7dbbc4..a4e4008d2a8 100644 --- a/packages/graphql-server-module-graphiql/package.json +++ b/packages/graphql-server-module-graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-module-graphiql", - "version": "0.8.0", + "version": "0.8.1", "description": "GraphiQL renderer for Apollo GraphQL Server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json index 826cb95ccff..48a48ed4700 100644 --- a/packages/graphql-server-module-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-module-operation-store", - "version": "0.8.0", + "version": "0.8.1", "description": "Persisted operation store module for Apollo GraphQL Servers", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index 079eb749ba3..5fd07b1f2bc 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-restify", - "version": "0.8.0", + "version": "0.8.1", "description": "Production-ready Node.js GraphQL server for Restify", "main": "dist/index.js", "scripts": { @@ -25,12 +25,12 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.0", - "graphql-server-module-graphiql": "^0.8.0" + "graphql-server-core": "^0.8.1", + "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { "@types/restify": "^4.3.2", - "graphql-server-integration-testsuite": "^0.8.0", + "graphql-server-integration-testsuite": "^0.8.1", "restify": "^4.3.0" }, "peerDependencies": { From 46a44bafac839a8a939ef0847def81e00fb1a01f Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 23:33:51 -0700 Subject: [PATCH 04/16] Revert "Update dependencies" This reverts commit f1245fc9046ba8475a1e27d2b69b584f6bd385b1. --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index c2c9f955d73..b2c5f5e3242 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^4.0.0", + "@types/chai": "^3.5.2", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.31", - "@types/sinon": "^2.3.1", - "chai": "^4.0.2", + "@types/node": "^7.0.22", + "@types/sinon": "^2.2.2", + "chai": "^4.0.0", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.3", + "npm-check-updates": "^2.11.2", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.4", + "sinon": "^2.3.2", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.4.3", + "tslint": "^5.3.2", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 2df3a17e5dc..43934daf77f 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.1", - "fibers": "^2.0.0", - "meteor-promise": "^0.8.4" + "@types/graphql": "^0.9.0", + "fibers": "^1.0.15", + "meteor-promise": "^0.8.2" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.1" + "@types/graphql": "^0.9.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index f358f02e0ee..76bcb98010c 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "1.3.0", + "@types/multer": "0.0.33", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index b8479e30e13..542cc9670a4 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,7 +30,7 @@ "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { - "@types/boom": "4.3.5", + "@types/boom": "4.3.2", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.1", @@ -41,7 +41,7 @@ }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.4" + "@types/hapi": "^16.1.2" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 0f48dc7674f..c963c6141f3 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { - "@types/aws-lambda": "0.0.12", + "@types/aws-lambda": "0.0.10", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.1" }, From a5f4007a40788524a2b8227bfb52f7ca15a37dbf Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 23:43:15 -0700 Subject: [PATCH 05/16] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbd66b72602..cb17edbbf57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ### VNEXT +### v0.8.2 +* Fix: Revert update of package versions to fix node-gyp issue with Fibers ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) + ### v0.8.1 * **Security Fix** Ensure queries submitted via HTTP GET run through validation ([@DxCx](https://github.com/DxCx)) on [#424](https://github.com/apollographql/graphql-server/pull/424) From 2b30dbcb357dc161c8ad76eea9d177df89b02b17 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 23:44:10 -0700 Subject: [PATCH 06/16] Update dependencies --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index b2c5f5e3242..c2c9f955d73 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^3.5.2", + "@types/chai": "^4.0.0", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.22", - "@types/sinon": "^2.2.2", - "chai": "^4.0.0", + "@types/node": "^7.0.31", + "@types/sinon": "^2.3.1", + "chai": "^4.0.2", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.2", + "npm-check-updates": "^2.11.3", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.2", + "sinon": "^2.3.4", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.3.2", + "tslint": "^5.4.3", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 43934daf77f..2df3a17e5dc 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.0", - "fibers": "^1.0.15", - "meteor-promise": "^0.8.2" + "@types/graphql": "^0.9.1", + "fibers": "^2.0.0", + "meteor-promise": "^0.8.4" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.0" + "@types/graphql": "^0.9.1" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index 76bcb98010c..f358f02e0ee 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "0.0.33", + "@types/multer": "1.3.0", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 542cc9670a4..b8479e30e13 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,7 +30,7 @@ "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { - "@types/boom": "4.3.2", + "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.1", @@ -41,7 +41,7 @@ }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.2" + "@types/hapi": "^16.1.4" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index c963c6141f3..0f48dc7674f 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.1" }, "devDependencies": { - "@types/aws-lambda": "0.0.10", + "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.1" }, From be4cbb295979f6969c6072f7d3a37a18a17e300f Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Mon, 12 Jun 2017 23:46:19 -0700 Subject: [PATCH 07/16] v0.8.2 --- lerna.json | 2 +- packages/graphql-server-core/package.json | 2 +- packages/graphql-server-express/package.json | 8 ++++---- packages/graphql-server-hapi/package.json | 8 ++++---- .../graphql-server-integration-testsuite/package.json | 8 ++++---- packages/graphql-server-koa/package.json | 8 ++++---- packages/graphql-server-lambda/package.json | 8 ++++---- packages/graphql-server-micro/package.json | 8 ++++---- packages/graphql-server-module-graphiql/package.json | 2 +- .../graphql-server-module-operation-store/package.json | 2 +- packages/graphql-server-restify/package.json | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lerna.json b/lerna.json index 88b0ebc7c27..73f6e079b10 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0-rc.4", - "version": "0.8.1", + "version": "0.8.2", "changelog": { "repo": "apollostack/graphql-server", "labels": { diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 2df3a17e5dc..9140c765be4 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-core", - "version": "0.8.1", + "version": "0.8.2", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index f358f02e0ee..e5719ba428e 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-express", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,8 +26,8 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/body-parser": "1.16.3", @@ -38,7 +38,7 @@ "connect": "^3.6.2", "connect-query": "^1.0.0", "express": "^4.15.3", - "graphql-server-integration-testsuite": "^0.8.1", + "graphql-server-integration-testsuite": "^0.8.2", "multer": "^1.3.0" }, "peerDependencies": { diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index b8479e30e13..93a677cbec3 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-hapi", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "scripts": { @@ -26,14 +26,14 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { "boom": "^5.1.0", - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", - "graphql-server-integration-testsuite": "^0.8.1", + "graphql-server-integration-testsuite": "^0.8.2", "hapi": "^16.4.3" }, "peerDependencies": { diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json index 96ff7cac125..d4775d27794 100644 --- a/packages/graphql-server-integration-testsuite/package.json +++ b/packages/graphql-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "graphql-server-integration-testsuite", "private": true, - "version": "0.8.1", + "version": "0.8.2", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "scripts": { @@ -20,9 +20,9 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1", - "graphql-server-module-operation-store": "^0.8.1", + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2", + "graphql-server-module-operation-store": "^0.8.2", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.0" }, diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index 8f1288d2137..453f77381e4 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-koa", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "scripts": { @@ -25,14 +25,14 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/koa": "^2.0.39", "@types/koa-bodyparser": "^3.0.23", "@types/koa-router": "^7.0.22", - "graphql-server-integration-testsuite": "^0.8.1", + "graphql-server-integration-testsuite": "^0.8.2", "koa": "^2.2.0", "koa-bodyparser": "^4.2.0", "koa-router": "^7.2.0" diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 0f48dc7674f..49f8d106cd5 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-lambda", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "main": "dist/index.js", "scripts": { @@ -25,13 +25,13 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", - "graphql-server-integration-testsuite": "^0.8.1" + "graphql-server-integration-testsuite": "^0.8.2" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index f846ec87b90..bc221e92348 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-micro", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "scripts": { @@ -25,11 +25,11 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "graphql-server-integration-testsuite": "^0.8.1", + "graphql-server-integration-testsuite": "^0.8.2", "micro": "^7.3.3" }, "peerDependencies": { diff --git a/packages/graphql-server-module-graphiql/package.json b/packages/graphql-server-module-graphiql/package.json index a4e4008d2a8..87fb2edb486 100644 --- a/packages/graphql-server-module-graphiql/package.json +++ b/packages/graphql-server-module-graphiql/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-module-graphiql", - "version": "0.8.1", + "version": "0.8.2", "description": "GraphiQL renderer for Apollo GraphQL Server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json index 48a48ed4700..d8029fc3849 100644 --- a/packages/graphql-server-module-operation-store/package.json +++ b/packages/graphql-server-module-operation-store/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-module-operation-store", - "version": "0.8.1", + "version": "0.8.2", "description": "Persisted operation store module for Apollo GraphQL Servers", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index 5fd07b1f2bc..34329dd00d5 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-restify", - "version": "0.8.1", + "version": "0.8.2", "description": "Production-ready Node.js GraphQL server for Restify", "main": "dist/index.js", "scripts": { @@ -25,12 +25,12 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.1", - "graphql-server-module-graphiql": "^0.8.1" + "graphql-server-core": "^0.8.2", + "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/restify": "^4.3.2", - "graphql-server-integration-testsuite": "^0.8.1", + "graphql-server-integration-testsuite": "^0.8.2", "restify": "^4.3.0" }, "peerDependencies": { From 0f029301f7a6759dbffe35bab76fc829c0a304a6 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 12:01:47 -0700 Subject: [PATCH 08/16] Revert "Update dependencies" This reverts commit 2b30dbcb357dc161c8ad76eea9d177df89b02b17. --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index c2c9f955d73..b2c5f5e3242 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^4.0.0", + "@types/chai": "^3.5.2", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.31", - "@types/sinon": "^2.3.1", - "chai": "^4.0.2", + "@types/node": "^7.0.22", + "@types/sinon": "^2.2.2", + "chai": "^4.0.0", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.3", + "npm-check-updates": "^2.11.2", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.4", + "sinon": "^2.3.2", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.4.3", + "tslint": "^5.3.2", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 9140c765be4..7ef266caed3 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.1", - "fibers": "^2.0.0", - "meteor-promise": "^0.8.4" + "@types/graphql": "^0.9.0", + "fibers": "^1.0.15", + "meteor-promise": "^0.8.2" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.1" + "@types/graphql": "^0.9.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index e5719ba428e..b2dac5d4990 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "1.3.0", + "@types/multer": "0.0.33", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 93a677cbec3..20e648fd5be 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,7 +30,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/boom": "4.3.5", + "@types/boom": "4.3.2", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.2", @@ -41,7 +41,7 @@ }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.4" + "@types/hapi": "^16.1.2" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 49f8d106cd5..81fe0246b5a 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/aws-lambda": "0.0.12", + "@types/aws-lambda": "0.0.10", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.2" }, From d260acea258974e696a72756f2f4563fe376e779 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 12:03:51 -0700 Subject: [PATCH 09/16] Pin Fibers to 1.0.15 --- packages/graphql-server-core/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 7ef266caed3..adcb1b3bc44 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -26,7 +26,7 @@ "devDependencies": { "@types/fibers": "0.0.29", "@types/graphql": "^0.9.0", - "fibers": "^1.0.15", + "fibers": "1.0.15", "meteor-promise": "^0.8.2" }, "peerDependencies": { From b21cb2ea757eff3ea3cf3b8133ec54fceef540b5 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 12:04:35 -0700 Subject: [PATCH 10/16] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb17edbbf57..7a0163ea717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ### VNEXT +### v0.8.3 +* Pin Fibers to version 1.0.15 to avoid Lerna auto-update ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) + ### v0.8.2 * Fix: Revert update of package versions to fix node-gyp issue with Fibers ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) From 90a9ec78dadd27bc1eb419026eb219e99c87d6f5 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 12:15:47 -0700 Subject: [PATCH 11/16] Update dependencies --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index b2c5f5e3242..c2c9f955d73 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^3.5.2", + "@types/chai": "^4.0.0", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.22", - "@types/sinon": "^2.2.2", - "chai": "^4.0.0", + "@types/node": "^7.0.31", + "@types/sinon": "^2.3.1", + "chai": "^4.0.2", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.2", + "npm-check-updates": "^2.11.3", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.2", + "sinon": "^2.3.4", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.3.2", + "tslint": "^5.4.3", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index adcb1b3bc44..6b455bdd7c3 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.0", - "fibers": "1.0.15", - "meteor-promise": "^0.8.2" + "@types/graphql": "^0.9.1", + "fibers": "2.0.0", + "meteor-promise": "^0.8.4" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.0" + "@types/graphql": "^0.9.1" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index b2dac5d4990..e5719ba428e 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "0.0.33", + "@types/multer": "1.3.0", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 20e648fd5be..93a677cbec3 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,7 +30,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/boom": "4.3.2", + "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.2", @@ -41,7 +41,7 @@ }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.2" + "@types/hapi": "^16.1.4" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 81fe0246b5a..49f8d106cd5 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/aws-lambda": "0.0.10", + "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.2" }, From f46454e973c780855682400d6fbee650b8d422aa Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 12:16:40 -0700 Subject: [PATCH 12/16] v0.8.3 --- lerna.json | 2 +- packages/graphql-server-core/package.json | 2 +- packages/graphql-server-express/package.json | 6 +++--- packages/graphql-server-hapi/package.json | 6 +++--- packages/graphql-server-integration-testsuite/package.json | 4 ++-- packages/graphql-server-koa/package.json | 6 +++--- packages/graphql-server-lambda/package.json | 6 +++--- packages/graphql-server-micro/package.json | 6 +++--- packages/graphql-server-restify/package.json | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index 73f6e079b10..e83bab889fc 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0-rc.4", - "version": "0.8.2", + "version": "0.8.3", "changelog": { "repo": "apollostack/graphql-server", "labels": { diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index 6b455bdd7c3..c142915c6f0 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-core", - "version": "0.8.2", + "version": "0.8.3", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index e5719ba428e..4311206ac79 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-express", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { @@ -38,7 +38,7 @@ "connect": "^3.6.2", "connect-query": "^1.0.0", "express": "^4.15.3", - "graphql-server-integration-testsuite": "^0.8.2", + "graphql-server-integration-testsuite": "^0.8.3", "multer": "^1.3.0" }, "peerDependencies": { diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 93a677cbec3..5b09514a7d2 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-hapi", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "scripts": { @@ -26,14 +26,14 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { "boom": "^5.1.0", - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/boom": "4.3.5", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", - "graphql-server-integration-testsuite": "^0.8.2", + "graphql-server-integration-testsuite": "^0.8.3", "hapi": "^16.4.3" }, "peerDependencies": { diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json index d4775d27794..4dd3996cb77 100644 --- a/packages/graphql-server-integration-testsuite/package.json +++ b/packages/graphql-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "graphql-server-integration-testsuite", "private": true, - "version": "0.8.2", + "version": "0.8.3", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "scripts": { @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2", "graphql-server-module-operation-store": "^0.8.2", "supertest": "^3.0.0", diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index 453f77381e4..dd3de719579 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-koa", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "scripts": { @@ -25,14 +25,14 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/koa": "^2.0.39", "@types/koa-bodyparser": "^3.0.23", "@types/koa-router": "^7.0.22", - "graphql-server-integration-testsuite": "^0.8.2", + "graphql-server-integration-testsuite": "^0.8.3", "koa": "^2.2.0", "koa-bodyparser": "^4.2.0", "koa-router": "^7.2.0" diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 49f8d106cd5..4e20dfbb510 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-lambda", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "main": "dist/index.js", "scripts": { @@ -25,13 +25,13 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/aws-lambda": "0.0.12", "@types/graphql": "^0.9.1", - "graphql-server-integration-testsuite": "^0.8.2" + "graphql-server-integration-testsuite": "^0.8.3" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index bc221e92348..2cb379f44fe 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-micro", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "scripts": { @@ -25,11 +25,11 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "graphql-server-integration-testsuite": "^0.8.2", + "graphql-server-integration-testsuite": "^0.8.3", "micro": "^7.3.3" }, "peerDependencies": { diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index 34329dd00d5..be9f7c786b3 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-restify", - "version": "0.8.2", + "version": "0.8.3", "description": "Production-ready Node.js GraphQL server for Restify", "main": "dist/index.js", "scripts": { @@ -25,12 +25,12 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.2", + "graphql-server-core": "^0.8.3", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/restify": "^4.3.2", - "graphql-server-integration-testsuite": "^0.8.2", + "graphql-server-integration-testsuite": "^0.8.3", "restify": "^4.3.0" }, "peerDependencies": { From 867a312cf07b515eb788d54e2f7c9d624e343047 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 22:58:26 -0700 Subject: [PATCH 13/16] Revert "Update dependencies" This reverts commit 90a9ec78dadd27bc1eb419026eb219e99c87d6f5. --- package.json | 14 +++++++------- packages/graphql-server-core/package.json | 8 ++++---- packages/graphql-server-express/package.json | 2 +- packages/graphql-server-hapi/package.json | 4 ++-- packages/graphql-server-lambda/package.json | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index c2c9f955d73..b2c5f5e3242 100644 --- a/package.json +++ b/package.json @@ -26,21 +26,21 @@ "release": "lerna publish" }, "devDependencies": { - "@types/chai": "^4.0.0", + "@types/chai": "^3.5.2", "@types/mocha": "^2.2.41", - "@types/node": "^7.0.31", - "@types/sinon": "^2.3.1", - "chai": "^4.0.2", + "@types/node": "^7.0.22", + "@types/sinon": "^2.2.2", + "chai": "^4.0.0", "graphql": "^0.10.1", "istanbul": "1.0.0-alpha.2", "lerna": "2.0.0-rc.5", "mocha": "^3.4.2", - "npm-check-updates": "^2.11.3", + "npm-check-updates": "^2.11.2", "remap-istanbul": "^0.9.5", - "sinon": "^2.3.4", + "sinon": "^2.3.2", "supertest": "^3.0.0", "supertest-as-promised": "^4.0.2", - "tslint": "^5.4.3", + "tslint": "^5.3.2", "typescript": "^2.3.4" } } diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index c142915c6f0..d3f380fb674 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -25,15 +25,15 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "devDependencies": { "@types/fibers": "0.0.29", - "@types/graphql": "^0.9.1", - "fibers": "2.0.0", - "meteor-promise": "^0.8.4" + "@types/graphql": "^0.9.0", + "fibers": "1.0.15", + "meteor-promise": "^0.8.2" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" }, "optionalDependencies": { - "@types/graphql": "^0.9.1" + "@types/graphql": "^0.9.0" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index 4311206ac79..cbeb143a2f3 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -33,7 +33,7 @@ "@types/body-parser": "1.16.3", "@types/connect": "^3.4.30", "@types/express": "^4.0.35", - "@types/multer": "1.3.0", + "@types/multer": "0.0.33", "body-parser": "^1.17.2", "connect": "^3.6.2", "connect-query": "^1.0.0", diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index 5b09514a7d2..cdcaba22baf 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -30,7 +30,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/boom": "4.3.5", + "@types/boom": "4.3.2", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", "graphql-server-integration-testsuite": "^0.8.3", @@ -41,7 +41,7 @@ }, "optionalDependencies": { "@types/graphql": "^0.9.1", - "@types/hapi": "^16.1.4" + "@types/hapi": "^16.1.2" }, "typings": "dist/index.d.ts", "typescript": { diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 4e20dfbb510..710dd31609b 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -29,7 +29,7 @@ "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "@types/aws-lambda": "0.0.12", + "@types/aws-lambda": "0.0.10", "@types/graphql": "^0.9.1", "graphql-server-integration-testsuite": "^0.8.3" }, From feb5024209a8d536d74948e330ee6f69e7675ad0 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 22:59:12 -0700 Subject: [PATCH 14/16] Remove auto-updates --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index b2c5f5e3242..ad4a0d2f4fe 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,6 @@ "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --full-trace ./test/tests.js", "posttravis": "npm run lint", "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info", - "check-updates": "ncu -a && lerna exec ../../node_modules/.bin/ncu -- -a", - "postcheck-updates": "npm test && npm run commit-updates", - "commit-updates": "git add \"packages/*/package.json\" package.json; git commit -m \"Update dependencies\" || exit 0", - "prerelease": "npm run check-updates", "release": "lerna publish" }, "devDependencies": { From 766119ef9a9e5458b89fd52ebbc9e101cc8dfde4 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 23:01:14 -0700 Subject: [PATCH 15/16] Update CHANGELOG.md --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a0163ea717..98ffe057d7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,10 @@ ### VNEXT +### v0.8.4 ### v0.8.3 -* Pin Fibers to version 1.0.15 to avoid Lerna auto-update ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) - ### v0.8.2 -* Fix: Revert update of package versions to fix node-gyp issue with Fibers ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) +* Fix issue with auto-updating dependencies that caused fibers to update accidentally ([@helfer](https://github.com/helfer)) on [#425](https://github.com/apollographql/graphql-server/pull/425) ### v0.8.1 * **Security Fix** Ensure queries submitted via HTTP GET run through validation ([@DxCx](https://github.com/DxCx)) on [#424](https://github.com/apollographql/graphql-server/pull/424) From 78f508ccc36771d2b662973632ec84725065f716 Mon Sep 17 00:00:00 2001 From: Jonas Helfer Date: Tue, 13 Jun 2017 23:09:22 -0700 Subject: [PATCH 16/16] v0.8.4 --- lerna.json | 2 +- packages/graphql-server-core/package.json | 2 +- packages/graphql-server-express/package.json | 6 +++--- packages/graphql-server-hapi/package.json | 6 +++--- packages/graphql-server-integration-testsuite/package.json | 4 ++-- packages/graphql-server-koa/package.json | 6 +++--- packages/graphql-server-lambda/package.json | 6 +++--- packages/graphql-server-micro/package.json | 6 +++--- packages/graphql-server-restify/package.json | 6 +++--- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lerna.json b/lerna.json index e83bab889fc..12d76d072cb 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "2.0.0-rc.4", - "version": "0.8.3", + "version": "0.8.4", "changelog": { "repo": "apollostack/graphql-server", "labels": { diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json index d3f380fb674..3a38b1c1aef 100644 --- a/packages/graphql-server-core/package.json +++ b/packages/graphql-server-core/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-core", - "version": "0.8.3", + "version": "0.8.4", "description": "Core engine for Apollo GraphQL server", "main": "dist/index.js", "scripts": { diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json index cbeb143a2f3..2409f123e38 100644 --- a/packages/graphql-server-express/package.json +++ b/packages/graphql-server-express/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-express", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for Express and Connect", "main": "dist/index.js", "scripts": { @@ -26,7 +26,7 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { @@ -38,7 +38,7 @@ "connect": "^3.6.2", "connect-query": "^1.0.0", "express": "^4.15.3", - "graphql-server-integration-testsuite": "^0.8.3", + "graphql-server-integration-testsuite": "^0.8.4", "multer": "^1.3.0" }, "peerDependencies": { diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json index cdcaba22baf..3722fcf767e 100644 --- a/packages/graphql-server-hapi/package.json +++ b/packages/graphql-server-hapi/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-hapi", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for Hapi", "main": "dist/index.js", "scripts": { @@ -26,14 +26,14 @@ "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { "boom": "^5.1.0", - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/boom": "4.3.2", "@types/graphql": "^0.9.1", "@types/hapi": "^16.1.4", - "graphql-server-integration-testsuite": "^0.8.3", + "graphql-server-integration-testsuite": "^0.8.4", "hapi": "^16.4.3" }, "peerDependencies": { diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json index 4dd3996cb77..134961156e1 100644 --- a/packages/graphql-server-integration-testsuite/package.json +++ b/packages/graphql-server-integration-testsuite/package.json @@ -1,7 +1,7 @@ { "name": "graphql-server-integration-testsuite", "private": true, - "version": "0.8.3", + "version": "0.8.4", "description": "Apollo Server Integrations testsuite", "main": "dist/index.js", "scripts": { @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2", "graphql-server-module-operation-store": "^0.8.2", "supertest": "^3.0.0", diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json index dd3de719579..52ba8c8e725 100644 --- a/packages/graphql-server-koa/package.json +++ b/packages/graphql-server-koa/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-koa", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for Koa", "main": "dist/index.js", "scripts": { @@ -25,14 +25,14 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/koa": "^2.0.39", "@types/koa-bodyparser": "^3.0.23", "@types/koa-router": "^7.0.22", - "graphql-server-integration-testsuite": "^0.8.3", + "graphql-server-integration-testsuite": "^0.8.4", "koa": "^2.2.0", "koa-bodyparser": "^4.2.0", "koa-router": "^7.2.0" diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json index 710dd31609b..1e8466a964f 100644 --- a/packages/graphql-server-lambda/package.json +++ b/packages/graphql-server-lambda/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-lambda", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for AWS Lambda", "main": "dist/index.js", "scripts": { @@ -25,13 +25,13 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/aws-lambda": "0.0.10", "@types/graphql": "^0.9.1", - "graphql-server-integration-testsuite": "^0.8.3" + "graphql-server-integration-testsuite": "^0.8.4" }, "peerDependencies": { "graphql": "^0.9.0 || ^0.10.1" diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json index 2cb379f44fe..09cdac742d5 100644 --- a/packages/graphql-server-micro/package.json +++ b/packages/graphql-server-micro/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-micro", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for Micro", "main": "dist/index.js", "scripts": { @@ -25,11 +25,11 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { - "graphql-server-integration-testsuite": "^0.8.3", + "graphql-server-integration-testsuite": "^0.8.4", "micro": "^7.3.3" }, "peerDependencies": { diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json index be9f7c786b3..41584472e2a 100644 --- a/packages/graphql-server-restify/package.json +++ b/packages/graphql-server-restify/package.json @@ -1,6 +1,6 @@ { "name": "graphql-server-restify", - "version": "0.8.3", + "version": "0.8.4", "description": "Production-ready Node.js GraphQL server for Restify", "main": "dist/index.js", "scripts": { @@ -25,12 +25,12 @@ }, "homepage": "https://github.com/apollostack/graphql-server#readme", "dependencies": { - "graphql-server-core": "^0.8.3", + "graphql-server-core": "^0.8.4", "graphql-server-module-graphiql": "^0.8.2" }, "devDependencies": { "@types/restify": "^4.3.2", - "graphql-server-integration-testsuite": "^0.8.3", + "graphql-server-integration-testsuite": "^0.8.4", "restify": "^4.3.0" }, "peerDependencies": {