update reducer

Author: MacKentoch

docs/public/assets/bundle.js

@@ -1,5 +1,13 @@
+import { routerReducer } from 'react-router-redux';
+import { combineReducers } from 'redux';
 import views from './views';
 
-export {
+export const reducers = {
   views
 };
+
+
+export default combineReducers({
+  ...reducers,
+  routing: routerReducer
+});

src/app/redux/modules/reducers.js

@@ -1,9 +1,9 @@
-import { createStore, compose, combineReducers, applyMiddleware } from 'redux';
+import { createStore, compose, applyMiddleware } from 'redux';
 import { persistState }         from 'redux-devtools';
-import { routerReducer }        from 'react-router-redux';
+// import { routerReducer }        from 'react-router-redux';
 import createLogger             from 'redux-logger';
 import thunkMiddleware          from 'redux-thunk';
-import * as reducers            from '../modules/reducers';
+import reducer                  from '../modules/reducers';
 import DevTools                 from '../devTools/DevTools.jsx';
 
 
@@ -24,15 +24,8 @@ function getDebugSessionKey() {
   return (matches && matches.length > 0)? matches[1] : null;
 }
 
-// combine reducers -> createStore reducer
-const reducer = combineReducers({
-  ...reducers,
-  routing: routerReducer
-});
-
 export default function configureStore(initialState) {
   const store = createStore(reducer, initialState, enhancer);
-  // checks if webpack HMR:
   if (module.hot) {
     module.hot.accept('../modules/reducers', () =>
       store.replaceReducer(require('../modules/reducers').default)

src/app/redux/store/configureStore.dev.js

@@ -1,13 +1,11 @@
 import {
   createStore,
   applyMiddleware,
-  compose,
-  combineReducers
+  compose
 }                         from 'redux';
 import createLogger       from 'redux-logger';
 import thunkMiddleware    from 'redux-thunk';
-import * as reducers      from '../modules/reducers';
-import { routerReducer }  from 'react-router-redux';
+import reducer            from '../modules/reducers';
 
 const loggerMiddleware = createLogger({
   level     : 'info',
@@ -19,12 +17,6 @@ const enhancer = compose(
   applyMiddleware(thunkMiddleware, loggerMiddleware) // logger after thunk to avoid undefined actions
 );
 
-// combine reducers
-const reducer = combineReducers({
-  ...reducers,
-  routing: routerReducer
-});
-
 export default function configureStore(initialState) {
   return createStore(reducer, initialState, enhancer);
 }