Unverified Commit b46abed6 authored by Rishabh Saxena's avatar Rishabh Saxena Committed by GitHub

use records to init store (#11343)

parent 523680c2
...@@ -3,16 +3,18 @@ import { ...@@ -3,16 +3,18 @@ import {
cacheMiddleware, cacheMiddleware,
urlMiddleware, urlMiddleware,
} from 'react-relay-network-modern/node8' } from 'react-relay-network-modern/node8'
import RelaySSR from 'react-relay-network-modern-ssr/node8/client'
import { Environment, RecordSource, Store } from 'relay-runtime' import { Environment, RecordSource, Store } from 'relay-runtime'
const source = new RecordSource() let store, source
const store = new Store(source)
let storeEnvironment = null let storeEnvironment = null
export default { export default {
createEnvironment: relayData => { createEnvironment: records => {
if (!store) {
source = new RecordSource(records)
store = new Store(source)
}
if (storeEnvironment) return storeEnvironment if (storeEnvironment) return storeEnvironment
storeEnvironment = new Environment({ storeEnvironment = new Environment({
...@@ -22,9 +24,6 @@ export default { ...@@ -22,9 +24,6 @@ export default {
size: 100, size: 100,
ttl: 60 * 1000, ttl: 60 * 1000,
}), }),
new RelaySSR(relayData).getMiddleware({
lookup: false,
}),
urlMiddleware({ urlMiddleware({
url: req => process.env.RELAY_ENDPOINT, url: req => process.env.RELAY_ENDPOINT,
}), }),
......
...@@ -2,37 +2,35 @@ import { ...@@ -2,37 +2,35 @@ import {
RelayNetworkLayer, RelayNetworkLayer,
urlMiddleware, urlMiddleware,
} from 'react-relay-network-modern/node8' } from 'react-relay-network-modern/node8'
import RelaySSR from 'react-relay-network-modern-ssr/node8/server' import { Environment, RecordSource, Store } from 'relay-runtime'
import { Network, Environment, RecordSource, Store } from 'relay-runtime'
export default { export default {
initEnvironment: () => { initEnvironment: () => {
const source = new RecordSource() const source = new RecordSource()
const store = new Store(source) const store = new Store(source)
const relaySSR = new RelaySSR()
return { return {
relaySSR,
environment: new Environment({ environment: new Environment({
store, store,
network: new RelayNetworkLayer([ network: new RelayNetworkLayer([
urlMiddleware({ urlMiddleware({
url: req => process.env.RELAY_ENDPOINT, url: req => process.env.RELAY_ENDPOINT,
}), }),
relaySSR.getMiddleware(),
]), ]),
}), }),
} }
}, },
createEnvironment: (relayData, key) => { createEnvironment: records => {
const source = new RecordSource() const source = new RecordSource(records)
const store = new Store(source) const store = new Store(source)
return new Environment({ return new Environment({
store, store,
network: Network.create( network: new RelayNetworkLayer([
() => relayData.find(([dataKey]) => dataKey === key)[1] urlMiddleware({
), url: req => process.env.RELAY_ENDPOINT,
}),
]),
}) })
}, },
} }
...@@ -12,13 +12,18 @@ export default class App extends NextApp { ...@@ -12,13 +12,18 @@ export default class App extends NextApp {
try { try {
if (initEnvironment && Component.query) { if (initEnvironment && Component.query) {
const { environment, relaySSR } = initEnvironment() const { environment } = initEnvironment()
await fetchQuery(environment, Component.query, variables) await fetchQuery(environment, Component.query, variables)
const records = environment
.getStore()
.getSource()
.toJSON()
return { return {
variables, variables,
relayData: await relaySSR.getCache(), records,
} }
} }
} catch (e) { } catch (e) {
...@@ -31,17 +36,12 @@ export default class App extends NextApp { ...@@ -31,17 +36,12 @@ export default class App extends NextApp {
} }
render() { render() {
const { Component, variables = {}, relayData } = this.props const { Component, variables = {}, records } = this.props
const environment = createEnvironment( const environment = createEnvironment(records)
relayData,
JSON.stringify({
queryID: Component.query ? Component.query.params.name : undefined,
variables,
})
)
return ( return (
<QueryRenderer <QueryRenderer
fetchPolicy="store-and-network"
environment={environment} environment={environment}
query={Component.query} query={Component.query}
variables={variables} variables={variables}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment