Merge pull request #192 from mamute/update-to-react-router-2.0.0

Update to react-router 2.0.0rc4

Author: justin808

client/app/bundles/comments/startup/ClientRouterApp.jsx

@@ -1,18 +1,17 @@
 import React from 'react';
 import { Provider } from 'react-redux';
 import Router from 'react-router';
-import createHistory from 'history/lib/createBrowserHistory';
+import { browserHistory } from 'react-router';
 
 import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
 
 export default (props, location) => {
   const store = createStore(props);
-  const history = createHistory();
 
   return (
     <Provider store={store}>
-      <Router history={history} children={routes} />
+      <Router history={browserHistory} children={routes} />
     </Provider>
   );
 };

client/app/bundles/comments/startup/ServerRouterApp.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { match, RoutingContext } from 'react-router';
+import { match, RouterContext } from 'react-router';
 
 import createStore from '../store/commentsStore';
 import routes from '../routes/routes';
@@ -29,7 +29,7 @@ export default (props, location) => {
   // Important that you don't do this if you are redirecting or have an error.
   return (
     <Provider store={store}>
-      <RoutingContext {...routeProps} />
+      <RouterContext {...routeProps} />
     </Provider>
   );
 };

client/npm-shrinkwrap.json

@@ -70,7 +70,7 @@
     "react-bootstrap": "^0.28.1",
     "react-dom": "^0.14.3",
     "react-redux": "^4.0.0",
-    "react-router": "^1.0.2",
+    "react-router": "^2.0.0-rc4",
     "redux": "^3.0.4",
     "redux-promise": "^0.5.0",
     "redux-thunk": "^1.0.0",