diff --git a/.changeset/little-apples-own.md b/.changeset/little-apples-own.md new file mode 100644 index 00000000000..de440a51e52 --- /dev/null +++ b/.changeset/little-apples-own.md @@ -0,0 +1,5 @@ +--- +'@primer/react': minor +--- + +Update SSRProvider, useSSRSafeId to use the native React 18 useId() instead of @react-aria/ssr diff --git a/.eslintrc.js b/.eslintrc.js index b8784d93e39..7c5cb359fcb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -138,11 +138,6 @@ module.exports = { 'error', { paths: [ - { - name: '@react-aria/ssr', - importNames: ['useSSRSafeId'], - message: 'Please use the `useId` hook from `src/hooks/useId.ts` instead', - }, { name: 'react', importNames: ['useLayoutEffect'], diff --git a/package-lock.json b/package-lock.json index b7f50fdd03b..88467d3745f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "@primer/behaviors": "^1.5.1", "@primer/octicons-react": "^19.8.0", "@primer/primitives": "^7.11.11", - "@react-aria/ssr": "^3.5.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", @@ -6723,17 +6722,6 @@ "@babel/runtime": "^7.13.10" } }, - "node_modules/@react-aria/ssr": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.5.0.tgz", - "integrity": "sha512-h0MJdSWOd1qObLnJ8mprU31wI8tmKFJMuwT22MpWq6psisOOZaga6Ml4u6Ee6M6duWWISjXvqO4Sb/J0PBA+nQ==", - "dependencies": { - "@swc/helpers": "^0.4.14" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, "node_modules/@react-dnd/asap": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.0.tgz", @@ -13240,14 +13228,6 @@ "node": ">=10" } }, - "node_modules/@swc/helpers": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.14.tgz", - "integrity": "sha512-4C7nX/dvpzB7za4Ql9K81xK3HPxCpHMgwTZVyf+9JQ6VUbn9jjZVN7/Nkdz/Ugzs2CSjqnL/UPXroiVBVHUWUw==", - "dependencies": { - "tslib": "^2.4.0" - } - }, "node_modules/@testing-library/dom": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.1.tgz", @@ -40102,7 +40082,8 @@ "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", + "dev": true }, "node_modules/tsutils": { "version": "3.21.0", diff --git a/package.json b/package.json index 886af52e34a..017f538bca5 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,6 @@ "@primer/behaviors": "^1.5.1", "@primer/octicons-react": "^19.8.0", "@primer/primitives": "^7.11.11", - "@react-aria/ssr": "^3.5.0", "@styled-system/css": "^5.1.5", "@styled-system/props": "^5.1.5", "@styled-system/theme-get": "^5.1.2", diff --git a/src/NavList/__snapshots__/NavList.test.tsx.snap b/src/NavList/__snapshots__/NavList.test.tsx.snap index fbbcd726f81..c9d6cf86b56 100644 --- a/src/NavList/__snapshots__/NavList.test.tsx.snap +++ b/src/NavList/__snapshots__/NavList.test.tsx.snap @@ -313,10 +313,10 @@ exports[`NavList renders a simple list 1`] = ` >
Home @@ -336,10 +336,10 @@ exports[`NavList renders a simple list 1`] = ` class="c1 c7" >
About @@ -359,10 +359,10 @@ exports[`NavList renders a simple list 1`] = ` class="c1 c7" >
Contact @@ -738,12 +738,12 @@ exports[`NavList renders with groups 1`] = ` >

Overview