Merge pull request #407 from dotansimha/chore/deps

chore(deps): updated graphql-js version to support 0.10.0
apollographql · May 28, 2017 · 68b3503 · 68b3503
2 parents c5aa52e + 081aed1
commit 68b3503
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.5.4/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>

diff --git 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
@@ -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",