Merge pull request #350 from cozy/fix-only-1-store

Fix only 1 store

package.json

@@ -23,7 +23,7 @@
     "build:browser:min": "yarn run webpack --env.production",
     "build:mobile:min": "yarn run webpack --env.production --env.target=mobile",
     "watch": "yarn run webpack --watch --display-chunks",
-    "watch:mobile": "yarn run watch:common --env.target=mobile",
+    "watch:mobile": "yarn run watch --env.target=mobile",
     "clean": "rm -rf ./dist/*",
     "lint": "eslint 'config/**/*.{js,jsx}, src/**/*.{js,jsx}'",
     "prebuild": "npm-run-all lint clean tx",

src/index.jsx

@@ -178,8 +178,8 @@ const init = async ({
     isPublic = true
   }
   // store
-  const createReduxStore = require('lib/store').default
-  const reduxStore = createReduxStore()
+  const getOrCreateStore = require('lib/store').default
+  const reduxStore = getOrCreateStore()
 
   reduxStore.dispatch(setInfos(appName, appNamePrefix, appSlug))
   stack.init({

src/lib/store/index.js

@@ -1,6 +1,6 @@
 /* global __DEVELOPMENT__ */
 
-import { createStore, applyMiddleware } from 'redux'
+import { createStore as createReduxStore, applyMiddleware } from 'redux'
 import appsI18nMiddleware from '../middlewares/appsI18n'
 import thunkMiddleware from 'redux-thunk'
 import { persistStore, persistCombineReducers } from 'redux-persist'
@@ -22,11 +22,18 @@ const middlewares = [appsI18nMiddleware, thunkMiddleware]
 
 if (__DEVELOPMENT__) middlewares.push(loggerMiddleware)
 
-const createReduxStore = () => {
-  let store = createStore(reducer, applyMiddleware.apply(null, middlewares))
+export const createStore = () => {
+  store = createReduxStore(reducer, applyMiddleware.apply(null, middlewares))
   persistStore(store)
+  return store
+}
 
+let store
+const getOrCreateStore = () => {
+  if (!store) {
+    store = createStore()
+  }
   return store
 }
 
-export default createReduxStore
+export default getOrCreateStore

test/store/index.spec.js

@@ -1,4 +1,4 @@
-import createStore from 'lib/store'
+import getOrCreateStore, { createStore } from 'lib/store'
 import { isFetchingApps, getApps, hasFetched } from 'lib/reducers'
 
 describe('store', () => {
@@ -31,3 +31,11 @@ describe('store', () => {
     expect(hasFetched(getState())).toEqual(true)
   })
 })
+
+describe('singleton', () => {
+  it('should work as a singleton', () => {
+    const store = getOrCreateStore()
+    const store2 = getOrCreateStore()
+    expect(store).toEqual(store2)
+  })
+})