Skip to content

Commit d4bf7b1

Browse files
committed
Upgraded react-router version
1 parent d771468 commit d4bf7b1

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"react-gravatar": "^2.3.0",
2626
"react-page-click": "^2.0.0",
2727
"react-redux": "^4.1.1",
28-
"react-router": "^1.0.3",
28+
"react-router": "^2.0.0-rc5",
2929
"react-router-redux": "^2.1.0",
3030
"redux": "^3.1.2",
3131
"redux-logger": "^2.4.0",

web/static/js/app.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import createBrowserHistory from 'history/lib/createBrowserHistory';
3+
import { browserHistory } from 'react-router';
44
import configureStore from './store';
55
import Root from './containers/root';
66

7-
const history = createBrowserHistory();
8-
const store = configureStore(history);
7+
const store = configureStore(browserHistory);
98

109
const target = document.getElementById('main_container');
11-
const node = <Root routerHistory={history} store={store}/>;
10+
const node = <Root routerHistory={browserHistory} store={store}/>;
1211

1312
ReactDOM.render(node, target);

0 commit comments

Comments
 (0)