Skip to content

Commit f39e420

Browse files
reidbarberreidbarber
committed
Merge remote-tracking branch 'origin/main' into s1-to-s2-upgrade-skill
2 parents 80d9703 + ffb1a9d commit f39e420

77 files changed

Lines changed: 50 additions & 310 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/@adobe/react-spectrum/exports/index.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ export {useDateFormatter} from 'react-aria/useDateFormatter';
113113
export {useFilter} from 'react-aria/useFilter';
114114
export {useLocale} from 'react-aria/I18nProvider';
115115
export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
116-
export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
117116
export {useNumberFormatter} from 'react-aria/useNumberFormatter';
118117
export {SSRProvider} from 'react-aria/SSRProvider';
119118
export {useDragAndDrop} from '../src/dnd/useDragAndDrop';
@@ -220,9 +219,7 @@ export type {DateValue, MappedDateValue} from 'react-stately/useDateFieldState';
220219
export type {DateRange} from 'react-stately/useDateRangePickerState';
221220
export type {TimeValue, MappedTimeValue} from 'react-stately/useTimeFieldState';
222221
export type {Filter} from 'react-aria/useFilter';
223-
export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
224222
export type {Locale} from 'react-aria/I18nProvider';
225-
export type {LocalizedStrings} from '@internationalized/message';
226223
export type {SSRProviderProps} from 'react-aria/SSRProvider';
227224
export type {DirectoryDropItem, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
228225
export type {DragAndDropHooks, DragAndDropOptions} from '../src/dnd/useDragAndDrop';

‎packages/@adobe/react-spectrum/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
},
4747
"dependencies": {
4848
"@internationalized/date": "^3.12.0",
49-
"@internationalized/message": "^3.1.8",
5049
"@react-spectrum/style-macro-s1": "3.0.0-alpha.5",
5150
"@react-types/shared": "^3.33.1",
5251
"@spectrum-icons/ui": "^3.6.23",

‎packages/@react-aria/i18n/package.json‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"require": "./dist/main.js"
1717
},
1818
"./server": {
19-
"source": "./src/server.tsx",
19+
"source": "./src/server.ts",
2020
"import": "./server/index.mjs",
2121
"require": "./server/index.js"
2222
},
@@ -27,7 +27,19 @@
2727
"types": "dist/types.d.ts",
2828
"source": "src/index.ts",
2929
"targets": {
30-
"types": false
30+
"types": false,
31+
"server-module": {
32+
"source": "src/server.ts",
33+
"outputFormat": "esmodule",
34+
"isLibrary": true,
35+
"includeNodeModules": false
36+
},
37+
"server-main": {
38+
"source": "src/server.ts",
39+
"outputFormat": "commonjs",
40+
"isLibrary": true,
41+
"includeNodeModules": false
42+
}
3143
},
3244
"files": [
3345
"dist",

‎packages/@react-aria/i18n/src/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
export {I18nProvider, useLocale} from 'react-aria/I18nProvider';
1414

15-
export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
15+
export {useMessageFormatter} from './useMessageFormatter';
1616
export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
1717
export {useLocalizedStringDictionary} from 'react-aria/private/i18n/useLocalizedStringFormatter';
1818
export {useListFormatter} from 'react-aria/useListFormatter';
@@ -21,7 +21,7 @@ export {useNumberFormatter} from 'react-aria/useNumberFormatter';
2121
export {useCollator} from 'react-aria/useCollator';
2222
export {useFilter} from 'react-aria/useFilter';
2323
export {isRTL} from 'react-aria/private/i18n/utils';
24-
export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
24+
export type {FormatMessage} from './useMessageFormatter';
2525
export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider';
2626
export type {DateFormatterOptions} from 'react-aria/useDateFormatter';
2727
export type {Filter} from 'react-aria/useFilter';

‎packages/@react-aria/i18n/src/server.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export {PackageLocalizationProvider, getPackageLocalizationScript} from 'react-aria/private/i18n/server';

packages/react-aria/src/i18n/useMessageFormatter.ts renamed to packages/@react-aria/i18n/src/useMessageFormatter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import {LocalizedStrings, MessageDictionary, MessageFormatter} from '@internationalized/message';
1414
import {useCallback, useMemo} from 'react';
15-
import {useLocale} from './I18nProvider';
15+
import {useLocale} from 'react-aria/I18nProvider';
1616

1717
export type FormatMessage = (key: string, variables?: {[key: string]: any}) => string;
1818

‎packages/@react-spectrum/accordion/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@
3737
"@adobe/react-spectrum": "^3.46.2",
3838
"@swc/helpers": "^0.5.0"
3939
},
40-
"devDependencies": {
41-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
42-
},
4340
"peerDependencies": {
4441
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4542
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"

‎packages/@react-spectrum/actionbar/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
43-
},
4441
"peerDependencies": {
4542
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4643
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"

‎packages/@react-spectrum/actiongroup/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
43-
},
4441
"peerDependencies": {
4542
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4643
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"

‎packages/@react-spectrum/autocomplete/package.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
"@swc/helpers": "^0.5.0",
3939
"react-stately": "^3.45.0"
4040
},
41-
"devDependencies": {
42-
"@adobe/spectrum-css-temp": "3.0.0-alpha.1"
43-
},
4441
"peerDependencies": {
4542
"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1",
4643
"react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"

0 commit comments

Comments
 (0)