Skip to content

Commit f099b41

Browse files
authored
fix: Spectrum version bump and pin (#2689)
React Spectrum [recently switched](https://github.com/adobe/react-spectrum/blob/main/rfcs/2025-dependencies.md) from independent packages to packages bound to a specific `@adobe/react-spectrum` version (in minor version bumps across packages). This has led to some broken testing in deephaven/deephaven-plugins#1349 and was flagged as an issue in an enterprise version bump by Copilot. As an example, note the dependency switch from [5.9.0](https://www.npmjs.com/package/@react-spectrum/overlays/v/5.9.0?activeTab=code) to [5.10.0](https://www.npmjs.com/package/@react-spectrum/overlays/v/5.10.0?activeTab=code) of `@react-spectrum/overlays`. This PR pins specific and consistent versions for all react spectrum packages, as well as related ones, even if they aren't in the spectrum namespace, to prevent breakages.
1 parent d3474f6 commit f099b41

7 files changed

Lines changed: 435 additions & 3216 deletions

File tree

package-lock.json

Lines changed: 409 additions & 3196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/app-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"@deephaven/test-utils": "file:../test-utils"
2626
},
2727
"dependencies": {
28-
"@adobe/react-spectrum": "3.38.0",
28+
"@adobe/react-spectrum": "3.47.0",
2929
"@deephaven/auth-plugins": "file:../auth-plugins",
3030
"@deephaven/chart": "file:../chart",
3131
"@deephaven/components": "file:../components",

packages/code-studio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"directory": "packages/code-studio"
1212
},
1313
"dependencies": {
14-
"@adobe/react-spectrum": "3.38.0",
14+
"@adobe/react-spectrum": "3.47.0",
1515
"@deephaven/app-utils": "file:../app-utils",
1616
"@deephaven/auth-plugins": "file:../auth-plugins",
1717
"@deephaven/chart": "file:../chart",

packages/components/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"build:theme": "sass --embed-sources --style=compressed --load-path=../../node_modules ./src/theme:./dist/theme"
2525
},
2626
"dependencies": {
27-
"@adobe/react-spectrum": "3.38.0",
27+
"@adobe/react-spectrum": "3.47.0",
2828
"@deephaven/icons": "file:../icons",
2929
"@deephaven/log": "file:../log",
3030
"@deephaven/react-hooks": "file:../react-hooks",
@@ -35,20 +35,20 @@
3535
"@fortawesome/react-fontawesome": "^0.2.0",
3636
"@hello-pangea/dnd": "^18.0.1",
3737
"@internationalized/date": "^3.5.5",
38-
"@react-aria/focus": "^3.21.0",
39-
"@react-aria/i18n": "^3.12.11",
40-
"@react-spectrum/label": "^3.16.17",
41-
"@react-spectrum/overlays": "^5.8.0",
42-
"@react-spectrum/theme-default": "^3.5.1",
43-
"@react-spectrum/toast": "^3.0.0-beta.16",
44-
"@react-spectrum/utils": "^3.11.5",
45-
"@react-stately/overlays": "^3.6.18",
46-
"@react-stately/utils": "^3.10.8",
47-
"@react-types/combobox": "3.13.1",
48-
"@react-types/radio": "^3.8.1",
49-
"@react-types/shared": "^3.22.1",
50-
"@react-types/textfield": "^3.9.1",
51-
"@spectrum-icons/ui": "^3.6.18",
38+
"@react-aria/focus": "3.22.0",
39+
"@react-aria/i18n": "3.13.0",
40+
"@react-spectrum/label": "3.17.0",
41+
"@react-spectrum/overlays": "5.10.0",
42+
"@react-spectrum/theme-default": "3.6.0",
43+
"@react-spectrum/toast": "3.2.0",
44+
"@react-spectrum/utils": "3.13.0",
45+
"@react-stately/overlays": "3.7.0",
46+
"@react-stately/utils": "3.12.0",
47+
"@react-types/combobox": "3.15.0",
48+
"@react-types/radio": "3.10.0",
49+
"@react-types/shared": "3.34.0",
50+
"@react-types/textfield": "3.13.0",
51+
"@spectrum-icons/ui": "3.7.0",
5252
"bootstrap": "4.6.2",
5353
"classnames": "^2.3.1",
5454
"event-target-shim": "^6.0.2",

packages/components/src/dialogs/ActionButtonDialogTrigger.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import { type ReactElement } from 'react';
2-
import type { SpectrumDialogClose } from '@react-types/dialog';
32
import type { StyleProps } from '@react-types/shared';
43
import type { IconDefinition } from '@fortawesome/fontawesome-common-types';
54
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
6-
import { ActionButton, DialogTrigger, Icon, Text } from '../spectrum';
5+
import {
6+
ActionButton,
7+
DialogTrigger,
8+
Icon,
9+
Text,
10+
type SpectrumDialogClose,
11+
} from '../spectrum';
712
import { Tooltip } from '../popper';
813

914
export interface ActionButtonDialogTriggerProps extends StyleProps {

packages/components/src/spectrum/overlays.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export {
44
ContextualHelp,
55
type SpectrumContextualHelpProps as ContextualHelpProps,
66
Dialog,
7+
type SpectrumDialogClose,
78
type SpectrumDialogProps as DialogProps,
89
DialogContainer,
910
type SpectrumDialogContainerProps as DialogContainerProps,

packages/react-hooks/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"build:babel": "babel ./src --out-dir ./dist --extensions \".ts,.tsx,.js,.jsx\" --source-maps --root-mode upward"
2222
},
2323
"dependencies": {
24-
"@adobe/react-spectrum": "3.38.0",
24+
"@adobe/react-spectrum": "3.47.0",
2525
"@deephaven/log": "file:../log",
2626
"@deephaven/utils": "file:../utils",
2727
"lodash.debounce": "^4.0.8",

0 commit comments

Comments
 (0)