Move combineReducers from browser-redux-bg

zalmoxisus · Nov 3, 2015 · c74f905 · c74f905
1 parent 41f522e
commit c74f905
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -78,7 +78,7 @@
     "webpack-dev-server": "^1.12.1"
   },
   "dependencies": {
-    "browser-redux-bg": "^0.1.2",
+    "browser-redux-bg": "^0.2.0",
     "browser-redux-sync": "^0.3.4",
     "react": "^0.14.0",
     "react-dom": "^0.14.0",

diff --git a/src/app/store/configureStore.js b/src/app/store/configureStore.js
@@ -1,14 +1,15 @@
-import { createStore, applyMiddleware, compose } from 'redux';
+import { combineReducers } from 'redux';
 import thunk from 'redux-thunk';
 import { getStoredState, persistStore } from 'redux-persist';
 import { configureSync, sync } from 'browser-redux-sync';
-import { configureBg, combineReducers } from 'browser-redux-bg';
+import { configureBg, bgReducer } from 'browser-redux-bg';
 import reducers from '../reducers';
 import actions from '../actions';
 
 export default function configureStore(callback, isFromBackground) {
   getStoredState(configureSync(), (err, initialState) => {
-    let rootReducer = combineReducers(reducers, isFromBackground);
+    const extension = bgReducer(isFromBackground);
+    const rootReducer = combineReducers({ ...reducers, extension });
     let finalCreateStore;
     let store;