update code to work with react-redux-router 4.0.0

Author: calvinl

client/index.js

@@ -6,6 +6,7 @@ import { Router } from 'react-router';
 import { routes } from '../common/routes';
 import configureStore from '../common/config/store';
 import { browserHistory, hashHistory } from 'react-router';
+import { syncHistoryWithStore } from 'react-router-redux';
 
 /* Images
  * This space is reserved for images that are required by server rendering,
@@ -25,9 +26,12 @@ const rootElement = document.getElementById('app');
 
 // Creates the Redux store based on the initial state passed down by the server
 // rendering.
-const history = __CORDOVA__ ? hashHistory : browserHistory;
+const store = configureStore(initialState);
+const history = syncHistoryWithStore(
+  (__CORDOVA__ ? hashHistory : browserHistory),
+  store
+);
 const initialState = window.__INITIAL_STATE__;
-const store = configureStore(initialState, history);
 
 /* FastClick
  * Disables the 300ms delay for mobile apps. Comment out or add a conditional

common/config/store.dev.js

@@ -2,7 +2,6 @@ import { compose, createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import rootReducer from '../reducers';
 import persistState from 'redux-localstorage';
-import { syncHistory } from 'react-router-redux';
 import DevTools from '../shared/containers/DevTools';
 
 /* localStorage Persisted States
@@ -12,7 +11,7 @@ import DevTools from '../shared/containers/DevTools';
  */
 const persistedStates = [];
 
-export default function configureStore(initialState, history = null) {
+export default function configureStore(initialState, localStorage = true) {
   /* Middleware
    * Configure this array with the middleware that you want included. thunk
    * is included by default, and react-router-redux's syncHistory is also
@@ -27,9 +26,8 @@ export default function configureStore(initialState, history = null) {
 
   // Client-side enhancers and middleware
   if (isBrowser()) {
-    enhancers.push(persistState(persistedStates));
-    if (history) {
-      middleware.push(syncHistory(history));
+    if (localStorage) {
+      enhancers.push(persistState(persistedStates));
     }
   }
 

common/config/store.prod.js

@@ -2,7 +2,6 @@ import { compose, createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import rootReducer from '../reducers';
 import persistState from 'redux-localstorage';
-import { syncHistory } from 'react-router-redux';
 
 /* localStorage Persisted States
  * Set up persisted state properties via localStorage. They should be added
@@ -11,7 +10,7 @@ import { syncHistory } from 'react-router-redux';
  */
 const persistedStates = [];
 
-export default function configureStore(initialState, history = null) {
+export default function configureStore(initialState, localStorage = true) {
   /* Middleware
    * Configure this array with the middleware that you want included. thunk
    * is included by default, and react-router-redux's syncHistory is also
@@ -20,13 +19,12 @@ export default function configureStore(initialState, history = null) {
   let middleware = [thunk];
 
   // Add universal enhancers here
-  let enhancers  = [];
+  let enhancers = [];
 
   // Client-side enhancers and middleware
   if (isBrowser()) {
-    enhancers.push(persistState(persistedStates));
-    if (history) {
-      middleware.push(syncHistory(history));
+    if (localStorage) {
+      enhancers.push(persistState(persistedStates));
     }
   }
 

common/reducers/example.js

@@ -8,8 +8,6 @@ const example = (state = defaultState, action) => {
     default:
       return state;
   }
-
-  return state;
 };
 
 export default example;

common/reducers/index.js

@@ -1,11 +1,11 @@
 import { combineReducers } from 'redux';
-import { routeReducer } from 'react-router-redux';
+import { routerReducer } from 'react-router-redux';
 
 // Import your reducers here
 import example from './example';
 
 const rootReducer = combineReducers({
-  routing: routeReducer,
+  routing: routerReducer,
   example
 });