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.

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

Conversation

dotansimha
Copy link
Contributor

@dotansimha dotansimha commented May 28, 2017

Also updated subscriptions-transport-ws version to the latest.

TODO:

  • Update CHANGELOG.md with your change (include reference to issue & this PR)
  • Make sure all of the significant new logic is covered by tests
  • Rebase your changes on master so that they can be merged easily
  • Make sure all tests and linter rules pass

Copy link
Contributor

@DxCx DxCx left a comment

Choose a reason for hiding this comment

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

Thanks @dotansimha
2 comments:

  1. We usually support latest 2 versions which means 0.8.0 can be removed.
  2. If endpointURL starts with ws:// we should use just websocket and not mixed.. :)

@@ -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>' +
Copy link
Contributor

Choose a reason for hiding this comment

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

Lets put under const like graphiql version. Also, graphiql version can be updated to 0.10.2

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@dotansimha
Copy link
Contributor Author

dotansimha commented May 28, 2017

@DxCx

1 - Done
2 - It's a new feature and not related to this PR... let's do it in another PR

@mxstbr
Copy link

mxstbr commented May 28, 2017

Yess, this is great! 🎉 Can't wait for this to land to try the new subscriptions stuff 😊

@Urigo Urigo merged commit 68b3503 into apollographql:master May 28, 2017
@DxCx
Copy link
Contributor

DxCx commented May 28, 2017

well, you rushed to merge it but this is incomplete:
https://github.com/apollographql/graphql-server/blob/master/package.json#L34

packages will still use 0.9.2 for testing...

@@ -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 :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants