temporary change from 'react-router-redux' to 'connected-react-router' and wait for the merge of those two

Author: Armour

frontend/src/App.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { ConnectedRouter } from 'react-router-redux';
 import { Store } from 'redux';
 
+import { ConnectedRouter } from 'connected-react-router';
 import { History } from 'history';
 
 import { DevTools } from 'containers/DevTools';

frontend/src/reducers/index.tsx

@@ -1,4 +1,3 @@
-import { routerReducer } from 'react-router-redux';
 import { combineReducers } from 'redux';
 
 import { apiData } from 'reducers/apiData';
@@ -9,5 +8,4 @@ export default combineReducers({
   apiData,
   todos,
   visibilityFilter,
-  routing: routerReducer as any,
 });

frontend/src/store/index.tsx

@@ -1,4 +1,4 @@
-import { routerMiddleware } from 'react-router-redux';
+import { connectRouter, routerMiddleware } from 'connected-react-router';
 import { applyMiddleware, compose, createStore, Store } from 'redux';
 import { createLogger } from 'redux-logger';
 import promise from 'redux-promise';
@@ -29,13 +29,13 @@ export const configureStore = (initialState: {}, history: History): Store<any> =
   }
 
   // Store
-  const store = createStore(reducers, initialState, enhancer);
+  const store = createStore(connectRouter(history)(reducers), initialState, enhancer);
 
   // Enable Webpack hot module replacement for reducers
   if (!isProduction && module.hot) {
     module.hot.accept('../reducers', () => {
       const nextReducers = require('reducers').default;
-      store.replaceReducer(nextReducers);
+      store.replaceReducer(connectRouter(history)(nextReducers));
     });
   }
 

package.json

@@ -56,6 +56,7 @@
     "babel-register": "^6.26.0",
     "body-parser": "^1.17.2",
     "compression": "^1.7.0",
+    "connected-react-router": "^4.2.3",
     "cookie-parser": "^1.4.3",
     "css-loader": "^0.28.7",
     "del": "^3.0.0",
@@ -98,7 +99,6 @@
     "react-hot-loader": "v3.0.0-beta.7",
     "react-redux": "^5.0.5",
     "react-router-dom": "^4.2.2",
-    "react-router-redux": "^5.0.0-alpha.6",
     "redux": "^3.7.2",
     "redux-devtools": "^3.4.0",
     "redux-devtools-dock-monitor": "^1.1.2",

webpack.config.dll.babel.js

@@ -11,7 +11,6 @@ const reactVendors = [
   'react-dom',
   'react-router-dom',
   'react-redux',
-  'react-router-redux',
   'react-hot-loader',
   'redux',
   'redux-devtools',
@@ -20,6 +19,7 @@ const reactVendors = [
   'redux-logger',
   'redux-promise',
   'redux-thunk',
+  'connected-react-router',
 ];
 
 const materializeVendors = [

yarn.lock

@@ -1705,12 +1705,12 @@ caniuse-api@^2.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000726"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000726.tgz#9bb742f8d026a62df873bc03c06843d2255b60d7"
+  version "1.0.30000727"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000727.tgz#4e22593089b0f35c1b2adcfc28234493a21a4b2e"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000718, caniuse-lite@^1.0.30000726:
-  version "1.0.30000726"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000726.tgz#966a753fa107a09d4131cf8b3d616723a06ccf7e"
+  version "1.0.30000727"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000727.tgz#20c895768398ded5f98a4beab4a76c285def41d2"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2030,6 +2030,13 @@ [email protected]:
     parseurl "~1.3.1"
     utils-merge "1.0.0"
 
+connected-react-router@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-4.2.3.tgz#7066a7f83da484ddfa9c353903a6b07d19cbe9e1"
+  dependencies:
+    immutable "^3.8.1"
+    react-router "^4.1.0"
+
 console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
@@ -3286,7 +3293,7 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
-extglob@^2.0.0:
+extglob@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
   dependencies:
@@ -4260,7 +4267,7 @@ [email protected]:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/hide-powered-by/-/hide-powered-by-1.0.0.tgz#4a85ad65881f62857fc70af7174a1184dccce32b"
 
-history@^4.5.1, history@^4.7.2:
+history@^4.7.2:
   version "4.7.2"
   resolved "https://registry.yarnpkg.com/history/-/history-4.7.2.tgz#22b5c7f31633c5b8021c7f4a8a954ac139ee8d5b"
   dependencies:
@@ -4501,6 +4508,10 @@ [email protected]:
   version "4.0.0-rc.2"
   resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0-rc.2.tgz#fdd0948aae728fda2306a02f72bb73e1773432d1"
 
+immutable@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.1.tgz#200807f11ab0f72710ea485542de088075f68cd2"
+
 imurmurhash@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
@@ -6024,15 +6035,15 @@ micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.3:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.0.5.tgz#99717da26f83c050cd712ab5ea59f71821f758f9"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.0.tgz#5102d4eaf20b6997d6008e3acfe1c44a3fa815e2"
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
     braces "^2.2.2"
     define-property "^1.0.0"
     extend-shallow "^2.0.1"
-    extglob "^2.0.0"
+    extglob "^2.0.2"
     fragment-cache "^0.2.1"
     kind-of "^5.0.2"
     nanomatch "^1.2.1"
@@ -7774,15 +7785,7 @@ react-router-dom@^4.2.2:
     react-router "^4.2.0"
     warning "^3.0.0"
 
-react-router-redux@^5.0.0-alpha.6:
-  version "5.0.0-alpha.6"
-  resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.6.tgz#7418663c2ecd3c51be856fcf28f3d1deecc1a576"
-  dependencies:
-    history "^4.5.1"
-    prop-types "^15.5.4"
-    react-router "^4.1.1"
-
-react-router@^4.1.1, react-router@^4.2.0:
+react-router@^4.1.0, react-router@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.2.0.tgz#61f7b3e3770daeb24062dae3eedef1b054155986"
   dependencies: