From bd1c732cf74a4a9bbd3a61c655722a25a67bd67f Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sun, 1 Nov 2020 20:03:42 -0800 Subject: [PATCH] Upgrade react --- packages/webamp/.babelrc | 8 +++++- packages/webamp/.eslintrc | 2 +- packages/webamp/package.json | 8 +++--- yarn.lock | 49 +++++++++++++++++++++++++++++++++--- 4 files changed, 58 insertions(+), 9 deletions(-) diff --git a/packages/webamp/.babelrc b/packages/webamp/.babelrc index ce4b793b..e39b2d51 100644 --- a/packages/webamp/.babelrc +++ b/packages/webamp/.babelrc @@ -18,7 +18,13 @@ } } ], - "@babel/preset-react", + // TODO: Can TypeScript just do this for us? + [ + "@babel/preset-react", + { + "runtime": "automatic" + } + ], "@babel/preset-typescript" ], "plugins": [ diff --git a/packages/webamp/.eslintrc b/packages/webamp/.eslintrc index 8316f091..fb9fde6c 100644 --- a/packages/webamp/.eslintrc +++ b/packages/webamp/.eslintrc @@ -143,7 +143,7 @@ "no-return-await": "error", "react/no-string-refs": "error", "react/jsx-boolean-value": "error", - "react/jsx-uses-react": "error", + "react/jsx-uses-react": "off", "react/jsx-uses-vars": "error", "react/prefer-es6-class": "error", "react/jsx-pascal-case": "error", diff --git a/packages/webamp/package.json b/packages/webamp/package.json index cdcc1ada..19615058 100644 --- a/packages/webamp/package.json +++ b/packages/webamp/package.json @@ -115,11 +115,11 @@ "prettier": "^2.0.4", "puppeteer": "^1.15.0", "rc-slider": "^8.7.1", - "react": "^16.8.6", - "react-dom": "^16.8.6", - "react-redux": "^7.1.0", + "react": "^17.0.1", + "react-dom": "^17.0.1", + "react-redux": "^7.2.2", "react-test-renderer": "^16.8.1", - "redux": "^4.0.1", + "redux": "^4.0.5", "redux-devtools-extension": "^2.13.2", "redux-thunk": "^2.3.0", "reselect": "^3.0.1", diff --git a/yarn.lock b/yarn.lock index 1c29d9fb..3d79f128 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1060,6 +1060,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.1.tgz#b4116a6b6711d010b2dad3b7b6e43bf1b9954740" + integrity sha512-J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.10.1", "@babel/template@^7.10.3", "@babel/template@^7.3.3": version "7.10.3" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.3.tgz#4d13bc8e30bf95b0ce9d175d30306f42a2c9a7b8" @@ -5897,7 +5904,7 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.3.0: +hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" dependencies: @@ -9992,6 +9999,15 @@ react-dom@^16.8.6: prop-types "^15.6.2" scheduler "^0.19.1" +react-dom@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" + integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + scheduler "^0.20.1" + react-dropzone@^10.1.7: version "10.2.2" resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-10.2.2.tgz#67b4db7459589a42c3b891a82eaf9ade7650b815" @@ -10000,7 +10016,7 @@ react-dropzone@^10.1.7: file-selector "^0.1.12" prop-types "^15.7.2" -react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" @@ -10018,6 +10034,17 @@ react-redux@^7.1.0: prop-types "^15.7.2" react-is "^16.9.0" +react-redux@^7.2.2: + version "7.2.2" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz#03862e803a30b6b9ef8582dadcc810947f74b736" + integrity sha512-8+CQ1EvIVFkYL/vu6Olo7JFLWop1qRUeb46sGtIMDCSpgwPQq8fPLpirIB0iTqFe9XYEFPHssdX8/UwN6pAkEA== + dependencies: + "@babel/runtime" "^7.12.1" + hoist-non-react-statics "^3.3.2" + loose-envify "^1.4.0" + prop-types "^15.7.2" + react-is "^16.13.1" + react-test-renderer@^16.8.1: version "16.13.1" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.13.1.tgz#de25ea358d9012606de51e012d9742e7f0deabc1" @@ -10035,6 +10062,14 @@ react@^16.8.6: object-assign "^4.1.1" prop-types "^15.6.2" +react@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" + integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -10162,7 +10197,7 @@ redux-thunk@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" -redux@^4.0.0, redux@^4.0.1: +redux@^4.0.0, redux@^4.0.1, redux@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" dependencies: @@ -10560,6 +10595,14 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" +scheduler@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" + integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"