From 3e1444095c06670a6775a519120aa3313fc9c804 Mon Sep 17 00:00:00 2001 From: Phan Thanh Date: Thu, 8 Feb 2018 09:43:45 +0700 Subject: [PATCH 1/5] feat: add react hot loader --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 102a759b94..22ff18b130 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "lodash": "^3.10.1", "react": "^0.14.3", "react-dom": "^0.14.3", + "react-hot-loader": "^3.1.3", "react-redux": "4.3.0", "react-router": "^2.0.1", "redux": "^3.0.4" From ce68998ce373bed8093fed086e517cdea3859df3 Mon Sep 17 00:00:00 2001 From: Phan Thanh Date: Thu, 8 Feb 2018 09:43:45 +0700 Subject: [PATCH 2/5] feat: add react hot loader --- .babelrc | 3 ++- package.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.babelrc b/.babelrc index 7dfe4e9f26..75b31e96e2 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,4 @@ { - "presets": ["react", "es2015", "stage-1"] + "presets": ["react", "es2015", "stage-1"], + "plugins": ["react-hot-loader/babel"] } diff --git a/package.json b/package.json index 102a759b94..22ff18b130 100644 --- a/package.json +++ b/package.json @@ -30,6 +30,7 @@ "lodash": "^3.10.1", "react": "^0.14.3", "react-dom": "^0.14.3", + "react-hot-loader": "^3.1.3", "react-redux": "4.3.0", "react-router": "^2.0.1", "redux": "^3.0.4" From 7f24cba44336c0a537d42177197ca90625cefaba Mon Sep 17 00:00:00 2001 From: Phan Thanh Date: Thu, 8 Feb 2018 16:26:50 +0700 Subject: [PATCH 3/5] upgrade: libs version --- package.json | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 22ff18b130..8a3a702bfc 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "repository": "git@github.com:StephenGrider/ReduxSimpleStarter.git", "scripts": { "start": "node ./node_modules/webpack-dev-server/bin/webpack-dev-server.js", + "start:dev": "webpack-dev-server", "test": "mocha --compilers js:babel-core/register --require ./test/test_helper.js --recursive ./test", "test:watch": "npm run test -- --watch" }, @@ -13,26 +14,26 @@ "license": "ISC", "devDependencies": { "babel-core": "^6.2.1", - "babel-loader": "^6.2.0", + "babel-loader": "^7.1.2", "babel-preset-es2015": "^6.1.18", "babel-preset-react": "^6.1.18", - "chai": "^3.5.0", + "chai": "^4.1.2", "chai-jquery": "^2.0.0", - "jquery": "^2.2.1", - "jsdom": "^8.1.0", - "mocha": "^2.4.5", - "react-addons-test-utils": "^0.14.7", - "webpack": "^1.12.9", - "webpack-dev-server": "^1.14.0" + "jquery": "^3.3.1", + "jsdom": "^11.6.2", + "mocha": "^5.0.0", + "react-addons-test-utils": "^15.6.2", + "webpack": "^3.10.0", + "webpack-dev-server": "^2.11.1" }, "dependencies": { "babel-preset-stage-1": "^6.1.18", - "lodash": "^3.10.1", - "react": "^0.14.3", - "react-dom": "^0.14.3", + "lodash": "^4.17.5", + "react": "^16.2.0", + "react-dom": "^16.2.0", "react-hot-loader": "^3.1.3", - "react-redux": "4.3.0", - "react-router": "^2.0.1", + "react-redux": "5.0.6", + "react-router": "^4.2.0", "redux": "^3.0.4" } } From e617ca44fc0c77bc69dccc8d476518a5f0b9b04a Mon Sep 17 00:00:00 2001 From: Phan Thanh Date: Fri, 9 Feb 2018 14:06:51 +0700 Subject: [PATCH 4/5] fix: loader --- webpack.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webpack.config.js b/webpack.config.js index 31d865c2e8..c61d3483a7 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -10,14 +10,14 @@ module.exports = { module: { loaders: [{ exclude: /node_modules/, - loader: 'babel', + loader: 'babel-loader', query: { presets: ['react', 'es2015', 'stage-1'] } }] }, resolve: { - extensions: ['', '.js', '.jsx'] + extensions: ['.js', '.jsx'] }, devServer: { historyApiFallback: true, From d2d08acdfb0c58ab555c5445aad424bc48e66337 Mon Sep 17 00:00:00 2001 From: Phan Thanh Date: Fri, 9 Feb 2018 16:23:42 +0700 Subject: [PATCH 5/5] remove: unused script --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 8a3a702bfc..758dd0d13a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,6 @@ "repository": "git@github.com:StephenGrider/ReduxSimpleStarter.git", "scripts": { "start": "node ./node_modules/webpack-dev-server/bin/webpack-dev-server.js", - "start:dev": "webpack-dev-server", "test": "mocha --compilers js:babel-core/register --require ./test/test_helper.js --recursive ./test", "test:watch": "npm run test -- --watch" },