From 0448ea49b58d17a4e2e6efb7b330ee91c81d08f4 Mon Sep 17 00:00:00 2001 From: Evgeny Kochetkov Date: Thu, 2 Mar 2017 13:51:56 +0300 Subject: [PATCH] infra(xod-client, xod-client-browser, xod-client-electron): upgrade react to 15.4.2, get rid of react-hot-loader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Benefits of a fresher version of React don't need an explanation :) And `react-hot-loader` was not doing anything for us — page was fully reloaded on every change anyway. --- package.json | 1 - packages/xod-client-browser/package.json | 4 ++-- packages/xod-client-browser/webpack.config.dev.js | 12 +----------- packages/xod-client-electron/package.json | 4 ++-- packages/xod-client/package.json | 4 ++-- 5 files changed, 7 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 42570128..6f21105c 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,6 @@ "postcss": "^5.2.5", "postcss-loader": "^1.1.0", "raw-loader": "^0.5.1", - "react-hot-loader": "^1.3.0", "rimraf": "^2.5.4", "sass-loader": "^4.0.2", "style-loader": "^0.13.1", diff --git a/packages/xod-client-browser/package.json b/packages/xod-client-browser/package.json index eb5c57f4..ddf79faa 100644 --- a/packages/xod-client-browser/package.json +++ b/packages/xod-client-browser/package.json @@ -12,8 +12,8 @@ "dependencies": { "babel-polyfill": "^6.16.0", "ramda": "^0.22.1", - "react": "^0.14.6", - "react-dom": "^0.14.6", + "react": "^15.4.2", + "react-dom": "^15.4.2", "react-fa": "^4.1.2", "react-event-listener": "^0.3.0", "react-hotkeys": "^0.9.0", diff --git a/packages/xod-client-browser/webpack.config.dev.js b/packages/xod-client-browser/webpack.config.dev.js index 3d038623..e5bab9a8 100644 --- a/packages/xod-client-browser/webpack.config.dev.js +++ b/packages/xod-client-browser/webpack.config.dev.js @@ -1,4 +1,3 @@ - const path = require('path'); const validate = require('webpack-validator'); const merge = require('webpack-merge'); @@ -19,19 +18,10 @@ const config = merge.smart(baseConfig, { resolve: { modulesDirectories: [ // search top-level node_modules for webpack-hot-loader - pkgpath('../../node_modules'), + pkgpath('../../node_modules'), ], extensions: ['', '.js', '.jsx', '.scss'], }, - module: { - loaders: [ - { - include: pkgpath('src'), - test: /\.jsx?$/, - loaders: ['react-hot'], - }, - ] - } }); module.exports = validate(config); diff --git a/packages/xod-client-electron/package.json b/packages/xod-client-electron/package.json index 0f0dfcbf..6db914fd 100644 --- a/packages/xod-client-electron/package.json +++ b/packages/xod-client-electron/package.json @@ -17,8 +17,8 @@ "classnames": "^2.2.5", "ramda": "^0.22.1", "rc-progress": "^2.0.6", - "react": "^0.14.6", - "react-dom": "^0.14.6", + "react": "^15.4.2", + "react-dom": "^15.4.2", "react-event-listener": "^0.3.0", "react-fa": "^4.1.2", "react-hotkeys": "^0.9.0", diff --git a/packages/xod-client/package.json b/packages/xod-client/package.json index 9b5ac798..7062e5f1 100644 --- a/packages/xod-client/package.json +++ b/packages/xod-client/package.json @@ -29,9 +29,9 @@ "rc-menu": "^5.0.9", "rc-progress": "^1.0.4", "rc-switch": "^1.4.2", - "react": "^15.3.2", + "react": "^15.4.2", "react-click-outside": "^2.2.0", - "react-dom": "^15.3.2", + "react-dom": "^15.4.2", "react-event-listener": "^0.2.1", "react-fa": "git+https://github.com/brusherru/react-fa.git", "react-hotkeys": "git+https://github.com/brusherru/react-hotkeys.git#npm",