diff --git a/frontend/src/metabase/lib/redux.js b/frontend/src/metabase/lib/redux.js
index 5ef82fd9b2cb82276bbc5cbb9d73a25eebec8948..929c87aa65422c6169b0105bc63c3912834f1238 100644
--- a/frontend/src/metabase/lib/redux.js
+++ b/frontend/src/metabase/lib/redux.js
@@ -7,7 +7,7 @@ import promise from 'redux-promise';
import thunk from "redux-thunk";
import createLogger from "redux-logger";
-import { createHistory } from 'history';
+import createHistory from "history/createBrowserHistory";
import { reduxReactRouter } from 'redux-router';
diff --git a/package.json b/package.json
index ce4457a4444235b3f51b7d5fd66853b26824ef3d..1654c010916615d02ccb6a8f1f07f49535a6385c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"d3": "^3.5.17",
"dc": "^2.0.0-beta.32",
"diff": "^2.2.1",
- "history": "^3.0.0",
+ "history": "^4.5.0",
"humanize-plus": "^1.8.1",
"icepick": "^1.1.0",
"inflection": "^1.7.1",
@@ -44,7 +44,7 @@
"react-redux": "^5.0.1",
"react-resizable": "^1.0.1",
"react-retina-image": "^2.0.0",
- "react-router": "^2.6.0",
+ "react-router": "^3.0.0",
"react-router-redux": "^4.0.5",
"react-sortable": "^1.2.0",
"react-virtualized": "^8.6.0",
diff --git a/yarn.lock b/yarn.lock
index 976e2682ccbd6b49aeca741c0fd0d310f7c152d8..5d5030b4fec539f02428af916a89fe6c897bb091 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2192,7 +2192,7 @@ deep-diff@0.3.4:
version "0.3.4"
resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.4.tgz#aac5c39952236abe5f037a2349060ba01b00ae48"
-deep-equal@^1.0.0, deep-equal@^1.0.1:
+deep-equal@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -3235,15 +3235,6 @@ he@1.1.x:
version "1.1.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7"
-history@^2.1.2:
- version "2.1.2"
- resolved "https://registry.yarnpkg.com/history/-/history-2.1.2.tgz#4aa2de897a0e4867e4539843be6ecdb2986bfdec"
- dependencies:
- deep-equal "^1.0.0"
- invariant "^2.0.0"
- query-string "^3.0.0"
- warning "^2.0.0"
-
history@^3.0.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/history/-/history-3.2.1.tgz#71c7497f4e6090363d19a6713bb52a1bfcdd99aa"
@@ -3253,6 +3244,16 @@ history@^3.0.0:
query-string "^4.2.2"
warning "^3.0.0"
+history@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/history/-/history-4.5.0.tgz#7313388109333bf5796fff7407cee1850e8c5061"
+ dependencies:
+ invariant "^2.2.1"
+ loose-envify "^1.2.0"
+ resolve-pathname "^2.0.0"
+ value-equal "^0.2.0"
+ warning "^3.0.0"
+
hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -5375,12 +5376,6 @@ qs@^6.1.0, qs@^6.2.0, qs@~6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-query-string@^3.0.0:
- version "3.0.3"
- resolved "https://registry.yarnpkg.com/query-string/-/query-string-3.0.3.tgz#ae2e14b4d05071d4e9b9eb4873c35b0dcd42e638"
- dependencies:
- strict-uri-encode "^1.0.0"
-
query-string@^4.1.0, query-string@^4.2.2:
version "4.2.3"
resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.2.3.tgz#9f27273d207a25a8ee4c7b8c74dcd45d556db822"
@@ -5591,11 +5586,11 @@ react-router-redux@^4.0.5:
version "4.0.7"
resolved "https://registry.yarnpkg.com/react-router-redux/-/react-router-redux-4.0.7.tgz#9b1fde4e70106c50f47214e12bdd888cfb96e2a6"
-react-router@^2.6.0:
- version "2.8.1"
- resolved "https://registry.yarnpkg.com/react-router/-/react-router-2.8.1.tgz#73e9491f6ceb316d0f779829081863e378ee4ed7"
+react-router@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/react-router/-/react-router-3.0.0.tgz#3f313e4dbaf57048c48dd0a8c3cac24d93667dff"
dependencies:
- history "^2.1.2"
+ history "^3.0.0"
hoist-non-react-statics "^1.2.0"
invariant "^2.2.1"
loose-envify "^1.2.0"
@@ -5919,6 +5914,10 @@ resolve-from@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+resolve-pathname@^2.0.0:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-2.0.2.tgz#e55c016eb2e9df1de98e85002282bfb38c630436"
+
resolve@^1.1.6, resolve@^1.1.7:
version "1.2.0"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
@@ -6722,6 +6721,10 @@ v8flags@^2.0.10:
dependencies:
user-home "^1.1.1"
+value-equal@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-0.2.0.tgz#4f41c60a3fc011139a2ec3d3340a8998ae8b69c0"
+
vary@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140"
@@ -6750,12 +6753,6 @@ void-elements@^2.0.0:
version "2.0.1"
resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-warning@^2.0.0:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/warning/-/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901"
- dependencies:
- loose-envify "^1.0.0"
-
warning@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"