Merge pull request #13 from rocjs/bug/react-router-redux

Fixes so React Router Redux is used on the server and in production
rocjs · May 6, 2016 · 32cc11c · 32cc11c
2 parents d1c9df8 + 7750a41
commit 32cc11c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/roc-package-web-app-react/app/shared/flux/create-store.js b/packages/roc-package-web-app-react/app/shared/flux/create-store.js
@@ -20,6 +20,9 @@ export default function createReduxStore(reducers, ...middlewares) {
         (history, initialState) => {
             let finalCreateStore;
 
+            // Add the react-router-redux middleware
+            middlewares.push(routerMiddleware(history));
+
             if (__DEV__ && __WEB__) {
                 const { persistState } = require('redux-devtools');
                 const createLogger = require('redux-logger');
@@ -32,8 +35,6 @@ export default function createReduxStore(reducers, ...middlewares) {
 
                 const debugMiddlewares = [logger];
 
-                // Add the react-router-redux middleware
-                middlewares.push(routerMiddleware(history));
                 const devTools = window.devToolsExtension
                     ? window.devToolsExtension()
                     // TODO Enable maxAge support here. Will require a fix for validations in roc