Commit a3bec766 authored by Sébastien Dubois's avatar Sébastien Dubois Committed by Tim Neutkens

with-apollo: Don't store Redux store and Apollo client in global namespace (#909)

* Add yarn lockfile

* Avoid storing Redux store and Apollo client in global namespace + don't create Apollo client when already existing in browser
parent bf467e64
import ApolloClient, { createNetworkInterface } from 'apollo-client' import ApolloClient, { createNetworkInterface } from 'apollo-client'
export const initClient = (headers) => { let apolloClient = null
const client = new ApolloClient({
function createClient (headers) {
return new ApolloClient({
ssrMode: !process.browser, ssrMode: !process.browser,
headers, headers,
dataIdFromObject: result => result.id || null, dataIdFromObject: result => result.id || null,
...@@ -12,11 +14,14 @@ export const initClient = (headers) => { ...@@ -12,11 +14,14 @@ export const initClient = (headers) => {
} }
}) })
}) })
}
export const initClient = (headers) => {
if (!process.browser) { if (!process.browser) {
return client return createClient(headers)
} }
if (!window.APOLLO_CLIENT) { if (!apolloClient) {
window.APOLLO_CLIENT = client apolloClient = createClient(headers)
} }
return window.APOLLO_CLIENT return apolloClient
} }
...@@ -2,15 +2,17 @@ import { createStore } from 'redux' ...@@ -2,15 +2,17 @@ import { createStore } from 'redux'
import getReducer from './reducer' import getReducer from './reducer'
import createMiddleware from './middleware' import createMiddleware from './middleware'
let reduxStore = null
export const initStore = (client, initialState) => { export const initStore = (client, initialState) => {
let store let store
if (!process.browser || !window.REDUX_STORE) { if (!process.browser || !reduxStore) {
const middleware = createMiddleware(client.middleware()) const middleware = createMiddleware(client.middleware())
store = createStore(getReducer(client), initialState, middleware) store = createStore(getReducer(client), initialState, middleware)
if (!process.browser) { if (!process.browser) {
return store return store
} }
window.REDUX_STORE = store reduxStore = store
} }
return window.REDUX_STORE return reduxStore
} }
This source diff could not be displayed because it is too large. You can view the blob instead.
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