From ab5a30b7752840706e6a42b3a37cca33ab7579e5 Mon Sep 17 00:00:00 2001 From: Wojciech Maj Date: Fri, 21 Oct 2022 15:33:44 +0200 Subject: [PATCH] Update React to 18.0.0 --- package.json | 6 ++-- sample/package.json | 4 +-- sample/yarn.lock | 35 +++++++++---------- test/index.jsx | 6 ++-- test/package.json | 4 +-- test/webpack.config.js | 1 + test/yarn.lock | 35 +++++++++---------- yarn.lock | 76 +++++++++++++++++------------------------- 8 files changed, 74 insertions(+), 93 deletions(-) diff --git a/package.json b/package.json index f9864d159..6e8235b11 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@babel/preset-env": "^7.15.0", "@babel/preset-react": "^7.14.0", "@testing-library/jest-dom": "^5.15.0", - "@testing-library/react": "^12.1.0", + "@testing-library/react": "^13.4.0", "eslint": "^8.26.0", "eslint-config-wojtekmaj": "^0.7.1", "husky": "^8.0.0", @@ -57,8 +57,8 @@ "less": "^4.0.0", "prettier": "^2.7.0", "pretty-quick": "^3.1.0", - "react": "^17.0.0", - "react-dom": "^17.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "rimraf": "^3.0.0" }, "peerDependencies": { diff --git a/sample/package.json b/sample/package.json index 70cf1f1c7..a5ba2e36e 100644 --- a/sample/package.json +++ b/sample/package.json @@ -14,9 +14,9 @@ "license": "MIT", "dependencies": { "prop-types": "^15.6.0", - "react": "^17.0.0", + "react": "^18.2.0", "react-date-picker": "latest", - "react-dom": "^17.0.0" + "react-dom": "^18.2.0" }, "devDependencies": { "@babel/core": "^7.15.0", diff --git a/sample/yarn.lock b/sample/yarn.lock index 5a6a0e4cb..1c68909d2 100644 --- a/sample/yarn.lock +++ b/sample/yarn.lock @@ -4748,9 +4748,9 @@ __metadata: less: ^4.0.0 less-loader: ^11.0.0 prop-types: ^15.6.0 - react: ^17.0.0 + react: ^18.2.0 react-date-picker: latest - react-dom: ^17.0.0 + react-dom: ^18.2.0 style-loader: ^3.0.0 webpack: ^5.20.0 webpack-cli: ^4.7.0 @@ -4778,16 +4778,15 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^17.0.0": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" +"react-dom@npm:^18.2.0": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - scheduler: ^0.20.2 + scheduler: ^0.23.0 peerDependencies: - react: 17.0.2 - checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc languageName: node linkType: hard @@ -4812,13 +4811,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^17.0.0": - version: 17.0.2 - resolution: "react@npm:17.0.2" +"react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b languageName: node linkType: hard @@ -5059,13 +5057,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a languageName: node linkType: hard diff --git a/test/index.jsx b/test/index.jsx index 91f0f763d..cb2b5060c 100644 --- a/test/index.jsx +++ b/test/index.jsx @@ -1,10 +1,10 @@ import React, { StrictMode } from 'react'; -import { render } from 'react-dom'; +import { createRoot } from 'react-dom/client'; + import Test from './Test'; -render( +createRoot(document.getElementById('react-root')).render( , - document.getElementById('react-root'), ); diff --git a/test/package.json b/test/package.json index d6222388b..428b32dac 100644 --- a/test/package.json +++ b/test/package.json @@ -15,9 +15,9 @@ "dependencies": { "@wojtekmaj/date-utils": "^1.0.2", "prop-types": "^15.6.0", - "react": "^17.0.0", + "react": "^18.2.0", "react-date-picker": "portal:../", - "react-dom": "^17.0.0" + "react-dom": "^18.2.0" }, "devDependencies": { "@babel/core": "^7.15.0", diff --git a/test/webpack.config.js b/test/webpack.config.js index af8f84878..6d09fad94 100644 --- a/test/webpack.config.js +++ b/test/webpack.config.js @@ -21,6 +21,7 @@ module.exports = { resolve: { alias: { 'react': require.resolve('react'), + 'react-dom/client': require.resolve('react-dom/client'), 'react-dom': require.resolve('react-dom'), }, extensions: ['.js', '.jsx'], diff --git a/test/yarn.lock b/test/yarn.lock index a9cd4bb3a..7e71944d7 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -5293,9 +5293,9 @@ __metadata: less-loader: ^11.0.0 mini-css-extract-plugin: ^2.0.0 prop-types: ^15.6.0 - react: ^17.0.0 + react: ^18.2.0 react-date-picker: "portal:../" - react-dom: ^17.0.0 + react-dom: ^18.2.0 react-refresh: ^0.14.0 style-loader: ^3.0.0 webpack: ^5.20.0 @@ -5323,16 +5323,15 @@ __metadata: languageName: node linkType: soft -"react-dom@npm:^17.0.0": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" +"react-dom@npm:^18.2.0": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - scheduler: ^0.20.2 + scheduler: ^0.23.0 peerDependencies: - react: 17.0.2 - checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc languageName: node linkType: hard @@ -5364,13 +5363,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^17.0.0": - version: 17.0.2 - resolution: "react@npm:17.0.2" +"react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b languageName: node linkType: hard @@ -5641,13 +5639,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a languageName: node linkType: hard diff --git a/yarn.lock b/yarn.lock index e15863a25..3511d7ba4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1841,7 +1841,7 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.0.0": +"@testing-library/dom@npm:^8.5.0": version: 8.19.0 resolution: "@testing-library/dom@npm:8.19.0" dependencies: @@ -1874,17 +1874,17 @@ __metadata: languageName: node linkType: hard -"@testing-library/react@npm:^12.1.0": - version: 12.1.5 - resolution: "@testing-library/react@npm:12.1.5" +"@testing-library/react@npm:^13.4.0": + version: 13.4.0 + resolution: "@testing-library/react@npm:13.4.0" dependencies: "@babel/runtime": ^7.12.5 - "@testing-library/dom": ^8.0.0 - "@types/react-dom": <18.0.0 + "@testing-library/dom": ^8.5.0 + "@types/react-dom": ^18.0.0 peerDependencies: - react: <18.0.0 - react-dom: <18.0.0 - checksum: 4abd0490405e709a7df584a0db604e508a4612398bb1326e8fa32dd9393b15badc826dcf6d2f7525437886d507871f719f127b9860ed69ddd204d1fa834f576a + react: ^18.0.0 + react-dom: ^18.0.0 + checksum: 51ec548c1fdb1271089a5c63e0908f0166f2c7fcd9cacd3108ebbe0ce64cb4351812d885892020dc37608418cfb15698514856502b3cab0e5cc58d6cc1bd4a3e languageName: node linkType: hard @@ -2042,12 +2042,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:<18.0.0": - version: 17.0.17 - resolution: "@types/react-dom@npm:17.0.17" +"@types/react-dom@npm:^18.0.0": + version: 18.0.6 + resolution: "@types/react-dom@npm:18.0.6" dependencies: - "@types/react": ^17 - checksum: 23caf98aa03e968811560f92a2c8f451694253ebe16b670929b24eaf0e7fa62ba549abe9db0ac028a9d8a9086acd6ab9c6c773f163fa21224845edbc00ba6232 + "@types/react": "*" + checksum: db571047af1a567631758700b9f7d143e566df939cfe5fbf7535347cc0c726a1cdbb5e3f8566d076e54cf708b6c1166689de194a9ba09ee35efc9e1d45911685 languageName: node linkType: hard @@ -2062,17 +2062,6 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^17": - version: 17.0.50 - resolution: "@types/react@npm:17.0.50" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: b5629dff7c2f3e9fcba95a19b2b3bfd78d7cacc33ba5fc26413dba653d34afcac3b93ddabe563e8062382688a1eac7db68e93739bb8e712d27637a03aaafbbb8 - languageName: node - linkType: hard - "@types/scheduler@npm:*": version: 0.16.2 resolution: "@types/scheduler@npm:0.16.2" @@ -5994,7 +5983,7 @@ __metadata: "@babel/preset-env": ^7.15.0 "@babel/preset-react": ^7.14.0 "@testing-library/jest-dom": ^5.15.0 - "@testing-library/react": ^12.1.0 + "@testing-library/react": ^13.4.0 "@types/react-calendar": ^3.0.0 "@wojtekmaj/date-utils": ^1.0.3 eslint: ^8.26.0 @@ -6009,9 +5998,9 @@ __metadata: prettier: ^2.7.0 pretty-quick: ^3.1.0 prop-types: ^15.6.0 - react: ^17.0.0 + react: ^18.2.0 react-calendar: ^3.7.0 - react-dom: ^17.0.0 + react-dom: ^18.2.0 react-fit: ^1.4.0 rimraf: ^3.0.0 update-input-width: ^1.2.2 @@ -6021,16 +6010,15 @@ __metadata: languageName: unknown linkType: soft -"react-dom@npm:^17.0.0": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" +"react-dom@npm:^18.2.0": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - scheduler: ^0.20.2 + scheduler: ^0.23.0 peerDependencies: - react: 17.0.2 - checksum: 1c1eaa3bca7c7228d24b70932e3d7c99e70d1d04e13bb0843bbf321582bc25d7961d6b8a6978a58a598af2af496d1cedcfb1bf65f6b0960a0a8161cb8dab743c + react: ^18.2.0 + checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc languageName: node linkType: hard @@ -6069,13 +6057,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^17.0.0": - version: 17.0.2 - resolution: "react@npm:17.0.2" +"react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: b254cc17ce3011788330f7bbf383ab653c6848902d7936a87b09d835d091e3f295f7e9dd1597c6daac5dc80f90e778c8230218ba8ad599f74adcc11e33b9d61b + checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b languageName: node linkType: hard @@ -6362,13 +6349,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: ^1.1.0 - object-assign: ^4.1.1 - checksum: c4b35cf967c8f0d3e65753252d0f260271f81a81e427241295c5a7b783abf4ea9e905f22f815ab66676f5313be0a25f47be582254db8f9241b259213e999b8fc + checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a languageName: node linkType: hard