Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): updated graphql-js version to support 0.10.0 #407

Merged
merged 5 commits into from
May 28, 2017
Merged

chore(deps): updated graphql-js version to support 0.10.0 #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e718dc5
chore(deps): updated graphql-js version to support 0.10.0
dotansimha May 28, 2017
834b2eb
updated changelog
dotansimha May 28, 2017
0401c8e
updated subscriptions-transport-ws version
dotansimha May 28, 2017
a614ba2
updated graphql-js version
dotansimha May 28, 2017
081aed1
update graphiql and move transport version to const
dotansimha May 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-express/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-hapi/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-integration-testsuite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-koa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-lambda/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-micro/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
5 changes: 3 additions & 2 deletions packages/graphql-server-module-graphiql/src/renderGraphiQL.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/[email protected]/browser/client.js"></script>'
: ''}
</head>
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-module-operation-store/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @dotansimha you forgot to align with others :)

},
"optionalDependencies": {
"@types/graphql": "^0.9.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-server-restify/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down