From 759fa0398cd809bc4301a0cf8219ea78bc3dd390 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 12:29:51 -0500 Subject: [PATCH 01/10] upgrade to react 19.2 --- package.json | 9 +++-- packages/dev/docs/package.json | 4 +-- packages/dev/s2-docs/package.json | 4 +-- starters/docs/package.json | 2 +- yarn.lock | 60 +++++++++++++++++++++++++------ 5 files changed, 60 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 7cead10d05a..dea003659a8 100644 --- a/package.json +++ b/package.json @@ -73,6 +73,9 @@ "devDependencies": { "@actions/core": "^1.10.0", "@actions/github": "^1.1.0", + "@adobe/react-spectrum-ui": "^1.2.1", + "@adobe/react-spectrum-workflow": "^2.4.0", + "@adobe/react-spectrum-workflow-color": "^1.1.1", "@babel/cli": "^7.24.1", "@babel/core": "^7.24.3", "@babel/eslint-parser": "^7.27.1", @@ -178,10 +181,10 @@ "postcss": "^8.4.24", "postcss-custom-properties": "^13.2.0", "postcss-import": "^15.1.0", - "react": "^19.1.0", - "react-dom": "^19.1.0", + "react": "^19.2.0", + "react-dom": "^19.2.0", "react-frame-component": "^5.0.0", - "react-test-renderer": "^19.1.0", + "react-test-renderer": "^19.2.0", "recast": "^0.23", "recursive-readdir": "^2.2.2", "regenerator-runtime": "0.13.3", diff --git a/packages/dev/docs/package.json b/packages/dev/docs/package.json index 0671825634e..75704123ef4 100644 --- a/packages/dev/docs/package.json +++ b/packages/dev/docs/package.json @@ -31,8 +31,8 @@ "highlight.js": "9.18.1", "markdown-to-jsx": "^6.11.0", "quicklink": "^2.3.0", - "react": "^19.1.0", - "react-dom": "^19.1.0", + "react": "^19.2.0", + "react-dom": "^19.2.0", "react-lowlight": "^2.0.0" }, "peerDependencies": { diff --git a/packages/dev/s2-docs/package.json b/packages/dev/s2-docs/package.json index 8d3f72dacc1..abe61abcb37 100644 --- a/packages/dev/s2-docs/package.json +++ b/packages/dev/s2-docs/package.json @@ -49,10 +49,10 @@ "json5": "^2.2.3", "lz-string": "^1.5.0", "markdown-to-jsx": "^6.11.0", - "react": "^19", + "react": "^19.2.0", "react-aria": "^3.40.0", "react-aria-components": "^1.7.1", - "react-dom": "^19", + "react-dom": "^19.2.0", "react-stately": "^3.38.0", "remark-mdx": "^3.1.0", "remark-parse": "^11.0.0", diff --git a/starters/docs/package.json b/starters/docs/package.json index 8d4797c492c..e58efc111ba 100644 --- a/starters/docs/package.json +++ b/starters/docs/package.json @@ -24,7 +24,7 @@ "clsx": "^2.1.1", "lightningcss-loader": "^2.1.0", "lucide-react": "^0.517.0", - "react": "^19.1.0", + "react": "^19.2.0", "react-aria-components": "latest", "react-dom": "^19.1.0", "storybook": "^8.6.14", diff --git a/yarn.lock b/yarn.lock index 46ceb7b0a44..b4fef5dd859 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,7 +58,7 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-ui@npm:1.2.1": +"@adobe/react-spectrum-ui@npm:1.2.1, @adobe/react-spectrum-ui@npm:^1.2.1": version: 1.2.1 resolution: "@adobe/react-spectrum-ui@npm:1.2.1" peerDependencies: @@ -68,7 +68,7 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-workflow-color@npm:1.1.1": +"@adobe/react-spectrum-workflow-color@npm:1.1.1, @adobe/react-spectrum-workflow-color@npm:^1.1.1": version: 1.1.1 resolution: "@adobe/react-spectrum-workflow-color@npm:1.1.1" peerDependencies: @@ -88,6 +88,16 @@ __metadata: languageName: node linkType: hard +"@adobe/react-spectrum-workflow@npm:^2.4.0": + version: 2.4.0 + resolution: "@adobe/react-spectrum-workflow@npm:2.4.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 + react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 + checksum: 10c0/13939b30fed9bee4cc31c57bbe00fc9881bdba46704f2db64864dba5334093bcc9a4944f66e1a2be65713351ee61bece9870053ec3e55c0fdad0d98af66c562f + languageName: node + linkType: hard + "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum": version: 0.0.0-use.local resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum" @@ -6973,8 +6983,8 @@ __metadata: highlight.js: "npm:9.18.1" markdown-to-jsx: "npm:^6.11.0" quicklink: "npm:^2.3.0" - react: "npm:^19.1.0" - react-dom: "npm:^19.1.0" + react: "npm:^19.2.0" + react-dom: "npm:^19.2.0" react-lowlight: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1 @@ -7501,10 +7511,10 @@ __metadata: json5: "npm:^2.2.3" lz-string: "npm:^1.5.0" markdown-to-jsx: "npm:^6.11.0" - react: "npm:^19" + react: "npm:^19.2.0" react-aria: "npm:^3.40.0" react-aria-components: "npm:^1.7.1" - react-dom: "npm:^19" + react-dom: "npm:^19.2.0" react-stately: "npm:^3.38.0" remark-mdx: "npm:^3.1.0" remark-parse: "npm:^11.0.0" @@ -24638,7 +24648,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react-dom@npm:^19, react-dom@npm:^19.1.0": +"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0": version: 19.1.0 resolution: "react-dom@npm:19.1.0" dependencies: @@ -24649,6 +24659,17 @@ __metadata: languageName: node linkType: hard +"react-dom@npm:^19.2.0": + version: 19.2.1 + resolution: "react-dom@npm:19.2.1" + dependencies: + scheduler: "npm:^0.27.0" + peerDependencies: + react: ^19.2.1 + checksum: 10c0/e56b6b3d72314df580ca800b70a69a21c6372703c8f45d9b5451ca6519faefb2496d76ffa9c5adb94136d2bbf2fd303d0dfc208a2cd77ede3132877471af9470 + languageName: node + linkType: hard + "react-frame-component@npm:^5.0.0": version: 5.2.6 resolution: "react-frame-component@npm:5.2.6" @@ -24724,6 +24745,9 @@ __metadata: dependencies: "@actions/core": "npm:^1.10.0" "@actions/github": "npm:^1.1.0" + "@adobe/react-spectrum-ui": "npm:^1.2.1" + "@adobe/react-spectrum-workflow": "npm:^2.4.0" + "@adobe/react-spectrum-workflow-color": "npm:^1.1.1" "@babel/cli": "npm:^7.24.1" "@babel/core": "npm:^7.24.3" "@babel/eslint-parser": "npm:^7.27.1" @@ -24829,10 +24853,10 @@ __metadata: postcss: "npm:^8.4.24" postcss-custom-properties: "npm:^13.2.0" postcss-import: "npm:^15.1.0" - react: "npm:^19.1.0" - react-dom: "npm:^19.1.0" + react: "npm:^19.2.0" + react-dom: "npm:^19.2.0" react-frame-component: "npm:^5.0.0" - react-test-renderer: "npm:^19.1.0" + react-test-renderer: "npm:^19.2.0" recast: "npm:^0.23" recursive-readdir: "npm:^2.2.2" regenerator-runtime: "npm:0.13.3" @@ -24918,7 +24942,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^19, react@npm:^19.1.0": +"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0": version: 19.1.0 resolution: "react@npm:19.1.0" checksum: 10c0/530fb9a62237d54137a13d2cfb67a7db6a2156faed43eecc423f4713d9b20c6f2728b026b45e28fcd72e8eadb9e9ed4b089e99f5e295d2f0ad3134251bdd3698 @@ -24932,6 +24956,13 @@ __metadata: languageName: node linkType: hard +"react@npm:^19.2.0": + version: 19.2.1 + resolution: "react@npm:19.2.1" + checksum: 10c0/2b5eaf407abb3db84090434c20d6c5a8e447ab7abcd8fe9eaf1ddc299babcf31284ee9db7ea5671d21c85ac5298bd632fa1a7da1ed78d5b368a537f5e1cd5d62 + languageName: node + linkType: hard + "read-cache@npm:^1.0.0": version: 1.0.0 resolution: "read-cache@npm:1.0.0" @@ -25913,6 +25944,13 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.27.0": + version: 0.27.0 + resolution: "scheduler@npm:0.27.0" + checksum: 10c0/4f03048cb05a3c8fddc45813052251eca00688f413a3cee236d984a161da28db28ba71bd11e7a3dd02f7af84ab28d39fb311431d3b3772fed557945beb00c452 + languageName: node + linkType: hard + "section-matter@npm:^1.0.0": version: 1.0.0 resolution: "section-matter@npm:1.0.0" From 8df5785775e583709aff9718ebc0efbfe94714f5 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 12:43:44 -0500 Subject: [PATCH 02/10] add failing tests --- .../test/ListBox.test.js | 36 ++++++++++++++++++ .../react-aria-components/test/Tabs.test.js | 38 +++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/packages/react-aria-components/test/ListBox.test.js b/packages/react-aria-components/test/ListBox.test.js index a46b9fc71aa..7649d06e188 100644 --- a/packages/react-aria-components/test/ListBox.test.js +++ b/packages/react-aria-components/test/ListBox.test.js @@ -1861,4 +1861,40 @@ describe('ListBox', () => { expect(onClick).toHaveBeenCalledTimes(1); }); }); + + if (React.version.startsWith('19')) { + it('supports Activity', async () => { + function ActivityListBox() { + let [mode, setMode] = React.useState('hidden'); + + return ( + <> + + + +

List should be visible

+ + + Item 1 + Item 2 + Item 3 + Item 4 + Item 5 + + + + ); + } + + let {getAllByRole, getByRole, queryAllByRole} = render(); + let button = getByRole('button'); + expect(queryAllByRole('option')).toHaveLength(0); + await user.click(button); + expect(getAllByRole('option')).toHaveLength(5); + await user.click(button); + expect(queryAllByRole('option')).toHaveLength(0); + }); + } }); diff --git a/packages/react-aria-components/test/Tabs.test.js b/packages/react-aria-components/test/Tabs.test.js index d05350f4267..f849387358d 100644 --- a/packages/react-aria-components/test/Tabs.test.js +++ b/packages/react-aria-components/test/Tabs.test.js @@ -641,4 +641,42 @@ describe('Tabs', () => { expect(onClick).toHaveBeenCalledTimes(1); }); }); + + if (React.version.startsWith('19')) { + it('supports Activity', async () => { + function ActivityTabs() { + let [mode, setMode] = React.useState('hidden'); + + return ( + <> + + + + + A + B + + C + Test + + + A + B + C + + + + ); + } + + let {getByRole, getAllByRole, queryAllByRole} = render(); + + let button = getByRole('button'); + expect(queryAllByRole('tab')).toHaveLength(0); + await user.click(button); + expect(getAllByRole('tab')).toHaveLength(3); + }); + } }); From 07cd96d82904abb2afa80c0ea7421fcbaa88b518 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 12:52:48 -0500 Subject: [PATCH 03/10] fix Activity with single re-render on minimal overhead --- .../collections/src/CollectionBuilder.tsx | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/@react-aria/collections/src/CollectionBuilder.tsx b/packages/@react-aria/collections/src/CollectionBuilder.tsx index e7585b8ab81..0cbe385872a 100644 --- a/packages/@react-aria/collections/src/CollectionBuilder.tsx +++ b/packages/@react-aria/collections/src/CollectionBuilder.tsx @@ -18,6 +18,7 @@ import {FocusableContext} from '@react-aria/interactions'; import {forwardRefType, Key, Node} from '@react-types/shared'; import {Hidden} from './Hidden'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react'; +import {useLayoutEffect} from '@react-aria/utils'; import {useIsSSR} from '@react-aria/ssr'; import {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js'; @@ -113,6 +114,23 @@ function useCollectionDocument>(cr return document.getCollection(); }, [document]); let collection = useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot); + + // React 19.2 introduced activities, which when started as hidden on the dom can play funky with the collection + // To avoid this we force a one time re-render if the collection fails to populate + const [, forceStoreRerender] = useState(0); // simple state to force a re-render + useLayoutEffect(function forceRefreshCollection() { + // Do not do anything if the collection has been pre-populated successfully + if (collection.size > 0) { + return; + } + // Re-create the collection + const nextValue = getSnapshot(); + if (nextValue.size > 0) { + forceStoreRerender(c => c + 1); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [collection.size === 0]); // don't run effect once we have a populated collection + return {collection, document}; } From 69b70490d79e097051bed74b1a120992936493f1 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 15:19:42 -0500 Subject: [PATCH 04/10] fix: linter --- packages/@react-aria/collections/src/CollectionBuilder.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@react-aria/collections/src/CollectionBuilder.tsx b/packages/@react-aria/collections/src/CollectionBuilder.tsx index 0cbe385872a..97ed76aaf1f 100644 --- a/packages/@react-aria/collections/src/CollectionBuilder.tsx +++ b/packages/@react-aria/collections/src/CollectionBuilder.tsx @@ -18,8 +18,8 @@ import {FocusableContext} from '@react-aria/interactions'; import {forwardRefType, Key, Node} from '@react-types/shared'; import {Hidden} from './Hidden'; import React, {createContext, ForwardedRef, forwardRef, JSX, ReactElement, ReactNode, useCallback, useContext, useMemo, useRef, useState} from 'react'; -import {useLayoutEffect} from '@react-aria/utils'; import {useIsSSR} from '@react-aria/ssr'; +import {useLayoutEffect} from '@react-aria/utils'; import {useSyncExternalStore as useSyncExternalStoreShim} from 'use-sync-external-store/shim/index.js'; const ShallowRenderContext = createContext(false); From 06b214e6976781adbe97bd608aacf64f4e354bf5 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 15:19:49 -0500 Subject: [PATCH 05/10] fix react version --- starters/docs/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/starters/docs/package.json b/starters/docs/package.json index e58efc111ba..1addbf4c1ec 100644 --- a/starters/docs/package.json +++ b/starters/docs/package.json @@ -26,14 +26,14 @@ "lucide-react": "^0.517.0", "react": "^19.2.0", "react-aria-components": "latest", - "react-dom": "^19.1.0", + "react-dom": "^19.2.0", "storybook": "^8.6.14", "storybook-dark-mode": "^4.0.2", "typescript": "5.3.3" }, "resolutions": { - "react": "19.1.0", - "react-dom": "19.1.0", + "react": "19.2.0", + "react-dom": "19.2.0", "@types/mime": "3.0.4", "jackspeak": "2.1.1" } From f10551e4caadd76373e39f10161554256d50a9c7 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 15:28:44 -0500 Subject: [PATCH 06/10] add @storybook/blocks to resolve build issues --- package.json | 1 + yarn.lock | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dea003659a8..c0662ea5bfc 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,7 @@ "@storybook/addon-links": "^8.6.14", "@storybook/addon-onboarding": "^8.6.14", "@storybook/addon-themes": "^8.6.14", + "@storybook/blocks": "^8.6.14", "@storybook/components": "^8.6.14", "@storybook/manager-api": "^8.6.14", "@storybook/preview": "^8.6.14", diff --git a/yarn.lock b/yarn.lock index b4fef5dd859..fe04d73b631 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9421,7 +9421,7 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@npm:8.6.14": +"@storybook/blocks@npm:8.6.14, @storybook/blocks@npm:^8.6.14": version: 8.6.14 resolution: "@storybook/blocks@npm:8.6.14" dependencies: @@ -24791,6 +24791,7 @@ __metadata: "@storybook/addon-links": "npm:^8.6.14" "@storybook/addon-onboarding": "npm:^8.6.14" "@storybook/addon-themes": "npm:^8.6.14" + "@storybook/blocks": "npm:^8.6.14" "@storybook/components": "npm:^8.6.14" "@storybook/manager-api": "npm:^8.6.14" "@storybook/preview": "npm:^8.6.14" From 041187a08e1ed9b538f17f8d7bd0b9d6741458f6 Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 15:49:29 -0500 Subject: [PATCH 07/10] normalize imports --- package.json | 6 +++--- yarn.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 20fa5af90e1..c1d134fd785 100644 --- a/package.json +++ b/package.json @@ -73,9 +73,9 @@ "devDependencies": { "@actions/core": "^1.10.0", "@actions/github": "^1.1.0", - "@adobe/react-spectrum-ui": "^1.2.1", - "@adobe/react-spectrum-workflow": "^2.4.0", - "@adobe/react-spectrum-workflow-color": "^1.1.1", + "@adobe/react-spectrum-ui": "1.2.1", + "@adobe/react-spectrum-workflow": "2.4.0", + "@adobe/react-spectrum-workflow-color": "1.1.1", "@babel/cli": "^7.24.1", "@babel/core": "^7.24.3", "@babel/eslint-parser": "^7.27.1", diff --git a/yarn.lock b/yarn.lock index fe04d73b631..d8530d555d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,7 +58,7 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-ui@npm:1.2.1, @adobe/react-spectrum-ui@npm:^1.2.1": +"@adobe/react-spectrum-ui@npm:1.2.1": version: 1.2.1 resolution: "@adobe/react-spectrum-ui@npm:1.2.1" peerDependencies: @@ -68,7 +68,7 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-workflow-color@npm:1.1.1, @adobe/react-spectrum-workflow-color@npm:^1.1.1": +"@adobe/react-spectrum-workflow-color@npm:1.1.1": version: 1.1.1 resolution: "@adobe/react-spectrum-workflow-color@npm:1.1.1" peerDependencies: @@ -88,7 +88,7 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-workflow@npm:^2.4.0": +"@adobe/react-spectrum-workflow@npm:2.4.0": version: 2.4.0 resolution: "@adobe/react-spectrum-workflow@npm:2.4.0" peerDependencies: @@ -24745,9 +24745,9 @@ __metadata: dependencies: "@actions/core": "npm:^1.10.0" "@actions/github": "npm:^1.1.0" - "@adobe/react-spectrum-ui": "npm:^1.2.1" - "@adobe/react-spectrum-workflow": "npm:^2.4.0" - "@adobe/react-spectrum-workflow-color": "npm:^1.1.1" + "@adobe/react-spectrum-ui": "npm:1.2.1" + "@adobe/react-spectrum-workflow": "npm:2.4.0" + "@adobe/react-spectrum-workflow-color": "npm:1.1.1" "@babel/cli": "npm:^7.24.1" "@babel/core": "npm:^7.24.3" "@babel/eslint-parser": "npm:^7.27.1" From a5a20ad5f1398222c970d307dd5149307312c0cb Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 16:07:12 -0500 Subject: [PATCH 08/10] diagnose ci issue caused by package changes --- scripts/buildBranchAPI.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/buildBranchAPI.js b/scripts/buildBranchAPI.js index 2e78a52e3d6..7e5a2534130 100644 --- a/scripts/buildBranchAPI.js +++ b/scripts/buildBranchAPI.js @@ -153,7 +153,14 @@ async function build() { continue; } - fs.cpSync(path.join(srcDir, 'packages', path.dirname(p)), path.join(dir, 'packages', path.dirname(p)), {dereference: true, recursive: true}); + const from = path.join(srcDir, 'packages', path.dirname(p)); + const to = path.join(dir, 'packages', path.dirname(p)); + + if (from !== to) { + fs.cpSync(from, to, {dereference: true, recursive: true}); + } else { + console.log(`Skipping copy for ${from} to ${to} as they are the same`); + } if (!p.includes('@react-types')) { delete json.types; From 27436179e3eb834c67c8b449b7b6a6c161a0078a Mon Sep 17 00:00:00 2001 From: Menachem Hornbacher Date: Mon, 8 Dec 2025 16:16:18 -0500 Subject: [PATCH 09/10] add additional logging --- scripts/buildBranchAPI.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/buildBranchAPI.js b/scripts/buildBranchAPI.js index 7e5a2534130..937a89ae539 100644 --- a/scripts/buildBranchAPI.js +++ b/scripts/buildBranchAPI.js @@ -157,6 +157,7 @@ async function build() { const to = path.join(dir, 'packages', path.dirname(p)); if (from !== to) { + console.log(`Copying ${from} to ${to}`); fs.cpSync(from, to, {dereference: true, recursive: true}); } else { console.log(`Skipping copy for ${from} to ${to} as they are the same`); From 24cb76e0f6cfdbc9b1c68431c8336ec6c1def82f Mon Sep 17 00:00:00 2001 From: Robert Snow Date: Tue, 9 Dec 2025 13:46:45 +1100 Subject: [PATCH 10/10] fix packages --- package.json | 4 ---- scripts/buildBranchAPI.js | 10 +-------- yarn.lock | 45 +++------------------------------------ 3 files changed, 4 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index c1d134fd785..5dbdfefd757 100644 --- a/package.json +++ b/package.json @@ -73,9 +73,6 @@ "devDependencies": { "@actions/core": "^1.10.0", "@actions/github": "^1.1.0", - "@adobe/react-spectrum-ui": "1.2.1", - "@adobe/react-spectrum-workflow": "2.4.0", - "@adobe/react-spectrum-workflow-color": "1.1.1", "@babel/cli": "^7.24.1", "@babel/core": "^7.24.3", "@babel/eslint-parser": "^7.27.1", @@ -119,7 +116,6 @@ "@storybook/addon-links": "^8.6.14", "@storybook/addon-onboarding": "^8.6.14", "@storybook/addon-themes": "^8.6.14", - "@storybook/blocks": "^8.6.14", "@storybook/components": "^8.6.14", "@storybook/manager-api": "^8.6.14", "@storybook/preview": "^8.6.14", diff --git a/scripts/buildBranchAPI.js b/scripts/buildBranchAPI.js index 937a89ae539..2e78a52e3d6 100644 --- a/scripts/buildBranchAPI.js +++ b/scripts/buildBranchAPI.js @@ -153,15 +153,7 @@ async function build() { continue; } - const from = path.join(srcDir, 'packages', path.dirname(p)); - const to = path.join(dir, 'packages', path.dirname(p)); - - if (from !== to) { - console.log(`Copying ${from} to ${to}`); - fs.cpSync(from, to, {dereference: true, recursive: true}); - } else { - console.log(`Skipping copy for ${from} to ${to} as they are the same`); - } + fs.cpSync(path.join(srcDir, 'packages', path.dirname(p)), path.join(dir, 'packages', path.dirname(p)), {dereference: true, recursive: true}); if (!p.includes('@react-types')) { delete json.types; diff --git a/yarn.lock b/yarn.lock index d8530d555d0..5777554e5c6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -88,16 +88,6 @@ __metadata: languageName: node linkType: hard -"@adobe/react-spectrum-workflow@npm:2.4.0": - version: 2.4.0 - resolution: "@adobe/react-spectrum-workflow@npm:2.4.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 - checksum: 10c0/13939b30fed9bee4cc31c57bbe00fc9881bdba46704f2db64864dba5334093bcc9a4944f66e1a2be65713351ee61bece9870053ec3e55c0fdad0d98af66c562f - languageName: node - linkType: hard - "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum": version: 0.0.0-use.local resolution: "@adobe/react-spectrum@workspace:packages/@adobe/react-spectrum" @@ -9421,7 +9411,7 @@ __metadata: languageName: node linkType: hard -"@storybook/blocks@npm:8.6.14, @storybook/blocks@npm:^8.6.14": +"@storybook/blocks@npm:8.6.14": version: 8.6.14 resolution: "@storybook/blocks@npm:8.6.14" dependencies: @@ -24648,18 +24638,7 @@ __metadata: languageName: node linkType: hard -"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0": - version: 19.1.0 - resolution: "react-dom@npm:19.1.0" - dependencies: - scheduler: "npm:^0.26.0" - peerDependencies: - react: ^19.1.0 - checksum: 10c0/3e26e89bb6c67c9a6aa86cb888c7a7f8258f2e347a6d2a15299c17eb16e04c19194e3452bc3255bd34000a61e45e2cb51e46292392340432f133e5a5d2dfb5fc - languageName: node - linkType: hard - -"react-dom@npm:^19.2.0": +"react-dom@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react-dom@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react-dom@npm:^19.2.0": version: 19.2.1 resolution: "react-dom@npm:19.2.1" dependencies: @@ -24745,9 +24724,6 @@ __metadata: dependencies: "@actions/core": "npm:^1.10.0" "@actions/github": "npm:^1.1.0" - "@adobe/react-spectrum-ui": "npm:1.2.1" - "@adobe/react-spectrum-workflow": "npm:2.4.0" - "@adobe/react-spectrum-workflow-color": "npm:1.1.1" "@babel/cli": "npm:^7.24.1" "@babel/core": "npm:^7.24.3" "@babel/eslint-parser": "npm:^7.27.1" @@ -24791,7 +24767,6 @@ __metadata: "@storybook/addon-links": "npm:^8.6.14" "@storybook/addon-onboarding": "npm:^8.6.14" "@storybook/addon-themes": "npm:^8.6.14" - "@storybook/blocks": "npm:^8.6.14" "@storybook/components": "npm:^8.6.14" "@storybook/manager-api": "npm:^8.6.14" "@storybook/preview": "npm:^8.6.14" @@ -24943,21 +24918,7 @@ __metadata: languageName: node linkType: hard -"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0": - version: 19.1.0 - resolution: "react@npm:19.1.0" - checksum: 10c0/530fb9a62237d54137a13d2cfb67a7db6a2156faed43eecc423f4713d9b20c6f2728b026b45e28fcd72e8eadb9e9ed4b089e99f5e295d2f0ad3134251bdd3698 - languageName: node - linkType: hard - -"react@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0": - version: 19.1.1 - resolution: "react@npm:19.1.1" - checksum: 10c0/8c9769a2dfd02e603af6445058325e6c8a24b47b185d0e461f66a6454765ddcaecb3f0a90184836c68bb509f3c38248359edbc42f0d07c23eb500a5c30c87b4e - languageName: node - linkType: hard - -"react@npm:^19.2.0": +"react@npm:^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0, react@npm:^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0, react@npm:^19.2.0": version: 19.2.1 resolution: "react@npm:19.2.1" checksum: 10c0/2b5eaf407abb3db84090434c20d6c5a8e447ab7abcd8fe9eaf1ddc299babcf31284ee9db7ea5671d21c85ac5298bd632fa1a7da1ed78d5b368a537f5e1cd5d62