chore(deps): update connected-react-router to v5.0.1

app/reducers/index.js

@@ -1,5 +1,5 @@
 import { combineReducers } from 'redux'
-// import { routerReducer as router } from 'react-router-redux'
+import { connectRouter } from 'connected-react-router'
 import { intlReducer as intl } from 'react-intl-redux'
 import locale from './locale'
 import theme from './theme'
@@ -23,33 +23,32 @@ import error from './error'
 import loading from './loading'
 import settings from './settings'
 
-const rootReducer = combineReducers({
-  // Third party reducers.
-  // router,
-  intl,
-  locale,
-  theme,
+export default history =>
+  combineReducers({
+    // Third party reducers.
+    intl,
+    locale,
+    router: connectRouter(history),
+    theme,
 
-  // Custom reducers
-  onboarding,
-  lnd,
-  ticker,
-  info,
-  balance,
-  payment,
-  peers,
-  channels,
-  contactsform,
-  form,
-  pay,
-  invoice,
-  address,
-  transaction,
-  activity,
-  network,
-  error,
-  loading,
-  settings
-})
-
-export default rootReducer
+    // Custom reducers
+    onboarding,
+    lnd,
+    ticker,
+    info,
+    balance,
+    payment,
+    peers,
+    channels,
+    contactsform,
+    form,
+    pay,
+    invoice,
+    address,
+    transaction,
+    activity,
+    network,
+    error,
+    loading,
+    settings
+  })

app/store/configureStore.dev.js

@@ -1,9 +1,9 @@
 import { createStore, applyMiddleware, compose } from 'redux'
 import thunk from 'redux-thunk'
 import { createMemoryHistory } from 'history'
-import { connectRouter, routerActions, routerMiddleware } from 'connected-react-router'
+import { routerActions, routerMiddleware } from 'connected-react-router'
 import { createLogger } from 'redux-logger'
-import rootReducer from '../reducers'
+import createRootReducer from '../reducers'
 import ipc from '../reducers/ipc'
 
 export const history = createMemoryHistory()
@@ -46,13 +46,13 @@ export const configureStore = initialState => {
   const enhancer = composeEnhancers(...enhancers)
 
   // Create Store
-  const store = createStore(connectRouter(history)(rootReducer), initialState, enhancer)
+  const store = createStore(createRootReducer(history), initialState, enhancer)
 
   if (module.hot) {
     // eslint-disable-next-line global-require
-    module.hot.accept('../reducers', () =>
-      store.replaceReducer(connectRouter(history)(require('../reducers')))
-    )
+    module.hot.accept('../reducers', () => {
+      store.replaceReducer(createRootReducer(history))
+    })
   }
 
   return store

app/store/configureStore.prod.js

@@ -1,8 +1,8 @@
 import { createStore, applyMiddleware, compose } from 'redux'
 import thunk from 'redux-thunk'
 import { createHashHistory } from 'history'
-import { connectRouter, routerMiddleware } from 'connected-react-router'
-import rootReducer from '../reducers'
+import { routerMiddleware } from 'connected-react-router'
+import createRootReducer from '../reducers'
 import ipc from '../reducers/ipc'
 
 export const history = createHashHistory({ basename: window.location.pathname })
@@ -22,5 +22,5 @@ export function configureStore(initialState) {
   enhancers.push(applyMiddleware(...middleware))
   const enhancer = compose(...enhancers)
 
-  return createStore(connectRouter(history)(rootReducer), initialState, enhancer)
+  return createStore(createRootReducer(history), initialState, enhancer)
 }

package.json

@@ -311,7 +311,7 @@
     "axios": "^0.18.0",
     "bitcoinjs-lib": "^4.0.1",
     "bolt11": "https://github.com/bitcoinjs/bolt11.git",
-    "connected-react-router": "^4.5.0",
+    "connected-react-router": "^5.0.1",
     "copy-to-clipboard": "^3.0.8",
     "country-data-lookup": "^0.0.3",
     "debug": "^4.1.0",

yarn.lock

@@ -5087,13 +5087,12 @@ connect-history-api-fallback@^1.3.0:
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
   integrity sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=
 
-connected-react-router@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-4.5.0.tgz#b6f021cc284a244fbee70e16e5ff0f2a4613e3d3"
-  integrity sha512-SBBmAZrtmw4y7Rkl2PCct8lN/DuCftl7QSAFLgFyjjuYkeJKAzAvQjzNNNE4R3j2+6a4TUiv8qselxQ4+6H5eA==
+connected-react-router@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-5.0.1.tgz#8379854fad7e027b1e27652c00ad534f8ad244b3"
+  integrity sha512-0QwWYPRGZQ7f284lmqc5kwC4T3iW3zrAH3zzi6uUMzTOxbA+mn38tAgMOoVo9m3pbskvONFtXiajgVkCElE9EQ==
   dependencies:
     immutable "^3.8.1"
-    redux-seamless-immutable "^0.4.0"
     seamless-immutable "^7.1.3"
 
 console-browserify@1.1.x, console-browserify@^1.1.0:
@@ -13454,11 +13453,6 @@ react-router-dom@^4.3.1:
     react-router "^4.3.1"
     warning "^4.0.1"
 
-react-router-redux@^4.0.0:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.8.tgz#227403596b5151e182377dab835b5d45f0f8054e"
-  integrity sha1-InQDWWtRUeGCN32rg1tdRfD4BU4=
-
 react-router-redux@^5.0.0-alpha.9:
   version "5.0.0-alpha.9"
   resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-5.0.0-alpha.9.tgz#825431516e0e6f1fd93b8807f6bd595e23ec3d10"
@@ -13883,14 +13877,6 @@ redux-logger@^3.0.6:
   dependencies:
     deep-diff "^0.3.5"
 
-redux-seamless-immutable@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/redux-seamless-immutable/-/redux-seamless-immutable-0.4.0.tgz#b50f8680ecc5ef04021551267f78fa1ffd3cf985"
-  integrity sha512-/oS3fhrize9D3RSHemgJxVllohybRrad5IjccotFy8Ni4IKAPTtX1mqszpiCIl12+7v0dNqBpq6ES6R236AliQ==
-  dependencies:
-    react-router-redux "^4.0.0"
-    seamless-immutable "^7.1.2"
-
 redux-thunk@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
@@ -14545,7 +14531,7 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-seamless-immutable@^7.1.2, seamless-immutable@^7.1.3:
+seamless-immutable@^7.1.3:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8"
   integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==