Skip to content

Commit

Permalink
Update with-relay-modern and with-relay-modern-server-express (vercel…
Browse files Browse the repository at this point in the history
…#6182)

Update examples with-relay-modern and with-relay-modern-server-express to react-relay 2.0.0

- react-relay has started to use new Context API instead of Legacy Context API
- add `parseInt` because graphql 14.0.0 introduced stricter scalar value coercion

Closes vercel#6157
  • Loading branch information
messa authored and timneutkens committed Jan 31, 2019
1 parent cf31021 commit 968475f
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 83 deletions.
31 changes: 0 additions & 31 deletions examples/with-relay-modern-server-express/lib/RelayProvider.js

This file was deleted.

7 changes: 3 additions & 4 deletions examples/with-relay-modern-server-express/lib/withData.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import initEnvironment from './createRelayEnvironment'
import { fetchQuery } from 'react-relay'
import RelayProvider from './RelayProvider'
import { fetchQuery, ReactRelayContext } from 'react-relay'

export default (ComposedComponent, options = {}) => {
return class WithData extends React.Component {
Expand Down Expand Up @@ -45,9 +44,9 @@ export default (ComposedComponent, options = {}) => {

render () {
return (
<RelayProvider environment={this.environment} variables={{}}>
<ReactRelayContext.Provider value={{ environment: this.environment, variables: {} }}>
<ComposedComponent {...this.props} />
</RelayProvider>
</ReactRelayContext.Provider>
)
}
}
Expand Down
14 changes: 7 additions & 7 deletions examples/with-relay-modern-server-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@
"dependencies": {
"dotenv": "^4.0.0",
"dotenv-webpack": "^1.5.4",
"express-graphql": "^0.6.12",
"graphql": "^0.13.2",
"graphql-relay": "^0.5.5",
"isomorphic-unfetch": "^2.0.0",
"express-graphql": "^0.7.1",
"graphql": "^14.1.1",
"graphql-relay": "^0.6.0",
"isomorphic-unfetch": "^3.0.0",
"next": "latest",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-relay": "^1.5.0"
"react-relay": "^2.0.0"
},
"devDependencies": {
"babel-plugin-relay": "^1.4.1",
"babel-plugin-relay": "^2.0.0",
"graphql-cli": "^1.0.0-beta.4",
"relay-compiler": "^1.5.0"
"relay-compiler": "^2.0.0"
}
}
7 changes: 6 additions & 1 deletion examples/with-relay-modern-server-express/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ class Index extends Component {
}

return {
relayVariables: { after, before, first, last }
relayVariables: {
after,
before,
first: parseInt(first, 10),
last: parseInt(last, 10)
}
}
}

Expand Down
31 changes: 0 additions & 31 deletions examples/with-relay-modern/lib/RelayProvider.js

This file was deleted.

7 changes: 3 additions & 4 deletions examples/with-relay-modern/lib/withData.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React from 'react'
import initEnvironment from './createRelayEnvironment'
import { fetchQuery } from 'react-relay'
import RelayProvider from './RelayProvider'
import { fetchQuery, ReactRelayContext } from 'react-relay'

export default (ComposedComponent, options = {}) => {
return class WithData extends React.Component {
Expand Down Expand Up @@ -47,9 +46,9 @@ export default (ComposedComponent, options = {}) => {

render () {
return (
<RelayProvider environment={this.environment} variables={{}}>
<ReactRelayContext.Provider value={{ environment: this.environment, variables: {} }}>
<ComposedComponent {...this.props} />
</RelayProvider>
</ReactRelayContext.Provider>
)
}
}
Expand Down
10 changes: 5 additions & 5 deletions examples/with-relay-modern/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
"dependencies": {
"dotenv": "^4.0.0",
"dotenv-webpack": "^1.5.4",
"graphql": "^0.13.2",
"isomorphic-unfetch": "^2.0.0",
"graphql": "^14.1.1",
"isomorphic-unfetch": "^3.0.0",
"next": "latest",
"react": "^16.7.0",
"react-dom": "^16.7.0",
"react-relay": "^1.5.0"
"react-relay": "^2.0.0"
},
"devDependencies": {
"babel-plugin-relay": "^1.4.1",
"babel-plugin-relay": "^2.0.0",
"graphcool": "^1.2.1",
"graphql-cli": "^1.0.0-beta.4",
"relay-compiler": "^1.5.0"
"relay-compiler": "^2.0.0"
}
}

0 comments on commit 968475f

Please sign in to comment.