2 files changed, 16 insertions, 40 deletions
diff --git a/src/background/reducers/index.js b/src/background/reducers/index.js
index 78f855c..465f927 100644
--- a/src/background/reducers/index.js
+++ b/src/background/reducers/index.js
@@ -1,17 +1,8 @@
-import settingReducer from './setting';
-import findReducer from './find';
-import tabReducer from './tab';
+import { combineReducers } from 'redux';
+import setting from './setting';
+import find from './find';
+import tab from './tab';
 
-// Make setting reducer instead of re-use
-const defaultState = {
-  setting: settingReducer(undefined, {}),
-  find: findReducer(undefined, {}),
-  tab: tabReducer(undefined, {}),
-};
-
-export default function reducer(state = defaultState, action = {}) {
-  return { ...state,
-    setting: settingReducer(state.setting, action),
-    find: findReducer(state.find, action),
-    tab: tabReducer(state.tab, action), };
-}
+export default combineReducers({
+  setting, find, tab,
+});
diff --git a/src/content/reducers/index.js b/src/content/reducers/index.js
index c3a474e..6e6a147 100644
--- a/src/content/reducers/index.js
+++ b/src/content/reducers/index.js
@@ -1,25 +1,10 @@
-import addonReducer from './addon';
-import findReducer from './find';
-import settingReducer from './setting';
-import inputReducer from './input';
-import followControllerReducer from './follow-controller';
+import { combineReducers } from 'redux';
+import addon from './addon';
+import find from './find';
+import setting from './setting';
+import input from './input';
+import followController from './follow-controller';
 
-// Make setting reducer instead of re-use
-const defaultState = {
-  addon: addonReducer(undefined, {}),
-  find: findReducer(undefined, {}),
-  setting: settingReducer(undefined, {}),
-  input: inputReducer(undefined, {}),
-  followController: followControllerReducer(undefined, {}),
-};
-
-export default function reducer(state = defaultState, action = {}) {
-  return {
-    ...state,
-    addon: addonReducer(state.addon, action),
-    find: findReducer(state.find, action),
-    setting: settingReducer(state.setting, action),
-    input: inputReducer(state.input, action),
-    followController: followControllerReducer(state.followController, action),
-  };
-}
+export default combineReducers({
+  addon, find, setting, input, followController,
+});