summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/app.js2
-rw-r--r--app/containers/AccountPage.js2
-rw-r--r--app/containers/AdvancedSettingsPage.js2
-rw-r--r--app/containers/ConnectPage.js2
-rw-r--r--app/containers/LoginPage.js2
-rw-r--r--app/containers/PreferencesPage.js2
-rw-r--r--app/containers/SelectLocationPage.js2
-rw-r--r--app/containers/SettingsPage.js2
-rw-r--r--app/containers/SupportPage.js2
-rw-r--r--app/redux/store.js9
-rw-r--r--package.json10
-rw-r--r--yarn.lock89
12 files changed, 73 insertions, 53 deletions
diff --git a/app/app.js b/app/app.js
index eb9c9c2647..501bfac780 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,7 +3,7 @@
import React from 'react';
import { bindActionCreators } from 'redux';
import { Provider } from 'react-redux';
-import { ConnectedRouter, push as pushHistory } from 'react-router-redux';
+import { ConnectedRouter, push as pushHistory } from 'connected-react-router';
import { createMemoryHistory } from 'history';
import { webFrame, ipcRenderer } from 'electron';
diff --git a/app/containers/AccountPage.js b/app/containers/AccountPage.js
index a85ad3d43f..078c893748 100644
--- a/app/containers/AccountPage.js
+++ b/app/containers/AccountPage.js
@@ -3,7 +3,7 @@
import { remote } from 'electron';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import Account from '../components/Account';
import accountActions from '../redux/account/actions';
import { links } from '../config';
diff --git a/app/containers/AdvancedSettingsPage.js b/app/containers/AdvancedSettingsPage.js
index 357cafdfee..9f88228cc3 100644
--- a/app/containers/AdvancedSettingsPage.js
+++ b/app/containers/AdvancedSettingsPage.js
@@ -1,7 +1,7 @@
// @flow
import { connect } from 'react-redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import { AdvancedSettings } from '../components/AdvancedSettings';
import RelaySettingsBuilder from '../lib/relay-settings-builder';
import { log } from '../lib/platform';
diff --git a/app/containers/ConnectPage.js b/app/containers/ConnectPage.js
index 7966a2fa04..6f906f1c82 100644
--- a/app/containers/ConnectPage.js
+++ b/app/containers/ConnectPage.js
@@ -2,7 +2,7 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push as pushHistory } from 'react-router-redux';
+import { push as pushHistory } from 'connected-react-router';
import { links } from '../config';
import Connect from '../components/Connect';
import connectActions from '../redux/connection/actions';
diff --git a/app/containers/LoginPage.js b/app/containers/LoginPage.js
index 248c30ec1b..74823f3925 100644
--- a/app/containers/LoginPage.js
+++ b/app/containers/LoginPage.js
@@ -2,7 +2,7 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import Login from '../components/Login';
import accountActions from '../redux/account/actions';
import { links } from '../config';
diff --git a/app/containers/PreferencesPage.js b/app/containers/PreferencesPage.js
index e11655f3a4..8534a70d74 100644
--- a/app/containers/PreferencesPage.js
+++ b/app/containers/PreferencesPage.js
@@ -2,7 +2,7 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import Preferences from '../components/Preferences';
import { log, getOpenAtLogin, setOpenAtLogin } from '../lib/platform';
diff --git a/app/containers/SelectLocationPage.js b/app/containers/SelectLocationPage.js
index affe04dfc0..6307e9421b 100644
--- a/app/containers/SelectLocationPage.js
+++ b/app/containers/SelectLocationPage.js
@@ -2,7 +2,7 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import SelectLocation from '../components/SelectLocation';
import RelaySettingsBuilder from '../lib/relay-settings-builder';
import { log } from '../lib/platform';
diff --git a/app/containers/SettingsPage.js b/app/containers/SettingsPage.js
index 2c68fea676..8ffd0691fd 100644
--- a/app/containers/SettingsPage.js
+++ b/app/containers/SettingsPage.js
@@ -2,7 +2,7 @@
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import Settings from '../components/Settings';
import { links } from '../config';
import { getAppVersion, openLink, exit } from '../lib/platform';
diff --git a/app/containers/SupportPage.js b/app/containers/SupportPage.js
index c80e9508de..ffab2d2095 100644
--- a/app/containers/SupportPage.js
+++ b/app/containers/SupportPage.js
@@ -1,7 +1,7 @@
// @flow
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
-import { push } from 'react-router-redux';
+import { push } from 'connected-react-router';
import Support from '../components/Support';
import { openItem } from '../lib/platform';
import { collectProblemReport, sendProblemReport } from '../lib/problem-report';
diff --git a/app/redux/store.js b/app/redux/store.js
index 0070248099..87133c8461 100644
--- a/app/redux/store.js
+++ b/app/redux/store.js
@@ -1,6 +1,6 @@
// @flow
import { createStore, applyMiddleware, combineReducers, compose } from 'redux';
-import { routerMiddleware, routerReducer, push, replace } from 'react-router-redux';
+import { routerMiddleware, connectRouter, push, replace } from 'connected-react-router';
import thunk from 'redux-thunk';
import account from './account/reducers';
@@ -57,7 +57,6 @@ export default function configureStore(
connection,
settings,
support,
- router: routerReducer,
};
const middlewares = [thunk, router];
@@ -72,8 +71,10 @@ export default function configureStore(
const enhancer = composeEnhancers(applyMiddleware(...middlewares));
const rootReducer = combineReducers(reducers);
+ const rootReducerWithRouter = connectRouter(routerHistory)(rootReducer);
if (initialState) {
- return createStore(rootReducer, initialState, enhancer);
+ return createStore(rootReducerWithRouter, initialState, enhancer);
+ } else {
+ return createStore(rootReducerWithRouter, enhancer);
}
- return createStore(rootReducer, enhancer);
}
diff --git a/package.json b/package.json
index 442078931c..084a96b0ca 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
"dependencies": {
"babel-runtime": "^6.22.0",
"chai-as-promised": "^7.1.1",
+ "connected-react-router": "^4.3.0",
"d3-geo-projection": "^2.3.2",
"electron-log": "^2.2.8",
"eslint-plugin-promise": "^3.8.0",
@@ -25,13 +26,12 @@
"react-dom": "^16.0.0",
"react-native": "^0.53.3",
"react-native-windows": "^0.51.0-rc.1",
- "react-redux": "^5.0.2",
- "react-router": "^4.2.0",
- "react-router-redux": "^5.0.0-alpha.9",
+ "react-redux": "^5.0.7",
+ "react-router": "^4.3.1",
"react-simple-maps": "^0.10.1",
"reactxp": "^1.3.0",
- "redux": "^3.0.0",
- "redux-thunk": "^2.2.0",
+ "redux": "^4.0.0",
+ "redux-thunk": "^2.3.0",
"uuid": "^3.0.1",
"validated": "^1.3.0"
},
diff --git a/yarn.lock b/yarn.lock
index 7cc9f9cbcc..6e29ef5472 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1985,6 +1985,13 @@ connect@^3.6.5:
parseurl "~1.3.2"
utils-merge "1.0.1"
+connected-react-router@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-4.3.0.tgz#a3bcba9e82ec5ee9f2018daeeddca827a7ef6235"
+ dependencies:
+ immutable "^3.8.1"
+ react-router "^4.2.0"
+
console-control-strings@^1.0.0, console-control-strings@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -3977,10 +3984,14 @@ hoek@4.x.x:
version "4.2.1"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb"
-hoist-non-react-statics@^2.2.1, hoist-non-react-statics@^2.3.0:
+hoist-non-react-statics@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.3.1.tgz#343db84c6018c650778898240135a1420ee22ce0"
+hoist-non-react-statics@^2.5.0:
+ version "2.5.5"
+ resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
+
home-or-tmp@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
@@ -4107,7 +4118,7 @@ image-size@^0.6.0:
version "0.6.2"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.2.tgz#8ee316d4298b028b965091b673d5f1537adee5b4"
-immutable@3.8.2, immutable@^3.7.6:
+immutable@3.8.2, immutable@^3.7.6, immutable@^3.8.1:
version "3.8.2"
resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
@@ -4220,7 +4231,7 @@ invariant@^2.2.0:
dependencies:
loose-envify "^1.0.0"
-invariant@^2.2.2:
+invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
dependencies:
@@ -4786,9 +4797,9 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"
-lodash-es@^4.2.0, lodash-es@^4.2.1:
- version "4.17.4"
- resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.4.tgz#dcc1d7552e150a0640073ba9cb31d70f032950e7"
+lodash-es@^4.17.5:
+ version "4.17.10"
+ resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
lodash._basecopy@^3.0.0:
version "3.0.1"
@@ -4901,7 +4912,7 @@ lodash.templatesettings@^3.0.0:
lodash._reinterpolate "^3.0.0"
lodash.escape "^3.0.0"
-lodash@4.17.10, lodash@^4.17.10, lodash@^4.17.4:
+lodash@4.17.10, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5:
version "4.17.10"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
@@ -4913,7 +4924,7 @@ lodash@^4.11.1, lodash@^4.17.2, lodash@^4.2.0:
version "4.17.5"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
-lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.6.1:
+lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.6, lodash@^4.3.0, lodash@^4.6.1:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -6050,7 +6061,7 @@ prop-types@15.6.2:
loose-envify "^1.3.1"
object-assign "^4.1.1"
-prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
+prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0:
version "15.6.0"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
dependencies:
@@ -6293,24 +6304,16 @@ react-reconciler@^0.7.0:
object-assign "^4.1.1"
prop-types "^15.6.0"
-react-redux@^5.0.2:
- version "5.0.6"
- resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946"
+react-redux@^5.0.7:
+ version "5.0.7"
+ resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
dependencies:
- hoist-non-react-statics "^2.2.1"
+ hoist-non-react-statics "^2.5.0"
invariant "^2.0.0"
- lodash "^4.2.0"
- lodash-es "^4.2.0"
+ lodash "^4.17.5"
+ lodash-es "^4.17.5"
loose-envify "^1.1.0"
- prop-types "^15.5.10"
-
-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"
- dependencies:
- history "^4.7.2"
prop-types "^15.6.0"
- react-router "^4.2.0"
react-router@^4.2.0:
version "4.2.0"
@@ -6324,6 +6327,18 @@ react-router@^4.2.0:
prop-types "^15.5.4"
warning "^3.0.0"
+react-router@^4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e"
+ dependencies:
+ history "^4.7.2"
+ hoist-non-react-statics "^2.5.0"
+ invariant "^2.2.4"
+ loose-envify "^1.3.1"
+ path-to-regexp "^1.7.0"
+ prop-types "^15.6.1"
+ warning "^4.0.1"
+
react-simple-maps@^0.10.1:
version "0.10.3"
resolved "https://registry.yarnpkg.com/react-simple-maps/-/react-simple-maps-0.10.3.tgz#1c1ef4d94f494c6e598dd6c5db8f1be175110faa"
@@ -6547,18 +6562,16 @@ redent@^1.0.0:
indent-string "^2.1.0"
strip-indent "^1.0.1"
-redux-thunk@^2.2.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
+redux-thunk@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
-redux@^3.0.0:
- version "3.7.2"
- resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
+redux@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03"
dependencies:
- lodash "^4.2.1"
- lodash-es "^4.2.1"
loose-envify "^1.1.0"
- symbol-observable "^1.0.3"
+ symbol-observable "^1.2.0"
regenerate@^1.2.1:
version "1.3.3"
@@ -7435,9 +7448,9 @@ supports-color@^5.3.0:
dependencies:
has-flag "^3.0.0"
-symbol-observable@^1.0.3:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
+symbol-observable@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
sync-exec@~0.6.x:
version "0.6.2"
@@ -8019,6 +8032,12 @@ warning@^3.0.0:
dependencies:
loose-envify "^1.0.0"
+warning@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.1.tgz#66ce376b7fbfe8a887c22bdf0e7349d73d397745"
+ dependencies:
+ loose-envify "^1.0.0"
+
watch@~0.18.0:
version "0.18.0"
resolved "https://registry.yarnpkg.com/watch/-/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.