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..758dd0d13a 100644 --- a/package.json +++ b/package.json @@ -13,25 +13,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", - "react-redux": "4.3.0", - "react-router": "^2.0.1", + "lodash": "^4.17.5", + "react": "^16.2.0", + "react-dom": "^16.2.0", + "react-hot-loader": "^3.1.3", + "react-redux": "5.0.6", + "react-router": "^4.2.0", "redux": "^3.0.4" } } 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,