diff --git a/CHANGELOG.md b/CHANGELOG.md
index f419d4c83d3..44d06f1924b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
### VNEXT
* 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)
### v0.7.2
* Fix include passHeader field that was accidentally removed
diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json
index 19f0ee5c119..0342f07ba34 100644
--- a/packages/graphql-server-core/package.json
+++ b/packages/graphql-server-core/package.json
@@ -30,7 +30,7 @@
"meteor-promise": "^0.8.2"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0"
diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json
index 9fc59dccdf5..bc22997be02 100644
--- a/packages/graphql-server-express/package.json
+++ b/packages/graphql-server-express/package.json
@@ -42,7 +42,7 @@
"multer": "^1.3.0"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/express": "^4.0.35",
diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json
index be8d6db055f..034634f46c6 100644
--- a/packages/graphql-server-hapi/package.json
+++ b/packages/graphql-server-hapi/package.json
@@ -37,7 +37,7 @@
"hapi": "^16.1.1"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0",
diff --git a/packages/graphql-server-integration-testsuite/package.json b/packages/graphql-server-integration-testsuite/package.json
index bbebc59d2f8..cb7ce8b4bcd 100644
--- a/packages/graphql-server-integration-testsuite/package.json
+++ b/packages/graphql-server-integration-testsuite/package.json
@@ -30,7 +30,7 @@
"@types/graphql": "^0.9.0"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0"
diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json
index 548f7beb95e..27b1482047d 100644
--- a/packages/graphql-server-koa/package.json
+++ b/packages/graphql-server-koa/package.json
@@ -38,7 +38,7 @@
"koa-router": "^7.1.1"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0",
diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json
index 60795717cdb..bd9988e81a9 100644
--- a/packages/graphql-server-lambda/package.json
+++ b/packages/graphql-server-lambda/package.json
@@ -34,7 +34,7 @@
"graphql-server-integration-testsuite": "^0.7.2"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"typings": "dist/index.d.ts",
"typescript": {
diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json
index 4509a971c4e..3960bce6bf0 100644
--- a/packages/graphql-server-micro/package.json
+++ b/packages/graphql-server-micro/package.json
@@ -33,7 +33,7 @@
"micro": "^7.3.0"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0",
+ "graphql": "^0.9.0 || ^0.10.1",
"micro": "^7.3.0"
},
"optionalDependencies": {
diff --git a/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
index 1cab3214912..70300969e78 100644
--- a/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
+++ b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
@@ -29,7 +29,8 @@ export type GraphiQLData = {
};
// Current latest version of GraphiQL.
-const GRAPHIQL_VERSION = '0.9.1';
+const GRAPHIQL_VERSION = '0.10.2';
+const SUBSCRIPTIONS_TRANSPORT_VERSION = '0.7.0';
// Ensures string values are safe to be used within a
${usingSubscriptions ?
- '' +
+ `` +
''
: ''}
diff --git a/packages/graphql-server-module-operation-store/package.json b/packages/graphql-server-module-operation-store/package.json
index 2211f247e07..5fa9459db92 100644
--- a/packages/graphql-server-module-operation-store/package.json
+++ b/packages/graphql-server-module-operation-store/package.json
@@ -24,7 +24,7 @@
},
"homepage": "https://github.com/apollostack/graphql-server#readme",
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0"
diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json
index 1ea0200b70a..03ad5259645 100644
--- a/packages/graphql-server-restify/package.json
+++ b/packages/graphql-server-restify/package.json
@@ -34,7 +34,7 @@
"restify": "^4.3.0"
},
"peerDependencies": {
- "graphql": "^0.8.0 || ^0.9.0"
+ "graphql": "^0.9.0 || ^0.10.1"
},
"optionalDependencies": {
"@types/graphql": "^0.9.0",