From 7da5cca1b4a632ca46947b96131e6fda7051249b Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:13 +0000 Subject: [PATCH 01/21] Upgrade dependency react-redux to 3.1.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fec4164d8e..c902a00bb8 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "react-dom": "0.14.0", "react-hot-loader": "2.0.0-alpha-2", "react-overlays": "0.5.0", - "react-redux": "2.1.2", + "react-redux": "3.1.0", "react-router": "1.0.0-rc1", "redux": "3.0.0", "redux-form": "^1.5.3", From d73fedf0a091e4d3a90a708569e21833d3dda5d0 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:13 +0000 Subject: [PATCH 02/21] Upgrade dependency classnames to 2.1.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c902a00bb8..9f1394edd6 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "dependencies": { "animate.css": "3.4.0", "camelize": "1.0.0", - "classnames": "2.1.3", + "classnames": "2.1.5", "css-loader": "0.16.0", "cssnext-loader": "1.0.1", "file-loader": "0.8.4", From 429182341bbaf98bc0a615d1e3af4d56da3c21d1 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:14 +0000 Subject: [PATCH 03/21] Upgrade dependency style-loader to 0.12.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9f1394edd6..8a8e5c7d5c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "redux-logger": "1.0.6", "redux-react-router": "1.0.0-beta3", "redux-thunk": "0.1.0", - "style-loader": "0.12.3", + "style-loader": "0.12.4", "stylus": "0.52.0", "stylus-loader": "1.2.1", "superagent": "1.3.0", From 00d7bfe6b364ee44ca4c43891e768ddcc42f9fb1 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:15 +0000 Subject: [PATCH 04/21] Upgrade dependency redux to 3.0.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a8e5c7d5c..de0d334786 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "react-overlays": "0.5.0", "react-redux": "3.1.0", "react-router": "1.0.0-rc1", - "redux": "3.0.0", + "redux": "3.0.2", "redux-form": "^1.5.3", "redux-logger": "1.0.6", "redux-react-router": "1.0.0-beta3", From 4fd28818f73d3451f6e6c17fd223ef3214094bb2 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:16 +0000 Subject: [PATCH 05/21] Upgrade dependency css-loader to 0.19.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de0d334786..35e6cb9423 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "animate.css": "3.4.0", "camelize": "1.0.0", "classnames": "2.1.5", - "css-loader": "0.16.0", + "css-loader": "0.19.0", "cssnext-loader": "1.0.1", "file-loader": "0.8.4", "history": "1.9.1", From 36d5648d073783763f527fef579d8aafd55297fb Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:16 +0000 Subject: [PATCH 06/21] Upgrade dependency superagent to 1.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 35e6cb9423..fc4e408df5 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "style-loader": "0.12.4", "stylus": "0.52.0", "stylus-loader": "1.2.1", - "superagent": "1.3.0", + "superagent": "1.4.0", "url-loader": "0.5.6" }, "devDependencies": { From ac38ef632288e43746527756970e7c1209affdc2 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:17 +0000 Subject: [PATCH 07/21] Upgrade dependency react-router to 1.0.0-rc3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fc4e408df5..070d94fd35 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "react-hot-loader": "2.0.0-alpha-2", "react-overlays": "0.5.0", "react-redux": "3.1.0", - "react-router": "1.0.0-rc1", + "react-router": "1.0.0-rc3", "redux": "3.0.2", "redux-form": "^1.5.3", "redux-logger": "1.0.6", From d3523737ed851bfb326139735f0e5043a2911007 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:18 +0000 Subject: [PATCH 08/21] Upgrade dependency react-hot-loader to 2.0.0-alpha-4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 070d94fd35..c11d16b72e 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "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": "3.1.0", "react-router": "1.0.0-rc3", From d8c1fcf596e790cf68daa2a00d8e8143e5cc0331 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:18 +0000 Subject: [PATCH 09/21] Upgrade dependency postcss-nested to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c11d16b72e..6841e2a9d9 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "moment": "2.10.6", "nib": "1.1.0", "normalize.css": "3.0.3", - "postcss-nested": "0.3.1", + "postcss-nested": "1.0.0", "react": "0.14.0", "react-addons-css-transition-group": "0.14.0", "react-dom": "0.14.0", From 00b72346ef281d84d0fa79f6e4014ad3faa3e90a Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:19 +0000 Subject: [PATCH 10/21] Upgrade dependency stylus-loader to 1.4.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6841e2a9d9..2515ea3754 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "redux-thunk": "0.1.0", "style-loader": "0.12.4", "stylus": "0.52.0", - "stylus-loader": "1.2.1", + "stylus-loader": "1.4.0", "superagent": "1.4.0", "url-loader": "0.5.6" }, From 4bf0b64e8fb00a3b016c69e4feebf7e2015048fe Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:20 +0000 Subject: [PATCH 11/21] Upgrade dependency history to 1.12.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2515ea3754..3a107f06e5 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "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", From 30e142b0684091577a592e9bf4fbe40d51121cea Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:21 +0000 Subject: [PATCH 12/21] Upgrade dependency redux-logger to 2.0.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3a107f06e5..3504b36900 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "react-router": "1.0.0-rc3", "redux": "3.0.2", "redux-form": "^1.5.3", - "redux-logger": "1.0.6", + "redux-logger": "2.0.3", "redux-react-router": "1.0.0-beta3", "redux-thunk": "0.1.0", "style-loader": "0.12.4", From a8667f8ea785c56c28dbfd0373fca541cb1ec590 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:21 +0000 Subject: [PATCH 13/21] Upgrade dependency stylus to 0.52.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3504b36900..b8ab7e2452 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "redux-react-router": "1.0.0-beta3", "redux-thunk": "0.1.0", "style-loader": "0.12.4", - "stylus": "0.52.0", + "stylus": "0.52.4", "stylus-loader": "1.4.0", "superagent": "1.4.0", "url-loader": "0.5.6" From ec97f4b4edfcb11834e996351cf9a2bf320cb7ba Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:22 +0000 Subject: [PATCH 14/21] Upgrade dependency redux-form to ^2.2.5 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b8ab7e2452..3bbe434c45 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "react-redux": "3.1.0", "react-router": "1.0.0-rc3", "redux": "3.0.2", - "redux-form": "^1.5.3", + "redux-form": "^2.2.5", "redux-logger": "2.0.3", "redux-react-router": "1.0.0-beta3", "redux-thunk": "0.1.0", From 138ba15aa8e4e38bd59216552f2d60de3793b698 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:23 +0000 Subject: [PATCH 15/21] Upgrade dependency redux-thunk to 1.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3bbe434c45..175a6451f7 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "redux-form": "^2.2.5", "redux-logger": "2.0.3", "redux-react-router": "1.0.0-beta3", - "redux-thunk": "0.1.0", + "redux-thunk": "1.0.0", "style-loader": "0.12.4", "stylus": "0.52.4", "stylus-loader": "1.4.0", From f17f058bcf15e7066b1281090e4258c9062e3ad1 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:23 +0000 Subject: [PATCH 16/21] Upgrade dependency babel-core to 5.8.25 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 175a6451f7..24fceef1d6 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "devDependencies": { "babel": "5.8.23", - "babel-core": "5.8.22", + "babel-core": "5.8.25", "babel-eslint": "4.1.1", "babel-loader": "5.3.2", "eslint": "1.6.0", From bc6c9cd0edb2298e6df4a9c44533ec5d41ffe42a Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:24 +0000 Subject: [PATCH 17/21] Upgrade dependency babel-eslint to 4.1.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 24fceef1d6..528f227232 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "devDependencies": { "babel": "5.8.23", "babel-core": "5.8.25", - "babel-eslint": "4.1.1", + "babel-eslint": "4.1.3", "babel-loader": "5.3.2", "eslint": "1.6.0", "eslint-config-airbnb": "0.1.0", From 315e5391a0a76d1afa2bc2d4cb0b6af0af0454ee Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:25 +0000 Subject: [PATCH 18/21] Upgrade dependency webpack-dev-server to 1.12.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 528f227232..f2a8c26818 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,6 @@ "eslint-plugin-react": "3.5.1", "object-assign": "4.0.1", "webpack": "1.12.0", - "webpack-dev-server": "1.10.1" + "webpack-dev-server": "1.12.0" } } From 13033c419d03d12eb7e4165e47d57a880ef86644 Mon Sep 17 00:00:00 2001 From: Depsy Date: Wed, 14 Oct 2015 12:31:25 +0000 Subject: [PATCH 19/21] Upgrade dependency webpack to 1.12.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f2a8c26818..7c05107907 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "eslint-config-webkom": "*", "eslint-plugin-react": "3.5.1", "object-assign": "4.0.1", - "webpack": "1.12.0", + "webpack": "1.12.2", "webpack-dev-server": "1.12.0" } } From 01ef625f470517982985160f8d6e184de34c07c2 Mon Sep 17 00:00:00 2001 From: ekmartin Date: Thu, 15 Oct 2015 21:35:16 +0200 Subject: [PATCH 20/21] Upgrade dependencies --- package.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7c05107907..6818a33f6b 100644 --- a/package.json +++ b/package.json @@ -28,22 +28,20 @@ "moment": "2.10.6", "nib": "1.1.0", "normalize.css": "3.0.3", - "postcss-nested": "1.0.0", + "postcss-nested": "0.3.1", "react": "0.14.0", "react-addons-css-transition-group": "0.14.0", "react-dom": "0.14.0", "react-hot-loader": "2.0.0-alpha-4", "react-overlays": "0.5.0", - "react-redux": "3.1.0", + "react-redux": "4.0.0", "react-router": "1.0.0-rc3", "redux": "3.0.2", - "redux-form": "^2.2.5", - "redux-logger": "2.0.3", + "redux-form": "2.3.1", + "redux-logger": "2.0.4", "redux-react-router": "1.0.0-beta3", "redux-thunk": "1.0.0", "style-loader": "0.12.4", - "stylus": "0.52.4", - "stylus-loader": "1.4.0", "superagent": "1.4.0", "url-loader": "0.5.6" }, From 62ae4cb3fd0b273f27d2774c4b0dfcf44c34ddae Mon Sep 17 00:00:00 2001 From: ekmartin Date: Thu, 15 Oct 2015 21:35:22 +0200 Subject: [PATCH 21/21] Use browserHistory --- src/util/configureStore.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/util/configureStore.js b/src/util/configureStore.js index 325aa2b7a1..ed04f72c5e 100644 --- a/src/util/configureStore.js +++ b/src/util/configureStore.js @@ -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'; @@ -20,10 +20,7 @@ const middlewares = applyMiddleware( const finalCreateStore = compose( middlewares, - reduxReactRouter({ - routes, - createHistory: createHashHistory - }) + reduxReactRouter({ routes, createHistory }) )(createStore); const reducer = combineReducers({