Merge pull request react-boilerplate#118 from jbinto/react-router-redux

Update to react-router-redux
grengojbo · Jan 25, 2016 · af66975 · af66975
2 parents 0951e7f + 54630df
commit af66975
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/app/app.js b/app/app.js
@@ -20,7 +20,7 @@ import { createStore, applyMiddleware } from 'redux';
 import thunk from 'redux-thunk';
 import FontFaceObserver from 'fontfaceobserver';
 import { browserHistory } from 'react-router';
-import { syncHistory } from 'redux-simple-router';
+import { syncHistory } from 'react-router-redux';
 const reduxRouterMiddleware = syncHistory(browserHistory);
 
 // Observer loading of Open Sans (to remove open sans, remove the <link> tag in

diff --git a/app/containers/HomePage/index.js b/app/containers/HomePage/index.js
@@ -6,7 +6,7 @@
 import { asyncChangeProjectName, asyncChangeOwnerName } from './actions';
 import React from 'react';
 import { connect } from 'react-redux';
-import { routeActions } from 'redux-simple-router';
+import { routeActions } from 'react-router-redux';
 import Button from 'Button';
 import Anchor from 'Anchor';
 import H1 from 'Heading1';

diff --git a/app/containers/NotFoundPage/index.js b/app/containers/NotFoundPage/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { routeActions } from 'redux-simple-router';
+import { routeActions } from 'react-router-redux';
 
 import Button from 'Button';
 

diff --git a/app/containers/ReadmePage/index.js b/app/containers/ReadmePage/index.js
@@ -6,7 +6,7 @@
 
 import React from 'react';
 import { connect } from 'react-redux';
-import { routeActions } from 'redux-simple-router';
+import { routeActions } from 'react-router-redux';
 import Button from 'Button';
 import H2 from 'Heading2';
 

diff --git a/app/rootReducer.js b/app/rootReducer.js
@@ -4,7 +4,7 @@
  */
 
 import { combineReducers } from 'redux';
-import { routeReducer } from 'redux-simple-router';
+import { routeReducer } from 'react-router-redux';
 import homeReducer from 'HomePage/reducer';
 
 export default combineReducers({

diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "react-redux": "^4.0.6",
     "react-router": "^2.0.0-rc5",
     "redux": "^3.0.5",
-    "redux-simple-router": "^2.0.4",
     "redux-thunk": "^1.0.3",
     "sanitize.css": "^3.0.0"
   },
@@ -52,6 +51,7 @@
     "postcss-reporter": "^1.3.0",
     "psi": "^2.0.2",
     "react-addons-test-utils": "^0.14.6",
+    "react-router-redux": "^2.1.0",
     "react-transform-hmr": "^1.0.1",
     "rewire": "^2.5.1",
     "style-loader": "^0.13.0",