summaryrefslogtreecommitdiff
path: root/src/main/js
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/js')
-rw-r--r--src/main/js/package.json2
-rw-r--r--src/main/js/src/index.js10
-rw-r--r--src/main/js/yarn.lock48
3 files changed, 20 insertions, 40 deletions
diff --git a/src/main/js/package.json b/src/main/js/package.json
index a387782c..63191cf0 100644
--- a/src/main/js/package.json
+++ b/src/main/js/package.json
@@ -11,7 +11,7 @@
"react": "^15.4.1",
"react-dom": "^15.4.1",
"react-redux": "^5.0.1",
- "react-router": "4.0.0-alpha.6",
+ "react-router": "^3.0.0",
"rebass": "^0.3.3",
"redux": "^3.6.0",
"redux-saga": "^0.13.0",
diff --git a/src/main/js/src/index.js b/src/main/js/src/index.js
index 6c6043f0..d2ffe1c6 100644
--- a/src/main/js/src/index.js
+++ b/src/main/js/src/index.js
@@ -2,7 +2,7 @@ import 'babel-polyfill'
import React from 'react'
import ReactDOM from 'react-dom'
-import { BrowserRouter, Match, Miss } from 'react-router'
+import { Router, browserHistory, Route } from 'react-router'
import { Provider } from 'react-redux'
import configureStore from './store'
@@ -15,12 +15,12 @@ import Error404 from './components/errors/Error404'
ReactDOM.render(
<Provider store={store}>
- <BrowserRouter>
+ <Router history={browserHistory}>
<div className="app">
- <Match exactly pattern="/" component={App}/>
- <Miss component={Error404}/>
+ <Route path="/" component={App}/>
+ <Route path="*" component={Error404}/>
</div>
- </BrowserRouter>
+ </Router>
</Provider>,
document.getElementById('root')
);
diff --git a/src/main/js/yarn.lock b/src/main/js/yarn.lock
index 596aefc0..5d7c02d2 100644
--- a/src/main/js/yarn.lock
+++ b/src/main/js/yarn.lock
@@ -2371,21 +2371,20 @@ he@1.1.x:
version "1.1.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.0.tgz#29319d49beec13a9b1f3c4f9b2a6dde4859bb2a7"
-history@^4.3.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/history/-/history-4.5.0.tgz#7313388109333bf5796fff7407cee1850e8c5061"
+history@^3.0.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/history/-/history-3.2.1.tgz#71c7497f4e6090363d19a6713bb52a1bfcdd99aa"
dependencies:
invariant "^2.2.1"
loose-envify "^1.2.0"
- resolve-pathname "^2.0.0"
- value-equal "^0.2.0"
+ query-string "^4.2.2"
warning "^3.0.0"
hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-hoist-non-react-statics@^1.0.3:
+hoist-non-react-statics@^1.0.3, hoist-non-react-statics@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz#aa448cf0986d55cc40773b17174b7dd066cb7cfb"
@@ -3762,12 +3761,6 @@ path-to-regexp@0.1.7:
version "0.1.7"
resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-path-to-regexp@^1.5.3:
- version "1.7.0"
- resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
- dependencies:
- isarray "0.0.1"
-
path-type@^1.0.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4157,7 +4150,7 @@ qs@~6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
-query-string@4.2.3, query-string@^4.1.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"
dependencies:
@@ -4200,12 +4193,6 @@ react-addons-pure-render-mixin@^15.3.1:
version "15.4.1"
resolved "https://registry.yarnpkg.com/react-addons-pure-render-mixin/-/react-addons-pure-render-mixin-15.4.1.tgz#8a1f48f9fd3f24ed12af63c4d2dc0c7529fa7e02"
-react-broadcast@^0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/react-broadcast/-/react-broadcast-0.1.2.tgz#950de63578a2af399a396067a617af7402182330"
- dependencies:
- invariant "^2.2.1"
-
react-dev-utils@^0.4.1:
version "0.4.1"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.4.1.tgz#06385e3c15014d4dfa0a6134bfeeeb0700cc04dd"
@@ -4236,14 +4223,15 @@ react-redux:
lodash-es "^4.2.0"
loose-envify "^1.1.0"
-react-router@4.0.0-alpha.6:
- version "4.0.0-alpha.6"
- resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.0.0-alpha.6.tgz#239fcf9a6ba7997021022c9b51d72d370f7b6bf4"
+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 "^4.3.0"
- path-to-regexp "^1.5.3"
- query-string "4.2.3"
- react-broadcast "^0.1.2"
+ history "^3.0.0"
+ hoist-non-react-statics "^1.2.0"
+ invariant "^2.2.1"
+ loose-envify "^1.2.0"
+ warning "^3.0.0"
react-scripts@0.8.3:
version "0.8.3"
@@ -4546,10 +4534,6 @@ 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.7, resolve@1.1.x, resolve@^1.1.6:
version "1.1.7"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
@@ -5158,10 +5142,6 @@ validate-npm-package-license@^3.0.1:
spdx-correct "~1.0.0"
spdx-expression-parse "~1.0.0"
-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"
bgstack15