Skip to content
This repository has been archived by the owner on Jul 31, 2018. It is now read-only.

Commit

Permalink
Update dependencies and adapted react-redux-router implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefano Cerelli committed Feb 26, 2016
1 parent cf04ed4 commit 1fe546a
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 27 deletions.
4 changes: 3 additions & 1 deletion client/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

import { Router, Route, browserHistory } from 'react-router'
import { syncHistoryWithStore } from 'react-router-redux'
import { Provider } from 'react-redux'
import ReactDOM from 'react-dom'
import React from 'react'
Expand All @@ -8,10 +9,11 @@ import App from './containers/App'
import configure from './store'

const store = configure()
const history = syncHistoryWithStore(browserHistory, store)

ReactDOM.render(
<Provider store={store}>
<Router history={browserHistory}>
<Router history={history}>
<Route path="/" component={App}>
</Route>
</Router>
Expand Down
2 changes: 1 addition & 1 deletion client/reducers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

import { routeReducer as routing } from 'react-router-redux'
import { routerReducer as routing } from 'react-router-redux'
import { combineReducers } from 'redux'
import todos from './todos'

Expand Down
5 changes: 1 addition & 4 deletions client/store/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@

import { createStore, applyMiddleware } from 'redux'
import { syncHistory } from 'react-router-redux'
import { browserHistory } from 'react-router'

import { logger } from '../middleware'
import rootReducer from '../reducers'
Expand All @@ -12,8 +10,7 @@ export default function configure(initialState) {
: createStore

const createStoreWithMiddleware = applyMiddleware(
logger,
syncHistory(browserHistory)
logger
)(create)

const store = createStoreWithMiddleware(rootReducer, initialState)
Expand Down
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
},
"license": "MIT",
"devDependencies": {
"babel-core": "^6.3.26",
"babel-loader": "^6.2.0",
"babel-plugin-transform-runtime": "^6.3.13",
"babel-preset-es2015": "^6.3.13",
"babel-preset-react": "^6.3.13",
"babel-preset-stage-0": "^6.3.13",
"babel-core": "^6.5.2",
"babel-loader": "^6.2.3",
"babel-plugin-transform-runtime": "^6.5.2",
"babel-preset-es2015": "^6.5.0",
"babel-preset-react": "^6.5.0",
"babel-preset-stage-0": "^6.5.0",
"css-loader": "^0.23.1",
"file-loader": "^0.8.4",
"postcss-loader": "^0.8.0",
"file-loader": "^0.8.5",
"postcss-loader": "^0.8.1",
"rucksack-css": "^0.8.5",
"style-loader": "^0.12.4",
"webpack": "^1.12.2",
"webpack-dev-server": "^1.12.0",
"webpack-hot-middleware": "^2.2.0",
"babel-runtime": "^6.3.19",
"classnames": "^2.1.2",
"react": "^0.14.0",
"react-dom": "^0.14.0",
"style-loader": "^0.13.0",
"webpack": "^1.12.14",
"webpack-dev-server": "^1.14.1",
"webpack-hot-middleware": "^2.7.1",
"babel-runtime": "^6.5.0",
"classnames": "^2.2.3",
"react": "^0.14.7",
"react-dom": "^0.14.7",
"react-hot-loader": "^1.3.0",
"react-redux": "^4.0.6",
"react-router": "^2.0.0-rc5",
"react-router-redux": "^2.1.0",
"redux": "^3.0.2",
"redux-actions": "^0.9.0"
"react-redux": "^4.4.0",
"react-router": "^2.0.0",
"react-router-redux": "^4.0.0",
"redux": "^3.3.1",
"redux-actions": "^0.9.1"
}
}

0 comments on commit 1fe546a

Please sign in to comment.