Upgrade to connected-react-router

package.json

@@ -15,12 +15,12 @@
     "react-scripts": "1.1.4"
   },
   "dependencies": {
+    "connected-react-router": "^4.3.0",
     "react": "16.4.1",
     "react-dom": "16.4.1",
     "react-redux": "5.0.7",
     "react-router": "4.3.1",
     "react-router-dom": "4.3.1",
-    "react-router-redux": "5.0.0-alpha.9",
     "redux": "4.0.0",
     "redux-thunk": "2.3.0",
     "sanitize.css": "6.0.0",

src/containers/home/index.js

@@ -1,5 +1,5 @@
 import React from 'react'
-import { push } from 'react-router-redux'
+import { push } from 'connected-react-router'
 import { bindActionCreators } from 'redux'
 import { connect } from 'react-redux'
 import {
@@ -15,18 +15,14 @@ const Home = props => (
     <p>Count: {props.count}</p>
 
     <p>
-      <button onClick={props.increment} disabled={props.isIncrementing}>
-        Increment
-      </button>
+      <button onClick={props.increment}>Increment</button>
       <button onClick={props.incrementAsync} disabled={props.isIncrementing}>
         Increment Async
       </button>
     </p>
 
     <p>
-      <button onClick={props.decrement} disabled={props.isDecrementing}>
-        Decrement
-      </button>
+      <button onClick={props.decrement}>Decrement</button>
       <button onClick={props.decrementAsync} disabled={props.isDecrementing}>
         Decrement Async
       </button>
@@ -40,10 +36,10 @@ const Home = props => (
   </div>
 )
 
-const mapStateToProps = state => ({
-  count: state.counter.count,
-  isIncrementing: state.counter.isIncrementing,
-  isDecrementing: state.counter.isDecrementing
+const mapStateToProps = ({ counter }) => ({
+  count: counter.count,
+  isIncrementing: counter.isIncrementing,
+  isDecrementing: counter.isDecrementing
 })
 
 const mapDispatchToProps = dispatch =>
@@ -58,4 +54,7 @@ const mapDispatchToProps = dispatch =>
     dispatch
   )
 
-export default connect(mapStateToProps, mapDispatchToProps)(Home)
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(Home)

src/index.js

@@ -1,7 +1,7 @@
 import React from 'react'
 import { render } from 'react-dom'
 import { Provider } from 'react-redux'
-import { ConnectedRouter } from 'react-router-redux'
+import { ConnectedRouter } from 'connected-react-router'
 import store, { history } from './store'
 import App from './containers/app'
 

src/modules/index.js

@@ -1,8 +1,6 @@
 import { combineReducers } from 'redux'
-import { routerReducer } from 'react-router-redux'
 import counter from './counter'
 
 export default combineReducers({
-  router: routerReducer,
   counter
 })

src/store.js

@@ -1,5 +1,5 @@
 import { createStore, applyMiddleware, compose } from 'redux'
-import { routerMiddleware } from 'react-router-redux'
+import { connectRouter, routerMiddleware } from 'connected-react-router'
 import thunk from 'redux-thunk'
 import createHistory from 'history/createBrowserHistory'
 import rootReducer from './modules'
@@ -18,6 +18,13 @@ if (process.env.NODE_ENV === 'development') {
   }
 }
 
-const composedEnhancers = compose(applyMiddleware(...middleware), ...enhancers)
+const composedEnhancers = compose(
+  applyMiddleware(...middleware),
+  ...enhancers
+)
 
-export default createStore(rootReducer, initialState, composedEnhancers)
+export default createStore(
+  connectRouter(history)(rootReducer),
+  initialState,
+  composedEnhancers
+)