Merge branch 'update-react-router' of https://github.com/netpoetica/r…

…eact-redux-starter-kit into netpoetica-update-react-router
dvdzkwsk · Feb 12, 2016 · 3b57c1c · 3b57c1c
2 parents 129e542 + 6bbb4b0
commit 3b57c1c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "react": "^0.14.0",
     "react-dom": "^0.14.0",
     "react-redux": "^4.0.0",
-    "react-router": "^2.0.0-rc5",
+    "react-router": "^2.0.0",
     "react-router-redux": "^3.0.0",
     "redux": "^3.0.0",
     "redux-thunk": "^1.0.0",

diff --git a/src/main.js b/src/main.js
@@ -1,21 +1,17 @@
 import React from 'react'
 import ReactDOM from 'react-dom'
-import { useRouterHistory } from 'react-router'
-import { createHistory } from 'history'
+import { browserHistory } from 'react-router'
 import makeRoutes from './routes'
 import Root from './containers/Root'
 import configureStore from './redux/configureStore'
 
-const historyConfig = { basename: __BASENAME__ }
-const history = useRouterHistory(createHistory)(historyConfig)
-
 const initialState = window.__INITIAL_STATE__
 const store = configureStore({ initialState, history })
 
 const routes = makeRoutes(store)
 
 // Render the React application to the DOM
 ReactDOM.render(
-  <Root history={history} routes={routes} store={store} />,
+  <Root history={browserHistory} routes={routes} store={store} />,
   document.getElementById('root')
 )