Merge branch 'master' into master

CHANGELOG.md

@@ -1,9 +1,11 @@
 # Changelog
 
 ### VNEXT
+
+### v0.8.0
 * Persist `window.location.hash` on URL updates [#386](https://github.com/apollographql/graphql-server/issues/386)
 * Added support for `graphql-js` > 0.10.0 [#407](https://github.com/apollographql/graphql-server/pull/407)
-* Updated `subscriptions-transport-ws` for GraphiQL with subscritpions  [#407](https://github.com/apollographql/graphql-server/pull/407)
+* Updated `subscriptions-transport-ws` for GraphiQL with subscriptions  [#407](https://github.com/apollographql/graphql-server/pull/407)
 
 ### v0.7.2
 * Fix include passHeader field that was accidentally removed

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0-rc.4",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "changelog": {
     "repo": "apollostack/graphql-server",
     "labels": {

package.json

@@ -26,21 +26,21 @@
     "release": "lerna publish"
   },
   "devDependencies": {
-    "@types/chai": "^3.4.35",
-    "@types/mocha": "^2.2.40",
-    "@types/node": "^7.0.12",
-    "@types/sinon": "^2.1.2",
-    "chai": "^3.5.0",
-    "graphql": "^0.9.2",
+    "@types/chai": "^3.5.2",
+    "@types/mocha": "^2.2.41",
+    "@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.4",
-    "mocha": "^3.2.0",
-    "npm-check-updates": "^2.10.5",
+    "lerna": "2.0.0-rc.5",
+    "mocha": "^3.4.2",
+    "npm-check-updates": "^2.11.2",
     "remap-istanbul": "^0.9.5",
-    "sinon": "^2.1.0",
+    "sinon": "^2.3.2",
     "supertest": "^3.0.0",
     "supertest-as-promised": "^4.0.2",
-    "tslint": "^5.0.0",
-    "typescript": "^2.2.2"
+    "tslint": "^5.3.2",
+    "typescript": "^2.3.4"
   }
 }

packages/graphql-server-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-core",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Core engine for Apollo GraphQL server",
   "main": "dist/index.js",
   "scripts": {

packages/graphql-server-core/src/runQuery.test.ts

@@ -111,7 +111,7 @@ describe('runQuery', () => {
 
   it('sends stack trace to error if in an error occurs and debug mode is set', () => {
     const query = `query { testError }`;
-    const expected = /at resolveOrError/;
+    const expected = /at resolveFieldValueOrError/;
     const logStub = stub(console, 'error');
     return runQuery({
         schema,

packages/graphql-server-express/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-express",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Production-ready Node.js GraphQL server for Express and Connect",
   "main": "dist/index.js",
   "scripts": {
@@ -26,27 +26,27 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "graphql-server-core": "^0.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
     "@types/body-parser": "1.16.3",
     "@types/connect": "^3.4.30",
     "@types/express": "^4.0.35",
     "@types/multer": "0.0.33",
-    "body-parser": "^1.17.1",
-    "connect": "^3.6.0",
+    "body-parser": "^1.17.2",
+    "connect": "^3.6.2",
     "connect-query": "^1.0.0",
-    "express": "^4.15.2",
-    "graphql-server-integration-testsuite": "^0.7.2",
+    "express": "^4.15.3",
+    "graphql-server-integration-testsuite": "^0.8.0",
     "multer": "^1.3.0"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
     "@types/express": "^4.0.35",
-    "@types/graphql": "^0.9.0"
+    "@types/graphql": "^0.9.1"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/graphql-server-hapi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-hapi",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Production-ready Node.js GraphQL server for Hapi",
   "main": "dist/index.js",
   "scripts": {
@@ -25,23 +25,23 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "boom": "^4.3.1",
-    "graphql-server-core": "^0.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "boom": "^5.1.0",
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
-    "@types/boom": "0.0.33",
-    "@types/graphql": "^0.9.0",
-    "@types/hapi": "^16.0.0",
-    "graphql-server-integration-testsuite": "^0.7.2",
-    "hapi": "^16.1.1"
+    "@types/boom": "4.3.2",
+    "@types/graphql": "^0.9.1",
+    "@types/hapi": "^16.1.2",
+    "graphql-server-integration-testsuite": "^0.8.0",
+    "hapi": "^16.3.0"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.9.0",
-    "@types/hapi": "^16.0.0"
+    "@types/graphql": "^0.9.1",
+    "@types/hapi": "^16.1.2"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

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

@@ -1,7 +1,7 @@
 {
   "name": "graphql-server-integration-testsuite",
   "private": true,
-  "version": "0.7.2",
+  "version": "0.8.0",
   "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.7.0",
-    "graphql-server-module-graphiql": "^0.7.2",
-    "graphql-server-module-operation-store": "^0.7.0",
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0",
+    "graphql-server-module-operation-store": "^0.8.0",
     "supertest": "^3.0.0",
     "supertest-as-promised": "^4.0.0"
   },

packages/graphql-server-integration-testsuite/src/index.ts

@@ -644,7 +644,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
       });
 
       it('sends stack trace to error if debug mode is set', () => {
-          const expected = /at resolveOrError/;
+          const expected = /at resolveFieldValueOrError/;
           const stackTrace = [];
           const origError = console.error;
           console.error = (...args) => stackTrace.push(args);
@@ -665,7 +665,7 @@ export default (createApp: CreateAppFunc, destroyApp?: DestroyAppFunc) => {
 
       it('sends stack trace to error log if debug mode is set', () => {
           const logStub = stub(console, 'error');
-          const expected = /at resolveOrError/;
+          const expected = /at resolveFieldValueOrError/;
           app = createApp({graphqlOptions: {
               schema,
               debug: true,

packages/graphql-server-koa/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-koa",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Production-ready Node.js GraphQL server for Koa",
   "main": "dist/index.js",
   "scripts": {
@@ -25,23 +25,23 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "graphql-server-core": "^0.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
     "@types/koa": "^2.0.39",
     "@types/koa-bodyparser": "^3.0.23",
     "@types/koa-router": "^7.0.22",
-    "graphql-server-integration-testsuite": "^0.7.2",
+    "graphql-server-integration-testsuite": "^0.8.0",
     "koa": "^2.2.0",
     "koa-bodyparser": "^4.2.0",
-    "koa-router": "^7.1.1"
+    "koa-router": "^7.2.0"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.9.0",
+    "@types/graphql": "^0.9.1",
     "@types/koa": "^2.0.39"
   },
   "typings": "dist/index.d.ts",

packages/graphql-server-koa/tsconfig.json

@@ -3,9 +3,7 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",
-    "typeRoots": [
-      "node_modules/@types"
-    ]
+    "types": []
   },
   "exclude": [
     "node_modules",

packages/graphql-server-lambda/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-lambda",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "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.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
-    "@types/aws-lambda": "0.0.9",
-    "@types/graphql": "^0.9.0",
-    "graphql-server-integration-testsuite": "^0.7.2"
+    "@types/aws-lambda": "0.0.10",
+    "@types/graphql": "^0.9.1",
+    "graphql-server-integration-testsuite": "^0.8.0"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1"

packages/graphql-server-micro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-micro",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Production-ready Node.js GraphQL server for Micro",
   "main": "dist/index.js",
   "scripts": {
@@ -25,19 +25,19 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "graphql-server-core": "^0.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
-    "graphql-server-integration-testsuite": "^0.7.2",
-    "micro": "^7.3.0"
+    "graphql-server-integration-testsuite": "^0.8.0",
+    "micro": "^7.3.3"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1",
-    "micro": "^7.3.0"
+    "micro": "^7.3.3"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.9.0",
+    "@types/graphql": "^0.9.1",
     "@types/micro": "^7.3.0"
   },
   "typings": "dist/index.d.ts",

packages/graphql-server-module-graphiql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-module-graphiql",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "GraphiQL renderer for Apollo GraphQL Server",
   "main": "dist/index.js",
   "scripts": {

packages/graphql-server-module-operation-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-module-operation-store",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Persisted operation store module for Apollo GraphQL Servers",
   "main": "dist/index.js",
   "scripts": {
@@ -24,10 +24,10 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "peerDependencies": {
-    "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0"
+    "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.9.0"
+    "@types/graphql": "^0.9.1"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/graphql-server-restify/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphql-server-restify",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Production-ready Node.js GraphQL server for Restify",
   "main": "dist/index.js",
   "scripts": {
@@ -25,20 +25,20 @@
   },
   "homepage": "https://github.com/apollostack/graphql-server#readme",
   "dependencies": {
-    "graphql-server-core": "^0.7.0",
-    "graphql-server-module-graphiql": "^0.7.2"
+    "graphql-server-core": "^0.8.0",
+    "graphql-server-module-graphiql": "^0.8.0"
   },
   "devDependencies": {
-    "@types/restify": "^2.0.42",
-    "graphql-server-integration-testsuite": "^0.7.2",
+    "@types/restify": "^4.3.2",
+    "graphql-server-integration-testsuite": "^0.8.0",
     "restify": "^4.3.0"
   },
   "peerDependencies": {
     "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
-    "@types/graphql": "^0.9.0",
-    "@types/restify": "^2.0.42"
+    "@types/graphql": "^0.9.1",
+    "@types/restify": "^4.3.2"
   },
   "typings": "dist/index.d.ts",
   "typescript": {

packages/graphql-server-restify/tsconfig.json

@@ -3,9 +3,7 @@
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./dist",
-    "typeRoots": [
-      "node_modules/@types"
-    ]
+    "types": []
   },
   "exclude": [
     "node_modules",