Skip to content

Commit 97d78cf

Browse files
committed
rolled back last commit which prematurely tried to upgrade to "history" lib
1 parent 9254283 commit 97d78cf

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
"express": "^4.13.0",
6565
"express-session": "^1.11.3",
6666
"file-loader": "^0.8.4",
67-
"history": "^1.8.4",
6867
"http-proxy": "^1.11.1",
6968
"lru-memoize": "0.0.2",
7069
"map-props": "^0.1.1",
@@ -75,7 +74,7 @@
7574
"react-document-meta": "^0.1.4",
7675
"react-inline-css": "1.2.1",
7776
"react-redux": "^2.0.0",
78-
"react-router": "v1.0.0-beta3",
77+
"react-router": "v1.0.0-beta2",
7978
"redux": "^2.0.0",
8079
"redux-form": "^1.2.1",
8180
"serialize-javascript": "^1.0.0",

src/client.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
*/
44
import 'babel/polyfill';
55
import React from 'react';
6-
import createHistory from 'history/lib/createBrowserHistory';
6+
import BrowserHistory from 'react-router/lib/BrowserHistory';
77
import Location from 'react-router/lib/Location';
88
import queryString from 'query-string';
99
import createStore from './redux/create';
1010
import ApiClient from './ApiClient';
1111
import universalRouter from './universalRouter';
12-
const history = createHistory();
12+
const history = new BrowserHistory();
1313
const client = new ApiClient();
1414

1515
const dest = document.getElementById('content');

0 commit comments

Comments
 (0)