diff --git a/.yarn/cache/@testing-library-react-npm-15.0.2-095a436fff-6327e46573.zip b/.yarn/cache/@testing-library-react-npm-15.0.7-fc23780217-a9342ad09b.zip similarity index 52% rename from .yarn/cache/@testing-library-react-npm-15.0.2-095a436fff-6327e46573.zip rename to .yarn/cache/@testing-library-react-npm-15.0.7-fc23780217-a9342ad09b.zip index 4a90af1879a4..4badcb7a4ded 100644 Binary files a/.yarn/cache/@testing-library-react-npm-15.0.2-095a436fff-6327e46573.zip and b/.yarn/cache/@testing-library-react-npm-15.0.7-fc23780217-a9342ad09b.zip differ diff --git a/.yarn/cache/@types-react-npm-18.2.33-aad7d56562-7f84dcf70e.zip b/.yarn/cache/@types-react-npm-18.2.33-aad7d56562-7f84dcf70e.zip deleted file mode 100644 index 2790a191348c..000000000000 Binary files a/.yarn/cache/@types-react-npm-18.2.33-aad7d56562-7f84dcf70e.zip and /dev/null differ diff --git a/.yarn/cache/@types-react-npm-18.3.1-5744cb1fe5-baa6b8a75c.zip b/.yarn/cache/@types-react-npm-18.3.1-5744cb1fe5-baa6b8a75c.zip new file mode 100644 index 000000000000..c5daf109e0b5 Binary files /dev/null and b/.yarn/cache/@types-react-npm-18.3.1-5744cb1fe5-baa6b8a75c.zip differ diff --git a/.yarn/cache/@types-scheduler-npm-0.16.2-ba3a7d8c68-b6b4dcfeae.zip b/.yarn/cache/@types-scheduler-npm-0.16.2-ba3a7d8c68-b6b4dcfeae.zip deleted file mode 100644 index cb0dc0fe4e44..000000000000 Binary files a/.yarn/cache/@types-scheduler-npm-0.16.2-ba3a7d8c68-b6b4dcfeae.zip and /dev/null differ diff --git a/.yarn/cache/react-dom-npm-18.2.0-dd675bca1c-ca5e7762ec.zip b/.yarn/cache/react-dom-npm-18.2.0-dd675bca1c-ca5e7762ec.zip deleted file mode 100644 index 667f4c534d84..000000000000 Binary files a/.yarn/cache/react-dom-npm-18.2.0-dd675bca1c-ca5e7762ec.zip and /dev/null differ diff --git a/.yarn/cache/react-dom-npm-18.3.1-a805663f38-3f4b73a3aa.zip b/.yarn/cache/react-dom-npm-18.3.1-a805663f38-3f4b73a3aa.zip new file mode 100644 index 000000000000..bb1d88d36f9f Binary files /dev/null and b/.yarn/cache/react-dom-npm-18.3.1-a805663f38-3f4b73a3aa.zip differ diff --git a/.yarn/cache/react-is-npm-18.2.0-0cc5edb910-200cd65bf2.zip b/.yarn/cache/react-is-npm-18.3.1-370a81e1e9-d5f60c87d2.zip similarity index 93% rename from .yarn/cache/react-is-npm-18.2.0-0cc5edb910-200cd65bf2.zip rename to .yarn/cache/react-is-npm-18.3.1-370a81e1e9-d5f60c87d2.zip index 5dc7612bddc2..9dbb5c43a242 100644 Binary files a/.yarn/cache/react-is-npm-18.2.0-0cc5edb910-200cd65bf2.zip and b/.yarn/cache/react-is-npm-18.3.1-370a81e1e9-d5f60c87d2.zip differ diff --git a/.yarn/cache/react-npm-18.2.0-1eae08fee2-b9214a9bd7.zip b/.yarn/cache/react-npm-18.2.0-1eae08fee2-b9214a9bd7.zip deleted file mode 100644 index 6bff36a2e27d..000000000000 Binary files a/.yarn/cache/react-npm-18.2.0-1eae08fee2-b9214a9bd7.zip and /dev/null differ diff --git a/.yarn/cache/react-npm-18.3.1-af38f3c1ae-261137d3f3.zip b/.yarn/cache/react-npm-18.3.1-af38f3c1ae-261137d3f3.zip new file mode 100644 index 000000000000..d3a9d8e78e0e Binary files /dev/null and b/.yarn/cache/react-npm-18.3.1-af38f3c1ae-261137d3f3.zip differ diff --git a/.yarn/cache/scheduler-npm-0.23.0-a379a6bc3b-0c4557aa37.zip b/.yarn/cache/scheduler-npm-0.23.2-6d1dd9c2b7-e8d68b89d1.zip similarity index 91% rename from .yarn/cache/scheduler-npm-0.23.0-a379a6bc3b-0c4557aa37.zip rename to .yarn/cache/scheduler-npm-0.23.2-6d1dd9c2b7-e8d68b89d1.zip index 721ddcdda8ab..a341e177fc36 100644 Binary files a/.yarn/cache/scheduler-npm-0.23.0-a379a6bc3b-0c4557aa37.zip and b/.yarn/cache/scheduler-npm-0.23.2-6d1dd9c2b7-e8d68b89d1.zip differ diff --git a/package.json b/package.json index e01e92d67750..45b431ae27f9 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,13 @@ "postinstall": "husky" }, "resolutions": { - "@types/react": "~18.2.33", + "@types/react": "~18.3.0", "@types/prop-types": "15.7.12", "ast-types": "^0.14.0", "node-sass": "^9.0.0", - "react": "~18.2.0", - "react-dom": "~18.2.0", - "react-is": "~18.2.0" + "react": "~18.3.0", + "react-dom": "~18.3.0", + "react-is": "~18.3.0" }, "devDependencies": { "@babel/core": "^7.18.2", @@ -53,7 +53,7 @@ "@percy/playwright": "^1.0.4", "@playwright/test": "^1.36.2", "@testing-library/jest-dom": "^6.0.0", - "@testing-library/react": "^15.0.0", + "@testing-library/react": "^15.0.6", "@testing-library/user-event": "^14.4.3", "@types/react-is": "~18.2.0", "accessibility-checker": "^3.1.48", diff --git a/packages/react/src/components/ComboBox/ComboBox-test.js b/packages/react/src/components/ComboBox/ComboBox-test.js index e98ff05d2c09..3a532ec3c865 100644 --- a/packages/react/src/components/ComboBox/ComboBox-test.js +++ b/packages/react/src/components/ComboBox/ComboBox-test.js @@ -16,7 +16,8 @@ import { generateGenericItem, } from '../ListBox/test-helpers'; import ComboBox from '../ComboBox'; -import { act } from 'react-dom/test-utils'; +import { act } from 'react'; + import { Slug } from '../Slug'; const findInputNode = () => screen.getByRole('combobox'); diff --git a/packages/react/src/components/Tabs/Tabs-test.js b/packages/react/src/components/Tabs/Tabs-test.js index 32ee5f474509..af1de9c0c591 100644 --- a/packages/react/src/components/Tabs/Tabs-test.js +++ b/packages/react/src/components/Tabs/Tabs-test.js @@ -1,6 +1,7 @@ import React from 'react'; import { Tabs, Tab, TabPanel, TabPanels, TabList } from './Tabs'; -import { act } from 'react-dom/test-utils'; +import { act } from 'react'; + import { render, screen } from '@testing-library/react'; import userEvent from '@testing-library/user-event'; import * as hooks from '../../internal/useMatchMedia'; diff --git a/packages/react/src/components/UIShell/HeaderMenuItem.tsx b/packages/react/src/components/UIShell/HeaderMenuItem.tsx index 0fde47f0a1e6..2cdae4154d28 100644 --- a/packages/react/src/components/UIShell/HeaderMenuItem.tsx +++ b/packages/react/src/components/UIShell/HeaderMenuItem.tsx @@ -75,7 +75,7 @@ const HeaderMenuItem: HeaderMenuItemComponent = forwardRef( ); } -); +) as HeaderMenuItemComponent; HeaderMenuItem.displayName = 'HeaderMenuItem'; HeaderMenuItem.propTypes = { diff --git a/packages/react/src/components/UIShell/SideNavLink.tsx b/packages/react/src/components/UIShell/SideNavLink.tsx index 0a49dd2cef95..104f94a06372 100644 --- a/packages/react/src/components/UIShell/SideNavLink.tsx +++ b/packages/react/src/components/UIShell/SideNavLink.tsx @@ -123,7 +123,7 @@ const SideNavLink: SideNavLinkComponent = forwardRef(function SideNavLink< ); -}); +}) as SideNavLinkComponent; SideNavLink.displayName = 'SideNavLink'; SideNavLink.propTypes = { diff --git a/packages/react/src/components/UIShell/__tests__/HeaderContainer-test.js b/packages/react/src/components/UIShell/__tests__/HeaderContainer-test.js index 3b4d453abb2e..66154c9d0ed1 100644 --- a/packages/react/src/components/UIShell/__tests__/HeaderContainer-test.js +++ b/packages/react/src/components/UIShell/__tests__/HeaderContainer-test.js @@ -7,7 +7,8 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { act } from 'react-dom/test-utils'; +import { act } from 'react'; + import { HeaderContainer } from '../'; describe('HeaderContainer', () => { diff --git a/packages/react/src/internal/__tests__/useMatchMedia-test.js b/packages/react/src/internal/__tests__/useMatchMedia-test.js index a3d197a2f4c0..2d679182bcc6 100644 --- a/packages/react/src/internal/__tests__/useMatchMedia-test.js +++ b/packages/react/src/internal/__tests__/useMatchMedia-test.js @@ -7,7 +7,8 @@ import { render } from '@testing-library/react'; import React from 'react'; -import { act } from 'react-dom/test-utils'; +import { act } from 'react'; + import { useMatchMedia } from '../useMatchMedia'; describe('useMatchMedia', () => { diff --git a/yarn.lock b/yarn.lock index 2af62349a419..521e8ed30cbb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6795,17 +6795,21 @@ __metadata: languageName: node linkType: hard -"@testing-library/react@npm:^15.0.0": - version: 15.0.2 - resolution: "@testing-library/react@npm:15.0.2" +"@testing-library/react@npm:^15.0.6": + version: 15.0.7 + resolution: "@testing-library/react@npm:15.0.7" dependencies: "@babel/runtime": "npm:^7.12.5" "@testing-library/dom": "npm:^10.0.0" "@types/react-dom": "npm:^18.0.0" peerDependencies: + "@types/react": ^18.0.0 react: ^18.0.0 react-dom: ^18.0.0 - checksum: 10/6327e465733cec9455792acee7781d1437f7494ddbb976ca72e07446daaf8e7fe5dadd27d05690f09e8d4adce651984ed9aeca4ede9b87bf69b172f450085ede + peerDependenciesMeta: + "@types/react": + optional: true + checksum: 10/a9342ad09b019b0f99688fb50265899bc93adfe23c22aa6743fd920635b43fdc66877e66d95f240923aa6f7d3aa360837f5b053fb363a31975788974dff7bc93 languageName: node linkType: hard @@ -7347,14 +7351,13 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:~18.2.33": - version: 18.2.33 - resolution: "@types/react@npm:18.2.33" +"@types/react@npm:~18.3.0": + version: 18.3.1 + resolution: "@types/react@npm:18.3.1" dependencies: "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" csstype: "npm:^3.0.2" - checksum: 10/7f84dcf70eed3644973c7a47a63669d9e9ecc8d15b331fb272940a5c7cc322df11995eeeae1edfab5c278083cc3527477aa682c79f26667cfe8cd74481621884 + checksum: 10/baa6b8a75c471c89ebf3477b4feab57102ced25f0c1e553dd04ef6a1f0def28d5e0172fa626a631f22e223f840b5aaa2403b2d4bb671c83c5a9d6c7ae39c7a05 languageName: node linkType: hard @@ -7381,13 +7384,6 @@ __metadata: languageName: node linkType: hard -"@types/scheduler@npm:*": - version: 0.16.2 - resolution: "@types/scheduler@npm:0.16.2" - checksum: 10/b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc - languageName: node - linkType: hard - "@types/semver@npm:^7.3.12, @types/semver@npm:^7.3.4": version: 7.5.0 resolution: "@types/semver@npm:7.5.0" @@ -9889,7 +9885,7 @@ __metadata: "@percy/playwright": "npm:^1.0.4" "@playwright/test": "npm:^1.36.2" "@testing-library/jest-dom": "npm:^6.0.0" - "@testing-library/react": "npm:^15.0.0" + "@testing-library/react": "npm:^15.0.6" "@testing-library/user-event": "npm:^14.4.3" "@types/react-is": "npm:~18.2.0" accessibility-checker: "npm:^3.1.48" @@ -23026,15 +23022,15 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:~18.2.0": - version: 18.2.0 - resolution: "react-dom@npm:18.2.0" +"react-dom@npm:~18.3.0": + version: 18.3.1 + resolution: "react-dom@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - scheduler: "npm:^0.23.0" + scheduler: "npm:^0.23.2" peerDependencies: - react: ^18.2.0 - checksum: 10/ca5e7762ec8c17a472a3605b6f111895c9f87ac7d43a610ab7024f68cd833d08eda0625ce02ec7178cc1f3c957cf0b9273cdc17aa2cd02da87544331c43b1d21 + react: ^18.3.1 + checksum: 10/3f4b73a3aa083091173b29812b10394dd06f4ac06aff410b74702cfb3aa29d7b0ced208aab92d5272919b612e5cda21aeb1d54191848cf6e46e9e354f3541f81 languageName: node linkType: hard @@ -23061,10 +23057,10 @@ __metadata: languageName: node linkType: hard -"react-is@npm:~18.2.0": - version: 18.2.0 - resolution: "react-is@npm:18.2.0" - checksum: 10/200cd65bf2e0be7ba6055f647091b725a45dd2a6abef03bf2380ce701fd5edccee40b49b9d15edab7ac08a762bf83cb4081e31ec2673a5bfb549a36ba21570df +"react-is@npm:~18.3.0": + version: 18.3.1 + resolution: "react-is@npm:18.3.1" + checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22 languageName: node linkType: hard @@ -23161,12 +23157,12 @@ __metadata: languageName: node linkType: hard -"react@npm:~18.2.0": - version: 18.2.0 - resolution: "react@npm:18.2.0" +"react@npm:~18.3.0": + version: 18.3.1 + resolution: "react@npm:18.3.1" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10/b9214a9bd79e99d08de55f8bef2b7fc8c39630be97c4e29d7be173d14a9a10670b5325e94485f74cd8bff4966ef3c78ee53c79a7b0b9b70cba20aa8973acc694 + checksum: 10/261137d3f3993eaa2368a83110466fc0e558bc2c7f7ae7ca52d94f03aac945f45146bd85e5f481044db1758a1dbb57879e2fcdd33924e2dde1bdc550ce73f7bf languageName: node linkType: hard @@ -24389,12 +24385,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.23.0": - version: 0.23.0 - resolution: "scheduler@npm:0.23.0" +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" dependencies: loose-envify: "npm:^1.1.0" - checksum: 10/0c4557aa37bafca44ff21dc0ea7c92e2dbcb298bc62eae92b29a39b029134f02fb23917d6ebc8b1fa536b4184934314c20d8864d156a9f6357f3398aaf7bfda8 + checksum: 10/e8d68b89d18d5b028223edf090092846868a765a591944760942b77ea1f69b17235f7e956696efbb62c8130ab90af7e0949bfb8eba7896335507317236966bc9 languageName: node linkType: hard