From 062ab664a112d5580d9644d7f6a9e6031703c6f6 Mon Sep 17 00:00:00 2001 From: "Juan A. Ruz" Date: Mon, 23 Mar 2020 12:55:51 +0100 Subject: [PATCH] [#2569] Update react-hot-loader and react-hot-dom [skip ci] relates https://github.com/gaearon/react-hot-loader/issues/1227 relates https://github.com/folio-org/stripes-core/pull/822 --- client/package-lock.json | 85 +++++++++++++++++++++++++----------- client/package.json | 3 +- client/webpack.config.dev.js | 3 ++ 3 files changed, 64 insertions(+), 27 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index da16dda353..95c1a11ed7 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -143,6 +143,36 @@ "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz", "integrity": "sha512-6PYY5DVdAY1ifaQW6XYTnOMihmBVT27elqSjEoodchsGjzYlEsTQMcEhSud99kVawatyTZRTiVkJ/c6lwbQ7nA==" }, + "@hot-loader/react-dom": { + "version": "16.13.0", + "resolved": "https://registry.npmjs.org/@hot-loader/react-dom/-/react-dom-16.13.0.tgz", + "integrity": "sha512-lJZrmkucz2MrQJTQtJobx5MICXcfQvKihszqv655p557HPi0hMOWxrNpiHv3DWD8ugNWjtWcVWqRnFvwsHq1mQ==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.0" + }, + "dependencies": { + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "scheduler": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", + "dev": true, + "requires": { + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" + } + } + } + }, "@nivo/core": { "version": "0.33.0", "resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.33.0.tgz", @@ -7031,8 +7061,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fast-memoize": { "version": "2.5.1", @@ -13712,38 +13741,42 @@ } }, "react-hot-loader": { - "version": "3.0.0-beta.6", - "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz", - "integrity": "sha1-Rj+sC/yLY6g4UlivIMkWNqvOdfQ=", + "version": "4.12.20", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.20.tgz", + "integrity": "sha512-lPlv1HVizi0lsi+UFACBJaydtRYILWkfHAC/lyCs6ZlAxlOZRQIfYHDqiGaRvL/GF7zyti+Qn9XpnDAUvdFA4A==", "requires": { - "babel-template": "^6.7.0", + "fast-levenshtein": "^2.0.6", "global": "^4.3.0", - "react-deep-force-update": "^2.0.1", - "react-proxy": "^3.0.0-alpha.0", - "redbox-react": "^1.2.5", - "source-map": "^0.4.4" + "hoist-non-react-statics": "^3.3.0", + "loader-utils": "^1.1.0", + "prop-types": "^15.6.1", + "react-lifecycles-compat": "^3.0.4", + "shallowequal": "^1.1.0", + "source-map": "^0.7.3" }, "dependencies": { - "react-deep-force-update": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.1.2.tgz", - "integrity": "sha512-b7+pUthNb3iDljVkFbtre+9ODL0obPkOBeNpSqrWAdBW9GPz/LB3rWU/r0BrOETq+LjGzb0onE9QCbYKN1G8zg==" - }, - "react-proxy": { - "version": "3.0.0-alpha.1", - "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz", - "integrity": "sha1-RABCa8+oDKpnJMd1VpUxUgn6Swc=", + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", "requires": { - "lodash": "^4.6.1" + "react-is": "^16.7.0" } }, + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + }, + "shallowequal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz", + "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==" + }, "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" } } }, diff --git a/client/package.json b/client/package.json index aaf663611e..6285d8f84b 100755 --- a/client/package.json +++ b/client/package.json @@ -101,7 +101,7 @@ "react-dom": "^16.8.0", "react-grid-layout": "^0.14.6", "react-grid-system": "^4.4.5", - "react-hot-loader": "3.0.0-beta.6", + "react-hot-loader": "^4.12.20", "react-intl": "^2.3.0", "react-leaflet": "^2.6.1", "react-measure": "^2.0.2", @@ -136,6 +136,7 @@ "uuid": "3.3.3" }, "devDependencies": { + "@hot-loader/react-dom": "^16.13.0", "@storybook/addon-actions": "^3.3.15", "@storybook/addon-knobs": "^3.3.15", "@storybook/addon-links": "^3.3.15", diff --git a/client/webpack.config.dev.js b/client/webpack.config.dev.js index c7ccae3eda..791f92d542 100755 --- a/client/webpack.config.dev.js +++ b/client/webpack.config.dev.js @@ -13,6 +13,9 @@ const HTML_CONFIG = { export default { resolve: { + alias: { + 'react-dom': '@hot-loader/react-dom', + }, extensions: ['*', '.js', '.jsx', '.json'], }, devtool: 'cheap-module-eval-source-map', // more info:https://webpack.js.org/guides/development/#using-source-maps and https://webpack.js.org/configuration/devtool/