mirror of
https://github.com/xodio/xod.git
synced 2026-03-08 01:36:50 +01:00
infra(xod-client, xod-client-browser, xod-client-electron): upgrade react to 15.4.2, get rid of react-hot-loader
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.
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user