Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Depsy] Upgrade dependencies #29

Merged
merged 21 commits into from
Oct 15, 2015
Merged

[Depsy] Upgrade dependencies #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
7da5cca
Upgrade dependency react-redux to 3.1.0
Oct 14, 2015
d73fedf
Upgrade dependency classnames to 2.1.5
Oct 14, 2015
4291823
Upgrade dependency style-loader to 0.12.4
Oct 14, 2015
00d7bfe
Upgrade dependency redux to 3.0.2
Oct 14, 2015
4fd2881
Upgrade dependency css-loader to 0.19.0
Oct 14, 2015
36d5648
Upgrade dependency superagent to 1.4.0
Oct 14, 2015
ac38ef6
Upgrade dependency react-router to 1.0.0-rc3
Oct 14, 2015
d352373
Upgrade dependency react-hot-loader to 2.0.0-alpha-4
Oct 14, 2015
d8c1fcf
Upgrade dependency postcss-nested to 1.0.0
Oct 14, 2015
00b7234
Upgrade dependency stylus-loader to 1.4.0
Oct 14, 2015
4bf0b64
Upgrade dependency history to 1.12.5
Oct 14, 2015
30e142b
Upgrade dependency redux-logger to 2.0.3
Oct 14, 2015
a8667f8
Upgrade dependency stylus to 0.52.4
Oct 14, 2015
ec97f4b
Upgrade dependency redux-form to ^2.2.5
Oct 14, 2015
138ba15
Upgrade dependency redux-thunk to 1.0.0
Oct 14, 2015
f17f058
Upgrade dependency babel-core to 5.8.25
Oct 14, 2015
bc6c9cd
Upgrade dependency babel-eslint to 4.1.3
Oct 14, 2015
315e539
Upgrade dependency webpack-dev-server to 1.12.0
Oct 14, 2015
13033c4
Upgrade dependency webpack to 1.12.2
Oct 14, 2015
01ef625
Upgrade dependencies
Oct 15, 2015
62ae4cb
Use browserHistory
Oct 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"dependencies": {
"animate.css": "3.4.0",
"camelize": "1.0.0",
"classnames": "2.1.3",
"css-loader": "0.16.0",
"classnames": "2.1.5",
"css-loader": "0.19.0",
"cssnext-loader": "1.0.1",
"file-loader": "0.8.4",
"history": "1.9.1",
"history": "1.12.5",
"jwt-decode": "1.4.0",
"lodash": "3.10.1",
"moment": "2.10.6",
Expand All @@ -32,32 +32,30 @@
"react": "0.14.0",
"react-addons-css-transition-group": "0.14.0",
"react-dom": "0.14.0",
"react-hot-loader": "2.0.0-alpha-2",
"react-hot-loader": "2.0.0-alpha-4",
"react-overlays": "0.5.0",
"react-redux": "2.1.2",
"react-router": "1.0.0-rc1",
"redux": "3.0.0",
"redux-form": "^1.5.3",
"redux-logger": "1.0.6",
"react-redux": "4.0.0",
"react-router": "1.0.0-rc3",
"redux": "3.0.2",
"redux-form": "2.3.1",
"redux-logger": "2.0.4",
"redux-react-router": "1.0.0-beta3",
"redux-thunk": "0.1.0",
"style-loader": "0.12.3",
"stylus": "0.52.0",
"stylus-loader": "1.2.1",
"superagent": "1.3.0",
"redux-thunk": "1.0.0",
"style-loader": "0.12.4",
"superagent": "1.4.0",
"url-loader": "0.5.6"
},
"devDependencies": {
"babel": "5.8.23",
"babel-core": "5.8.22",
"babel-eslint": "4.1.1",
"babel-core": "5.8.25",
"babel-eslint": "4.1.3",
"babel-loader": "5.3.2",
"eslint": "1.6.0",
"eslint-config-airbnb": "0.1.0",
"eslint-config-webkom": "*",
"eslint-plugin-react": "3.5.1",
"object-assign": "4.0.1",
"webpack": "1.12.0",
"webpack-dev-server": "1.10.1"
"webpack": "1.12.2",
"webpack-dev-server": "1.12.0"
}
}
7 changes: 2 additions & 5 deletions src/util/configureStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { compose, createStore, applyMiddleware, combineReducers } from 'redux';
import thunkMiddleware from 'redux-thunk';
import createLogger from 'redux-logger';
import createHashHistory from 'history/lib/createHashHistory';
import { createHistory } from 'history';
import { reduxReactRouter, routerStateReducer } from 'redux-react-router';
import routes from '../routes';
import * as reducers from '../reducers';
Expand All @@ -20,10 +20,7 @@ const middlewares = applyMiddleware(

const finalCreateStore = compose(
middlewares,
reduxReactRouter({
routes,
createHistory: createHashHistory
})
reduxReactRouter({ routes, createHistory })
)(createStore);

const reducer = combineReducers({
Expand Down