From e718dc5e2e0a8f9dbce148cfd79ac29b041e7f7c Mon Sep 17 00:00:00 2001
From: dotansimha <dotansimha@gmail.com>
Date: Sun, 28 May 2017 16:37:16 +0300
Subject: [PATCH 1/5] chore(deps): updated graphql-js version to support 0.10.0

---
 packages/graphql-server-core/package.json                   | 2 +-
 packages/graphql-server-express/package.json                | 2 +-
 packages/graphql-server-hapi/package.json                   | 2 +-
 packages/graphql-server-integration-testsuite/package.json  | 2 +-
 packages/graphql-server-koa/package.json                    | 2 +-
 packages/graphql-server-lambda/package.json                 | 2 +-
 packages/graphql-server-micro/package.json                  | 2 +-
 packages/graphql-server-module-operation-store/package.json | 2 +-
 packages/graphql-server-restify/package.json                | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json
index 19f0ee5c119..778fd1fbc91 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.9.0"
diff --git a/packages/graphql-server-express/package.json b/packages/graphql-server-express/package.json
index 9fc59dccdf5..b643a47c07e 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "optionalDependencies": {
     "@types/express": "^4.0.35",
diff --git a/packages/graphql-server-hapi/package.json b/packages/graphql-server-hapi/package.json
index be8d6db055f..bc741210ca9 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "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..c512c2adc09 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.9.0"
diff --git a/packages/graphql-server-koa/package.json b/packages/graphql-server-koa/package.json
index 548f7beb95e..b108861cfc8 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.9.0",
diff --git a/packages/graphql-server-lambda/package.json b/packages/graphql-server-lambda/package.json
index 60795717cdb..b88bbeb90f5 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "typings": "dist/index.d.ts",
   "typescript": {
diff --git a/packages/graphql-server-micro/package.json b/packages/graphql-server-micro/package.json
index 4509a971c4e..a831b0bf5b7 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.8.0 || ^0.9.0 || ^0.10.0",
     "micro": "^7.3.0"
   },
   "optionalDependencies": {
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..aca70fbcc9e 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.8.0 || ^0.9.0 || ^0.10.0"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.9.0",

From 834b2eb7620003e18bf9a08530a1e2db3d128aa6 Mon Sep 17 00:00:00 2001
From: dotansimha <dotansimha@gmail.com>
Date: Sun, 28 May 2017 16:38:29 +0300
Subject: [PATCH 2/5] updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f419d4c83d3..efccd8a9e77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### 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)
 
 ### v0.7.2
 * Fix include passHeader field that was accidentally removed

From 0401c8e3a6ef5faf66302c0b2213e0423aa59da3 Mon Sep 17 00:00:00 2001
From: dotansimha <dotansimha@gmail.com>
Date: Sun, 28 May 2017 16:40:21 +0300
Subject: [PATCH 3/5] updated subscriptions-transport-ws version

---
 CHANGELOG.md                                                  | 1 +
 packages/graphql-server-module-graphiql/src/renderGraphiQL.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efccd8a9e77..44d06f1924b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### 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-module-graphiql/src/renderGraphiQL.ts b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
index 1cab3214912..755ebe20106 100644
--- a/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
+++ b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
@@ -70,7 +70,7 @@ export function renderGraphiQL(data: GraphiQLData): string {
   <script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
   <script src="//cdn.jsdelivr.net/graphiql/${GRAPHIQL_VERSION}/graphiql.min.js"></script>
   ${usingSubscriptions ?
-    '<script src="//unpkg.com/subscriptions-transport-ws@0.5.4/browser/client.js"></script>' +
+    '<script src="//unpkg.com/subscriptions-transport-ws@0.7.0/browser/client.js"></script>' +
     '<script src="//unpkg.com/graphiql-subscriptions-fetcher@0.0.2/browser/client.js"></script>'
     : ''}
 </head>

From a614ba2543b22df34cc9bf4592847b7deabc7a50 Mon Sep 17 00:00:00 2001
From: dotansimha <dotansimha@gmail.com>
Date: Sun, 28 May 2017 20:07:06 +0300
Subject: [PATCH 4/5] updated graphql-js version

---
 packages/graphql-server-core/package.json                  | 2 +-
 packages/graphql-server-express/package.json               | 2 +-
 packages/graphql-server-hapi/package.json                  | 2 +-
 packages/graphql-server-integration-testsuite/package.json | 2 +-
 packages/graphql-server-koa/package.json                   | 2 +-
 packages/graphql-server-lambda/package.json                | 2 +-
 packages/graphql-server-micro/package.json                 | 2 +-
 packages/graphql-server-restify/package.json               | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/graphql-server-core/package.json b/packages/graphql-server-core/package.json
index 778fd1fbc91..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 || ^0.10.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 b643a47c07e..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 || ^0.10.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 bc741210ca9..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 || ^0.10.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 c512c2adc09..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 || ^0.10.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 b108861cfc8..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 || ^0.10.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 b88bbeb90f5..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 || ^0.10.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 a831b0bf5b7..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 || ^0.10.0",
+    "graphql": "^0.9.0 || ^0.10.1",
     "micro": "^7.3.0"
   },
   "optionalDependencies": {
diff --git a/packages/graphql-server-restify/package.json b/packages/graphql-server-restify/package.json
index aca70fbcc9e..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 || ^0.10.0"
+    "graphql": "^0.9.0 || ^0.10.1"
   },
   "optionalDependencies": {
     "@types/graphql": "^0.9.0",

From 081aed130fa0a4c72347cc0b616df592720ca9ce Mon Sep 17 00:00:00 2001
From: dotansimha <dotansimha@gmail.com>
Date: Sun, 28 May 2017 20:11:40 +0300
Subject: [PATCH 5/5] update graphiql and move transport version to const

---
 .../graphql-server-module-graphiql/src/renderGraphiQL.ts     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts b/packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
index 755ebe20106..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 <script> tag.
 // TODO: I don't think that's the right escape function
@@ -70,7 +71,7 @@ export function renderGraphiQL(data: GraphiQLData): string {
   <script src="//cdn.jsdelivr.net/react/15.0.0/react-dom.min.js"></script>
   <script src="//cdn.jsdelivr.net/graphiql/${GRAPHIQL_VERSION}/graphiql.min.js"></script>
   ${usingSubscriptions ?
-    '<script src="//unpkg.com/subscriptions-transport-ws@0.7.0/browser/client.js"></script>' +
+    `<script src="//unpkg.com/subscriptions-transport-ws@${SUBSCRIPTIONS_TRANSPORT_VERSION}/browser/client.js"></script>` +
     '<script src="//unpkg.com/graphiql-subscriptions-fetcher@0.0.2/browser/client.js"></script>'
     : ''}
 </head>