From 809ea8f77cdbaa76d1b253e84352f231df73db1e Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 13:22:41 +0200
Subject: [PATCH 01/13] chore(travis): increased timeout globally to 5s,
 reverted node 4 patches

---
 package.json                                              | 4 ++--
 .../graphql-server-express/src/apolloServerHttp.test.ts   | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index a6cdaaab945..6bf6fd0ae9d 100644
--- a/package.json
+++ b/package.json
@@ -13,8 +13,8 @@
     "pretest": "npm run compile",
     "test": "npm run testonly --",
     "posttest": "npm run lint",
-    "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace ./test/tests.js",
-    "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js",
+    "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace --timeout 5000 ./test/tests.js",
+    "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js",
     "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info"
   },
   "devDependencies": {
diff --git a/packages/graphql-server-express/src/apolloServerHttp.test.ts b/packages/graphql-server-express/src/apolloServerHttp.test.ts
index 50e3658a7ac..03528cac3bf 100644
--- a/packages/graphql-server-express/src/apolloServerHttp.test.ts
+++ b/packages/graphql-server-express/src/apolloServerHttp.test.ts
@@ -154,9 +154,7 @@ const version = 'modern';
 describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => {
   describe('POST functionality', () => {
 
-    it('allows gzipped POST bodies', async function () {
-      // Increase timeout for slow node 4
-      this.timeout(3000);
+    it('allows gzipped POST bodies', async () => {
       const app = express();
 
       app.use(urlString(), bodyParser.json());
@@ -183,9 +181,7 @@ describe(`GraphQL-HTTP (apolloServer) tests for ${version} express`, () => {
       });
     });
 
-    it('allows deflated POST bodies', async function () {
-      // Increase timeout for slow node 4
-      this.timeout(3000);
+    it('allows deflated POST bodies', async () => {
       const app = express();
 
       app.use(urlString(), bodyParser.json());

From d6166ba44a0797bf17469e537762e39d58fe6493 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 13:23:46 +0200
Subject: [PATCH 02/13] chore(travis): change travis to run coverage & test at
 once, saves 50% runtime

---
 .travis.yml  | 4 ++--
 package.json | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff5661d6ea4..b90229e990a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ install:
   - npm install
 
 script:
-  - npm test
-  - npm run coverage
+  # Both test & coverage.
+  - npm run travis
   - coveralls < ./coverage/lcov.info || true # ignore coveralls error
 
 # Allow Travis tests to run in containers.
diff --git a/package.json b/package.json
index 6bf6fd0ae9d..7e65e28141f 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,9 @@
     "posttest": "npm run lint",
     "testonly": "mocha --compilers js:babel-core/register --reporter spec --full-trace --timeout 5000 ./test/tests.js",
     "coverage": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace --reporter dot ./test/tests.js",
+    "pretravis": "npm run compile",
+    "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace ./test/tests.js",
+    "posttravis": "npm run lint",
     "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info"
   },
   "devDependencies": {

From 3365ade26d1a572b7a55d4b897157bd41865d181 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 13:24:01 +0200
Subject: [PATCH 03/13] chore(package): update all dependancies

---
 package.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 7e65e28141f..c4e1461743b 100644
--- a/package.json
+++ b/package.json
@@ -22,23 +22,23 @@
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",
-    "@types/mocha": "^2.2.32",
-    "@types/node": "^6.0.42",
-    "@types/sinon": "^1.16.31",
-    "babel-cli": "^6.11.4",
-    "babel-core": "^6.11.4",
-    "babel-polyfill": "^6.9.1",
-    "babel-preset-es2015": "^6.9.0",
+    "@types/mocha": "^2.2.38",
+    "@types/node": "^7.0.3",
+    "@types/sinon": "^1.16.34",
+    "babel-cli": "^6.22.2",
+    "babel-core": "^6.22.1",
+    "babel-polyfill": "^6.22.0",
+    "babel-preset-es2015": "^6.22.0",
     "chai": "^3.5.0",
     "graphql": "^0.8.2",
     "istanbul": "1.0.0-alpha.2",
     "lerna": "git://github.com/DxCx/lerna.git#bootstrap-dev-bin-pkg",
-    "mocha": "^3.1.1",
-    "remap-istanbul": "0.8.0",
-    "sinon": "^1.17.6",
-    "supertest": "^2.0.0",
-    "supertest-as-promised": "^4.0.0",
+    "mocha": "^3.2.0",
+    "remap-istanbul": "^0.8.4",
+    "sinon": "^1.17.7",
+    "supertest": "^2.0.1",
+    "supertest-as-promised": "^4.0.2",
     "tslint": "^4.3.1",
-    "typescript": "^2.0.3"
+    "typescript": "^2.1.5"
   }
 }

From 73ddbeb20d6cb8a293a903e9a511f19161e6eb2c Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 13:40:38 +0200
Subject: [PATCH 04/13] chore(travis): tweak lint to exclude irrelevant files

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c4e1461743b..dc8b2c2cded 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
   },
   "scripts": {
     "compile": "lerna exec -- npm run compile",
-    "lint": "tslint ./packages/**/src/**/*.ts",
+    "lint": "tslint ./packages/**/src/**/*.ts --exclude \"./packages/**/node_modules/**/*.ts\"",
     "prebootstrap": "npm install",
     "postinstall": "lerna bootstrap",
     "pretest": "npm run compile",

From a163780cbcc0118ccf40d3dd2883aede6160e845 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 14:14:38 +0200
Subject: [PATCH 05/13] chore(package): update lerna config to beta.32

---
 lerna.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lerna.json b/lerna.json
index 4e5a460d439..eaf6bafd2c7 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-beta.30",
+  "lerna": "2.0.0-beta.32",
   "version": "0.5.1",
   "changelog": {
     "repo": "apollostack/graphql-server",
@@ -11,5 +11,8 @@
       "tag: documentation": "Documentation",
       "tag: internal": ":house: Internal"
     }
-  }
+  },
+  "packages": [
+    "packages/*"
+  ]
 }

From d7ca07f742a2950e7264cf63740f5b6e47305591 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 14:19:27 +0200
Subject: [PATCH 06/13] chore(package): add check-updates command to update
 intenral package.json

---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc8b2c2cded..2a310839280 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "pretravis": "npm run compile",
     "travis": "istanbul cover -x \"*.test.js\" _mocha -- --timeout 5000 --compilers js:babel-core/register --full-trace ./test/tests.js",
     "posttravis": "npm run lint",
-    "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info"
+    "postcoverage": "remap-istanbul --input coverage/coverage.raw.json --type lcovonly --output coverage/lcov.info",
+    "check-updates": "lerna exec ./node_modules/.bin/npm-check-updates -- -u"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",
@@ -34,6 +35,7 @@
     "istanbul": "1.0.0-alpha.2",
     "lerna": "git://github.com/DxCx/lerna.git#bootstrap-dev-bin-pkg",
     "mocha": "^3.2.0",
+    "npm-check-updates": "^2.8.9",
     "remap-istanbul": "^0.8.4",
     "sinon": "^1.17.7",
     "supertest": "^2.0.1",

From e9572423598c791970a6e02ac19f44d9f1f652f0 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 14:20:05 +0200
Subject: [PATCH 07/13] chore(package): update all dependancies for internal
 packages

---
 packages/graphql-server-core/package.json          |  2 +-
 packages/graphql-server-express/package.json       | 14 +++++++-------
 packages/graphql-server-hapi/package.json          |  4 ++--
 packages/graphql-server-koa/package.json           |  2 +-
 .../package.json                                   |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json
index 6b9a082b551..adad174619d 100644
--- a/packages/graphql-server-core/package.json
+++ b/packages/graphql-server-core/package.json
@@ -28,7 +28,7 @@
     "@types/fibers": "0.0.29",
     "@types/graphql": "^0.8.5",
     "fibers": "^1.0.15",
-    "meteor-promise": "^0.7.3"
+    "meteor-promise": "^0.8.0"
   },
   "peerDependencies": {
     "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0"
diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json
index b42d2499104..1638b87c107 100644
--- a/packages/graphql-server-express/package.json
+++ b/packages/graphql-server-express/package.json
@@ -32,21 +32,21 @@
   "devDependencies": {
     "@types/body-parser": "0.0.33",
     "@types/connect": "^3.4.30",
-    "@types/express": "^4.0.33",
+    "@types/express": "^4.0.35",
     "@types/multer": "0.0.32",
-    "graphql-server-integration-testsuite": "^0.5.1",
-    "body-parser": "^1.15.2",
-    "connect": "^3.4.1",
+    "body-parser": "^1.16.0",
+    "connect": "^3.5.0",
     "connect-query": "^0.2.0",
     "express": "^4.14.0",
-    "multer": "^1.2.0"
+    "graphql-server-integration-testsuite": "^0.5.1",
+    "multer": "^1.2.1"
   },
   "peerDependencies": {
     "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0"
   },
   "optionalDependencies": {
-    "@types/express": "^4.0.33",
-    "@types/graphql": "^0.8.5"
+    "@types/express": "^4.0.35",
+    "@types/graphql": "^0.8.6"
   },
   "typings": "dist/index.d.ts",
   "typescript": {
diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json
index d164b52d75e..fecaa80d976 100644
--- a/packages/graphql-server-hapi/package.json
+++ b/packages/graphql-server-hapi/package.json
@@ -30,10 +30,10 @@
     "boom": "^4.0.0"
   },
   "devDependencies": {
-    "@types/boom": "0.0.32",
+    "@types/boom": "0.0.33",
     "@types/hapi": "^13.0.35",
     "graphql-server-integration-testsuite": "^0.5.1",
-    "hapi": "^15.0.3",
+    "hapi": "^16.1.0",
     "@types/graphql": "^0.8.5"
   },
   "peerDependencies": {
diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json
index 9d526045598..9bcd22355ec 100644
--- a/packages/graphql-server-koa/package.json
+++ b/packages/graphql-server-koa/package.json
@@ -42,7 +42,7 @@
   },
   "optionalDependencies": {
     "@types/koa": "^2.0.33",
-    "@types/graphql": "^0.8.5"
+    "@types/graphql": "^0.8.6"
   },
   "typings": "dist/index.d.ts",
   "typescript": {
diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json
index 9a954f1ee23..2c4486fa2d3 100644
--- a/packages/graphql-server-module-operation-store/package.json
+++ b/packages/graphql-server-module-operation-store/package.json
@@ -28,7 +28,7 @@
     "graphql": "^0.6.1 || ^0.7.0 || ^0.8.0"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.8.5"
+    "@types/graphql": "^0.8.6"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

From 31b5ba1a78987dfb691dfad12900c5e41f6fd008 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Thu, 17 Nov 2016 15:49:16 +0200
Subject: [PATCH 08/13] chore(misc): add Node 7 to Travis CI

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b90229e990a..8fa9f718065 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,9 @@
 language: node_js
 node_js:
-  - "6"
   - "4"
+  - "6"
+  - "7"
+
 install:
   - npm install -g npm@3
   - npm install -g coveralls

From 96c5571a1a5e7868229299ecd5a39edc14c2d391 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 16:19:46 +0200
Subject: [PATCH 09/13] chore(travis): add caching

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8fa9f718065..ba18d6dd567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,10 @@ node_js:
   - "6"
   - "7"
 
+cache:
+  directories:
+    - $HOME/.npm
+
 install:
   - npm install -g npm@3
   - npm install -g coveralls

From a725a685a637ed8c4ebb2345650deeeeb96f7d09 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 16:19:59 +0200
Subject: [PATCH 10/13] chore(travis): upgrade npm to 4

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ba18d6dd567..bc58474aaea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ cache:
     - $HOME/.npm
 
 install:
-  - npm install -g npm@3
+  - npm install -g npm@4
   - npm install -g coveralls
   - npm install
 

From f5d851c0b432350f25094cb583053c54669e9636 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 16:26:50 +0200
Subject: [PATCH 11/13] chore(travis): split install to logical parts

---
 .travis.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bc58474aaea..571d2f7f33b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,18 @@ cache:
   directories:
     - $HOME/.npm
 
-install:
+before_install:
   - npm install -g npm@4
   - npm install -g coveralls
+
+install:
   - npm install
 
 script:
   # Both test & coverage.
   - npm run travis
+
+after_install:
   - coveralls < ./coverage/lcov.info || true # ignore coveralls error
 
 # Allow Travis tests to run in containers.

From d8034bafdd7f4c590d0c19e3c4469870ca860347 Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 16:28:09 +0200
Subject: [PATCH 12/13] chore(package): add g++ to the machine to allow fibers
 compilation on Node 7

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 571d2f7f33b..4e9f33cc162 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,16 @@ node_js:
   - "6"
   - "7"
 
+env:
+  - CXX=g++-4.8
+
+addons:
+    apt:
+      sources:
+        - ubuntu-toolchain-r-test
+      packages:
+        - g++-4.8
+
 cache:
   directories:
     - $HOME/.npm

From 89471178e21d537d7e2335d91abf25059e9d642e Mon Sep 17 00:00:00 2001
From: Hagai Cohen <hagai.co@gmail.com>
Date: Tue, 24 Jan 2017 16:47:10 +0200
Subject: [PATCH 13/13] chore(travis): cache node_modules as well

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 4e9f33cc162..620126e4eeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,12 +17,14 @@ addons:
 cache:
   directories:
     - $HOME/.npm
+    - node_modules
 
 before_install:
   - npm install -g npm@4
   - npm install -g coveralls
 
 install:
+  - npm prune
   - npm install
 
 script: