fix: Dependency consolidation fixes (#9830)

* Fix icon dependency

* Move useMessageFormatter to legacy package

* Back compat for @react-aria/i18n/server subpath

Author: devongovett

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

@@ -113,7 +113,6 @@ export {useDateFormatter} from 'react-aria/useDateFormatter';
 export {useFilter} from 'react-aria/useFilter';
 export {useLocale} from 'react-aria/I18nProvider';
 export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
-export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
 export {useNumberFormatter} from 'react-aria/useNumberFormatter';
 export {SSRProvider} from 'react-aria/SSRProvider';
 export {useDragAndDrop} from '../src/dnd/useDragAndDrop';
@@ -220,9 +219,7 @@ export type {DateValue, MappedDateValue} from 'react-stately/useDateFieldState';
 export type {DateRange} from 'react-stately/useDateRangePickerState';
 export type {TimeValue, MappedTimeValue} from 'react-stately/useTimeFieldState';
 export type {Filter} from 'react-aria/useFilter';
-export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
 export type {Locale} from 'react-aria/I18nProvider';
-export type {LocalizedStrings} from '@internationalized/message';
 export type {SSRProviderProps} from 'react-aria/SSRProvider';
 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';
 export type {DragAndDropHooks, DragAndDropOptions} from '../src/dnd/useDragAndDrop';

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

@@ -46,7 +46,6 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@internationalized/message": "^3.1.8",
     "@react-spectrum/style-macro-s1": "3.0.0-alpha.5",
     "@react-types/shared": "^3.33.1",
     "@spectrum-icons/ui": "^3.6.23",

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

@@ -16,7 +16,7 @@
       "require": "./dist/main.js"
     },
     "./server": {
-      "source": "./src/server.tsx",
+      "source": "./src/server.ts",
       "import": "./server/index.mjs",
       "require": "./server/index.js"
     },
@@ -27,7 +27,19 @@
   "types": "dist/types.d.ts",
   "source": "src/index.ts",
   "targets": {
-    "types": false
+    "types": false,
+    "server-module": {
+      "source": "src/server.ts",
+      "outputFormat": "esmodule",
+      "isLibrary": true,
+      "includeNodeModules": false
+    },
+    "server-main": {
+      "source": "src/server.ts",
+      "outputFormat": "commonjs",
+      "isLibrary": true,
+      "includeNodeModules": false
+    }
   },
   "files": [
     "dist",

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

@@ -12,7 +12,7 @@
 
 export {I18nProvider, useLocale} from 'react-aria/I18nProvider';
 
-export {useMessageFormatter} from 'react-aria/private/i18n/useMessageFormatter';
+export {useMessageFormatter} from './useMessageFormatter';
 export {useLocalizedStringFormatter} from 'react-aria/useLocalizedStringFormatter';
 export {useLocalizedStringDictionary} from 'react-aria/private/i18n/useLocalizedStringFormatter';
 export {useListFormatter} from 'react-aria/useListFormatter';
@@ -21,7 +21,7 @@ export {useNumberFormatter} from 'react-aria/useNumberFormatter';
 export {useCollator} from 'react-aria/useCollator';
 export {useFilter} from 'react-aria/useFilter';
 export {isRTL} from 'react-aria/private/i18n/utils';
-export type {FormatMessage} from 'react-aria/private/i18n/useMessageFormatter';
+export type {FormatMessage} from './useMessageFormatter';
 export type {I18nProviderProps, Locale} from 'react-aria/I18nProvider';
 export type {DateFormatterOptions} from 'react-aria/useDateFormatter';
 export type {Filter} from 'react-aria/useFilter';

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

@@ -0,0 +1 @@
+export {PackageLocalizationProvider, getPackageLocalizationScript} from 'react-aria/private/i18n/server';

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

@@ -12,7 +12,7 @@
 
 import {LocalizedStrings, MessageDictionary, MessageFormatter} from '@internationalized/message';
 import {useCallback, useMemo} from 'react';
-import {useLocale} from './I18nProvider';
+import {useLocale} from 'react-aria/I18nProvider';
 
 export type FormatMessage = (key: string, variables?: {[key: string]: any}) => string;
 

packages/@spectrum-icons/ui/scripts/generateIcons.cjs

@@ -38,7 +38,7 @@ function template(iconName) {
     return (
 `import {${iconName} as IconComponent} from '@adobe/react-spectrum-ui/dist/${iconName}.js';
 import {UIIcon, UIIconPropsWithoutChildren} from '@adobe/react-spectrum/private/icon/UIIcon';
-import {useProvider} from '@react-spectrum/provider';
+import {useProvider} from '@adobe/react-spectrum/Provider';
 import React, {JSX} from 'react';
 
 ${jsx}

packages/react-aria/exports/index.ts

@@ -56,7 +56,6 @@ export {useCollator} from '../src/i18n/useCollator';
 export {useDateFormatter} from '../src/i18n/useDateFormatter';
 export {useFilter} from '../src/i18n/useFilter';
 export {useLocalizedStringFormatter} from '../src/i18n/useLocalizedStringFormatter';
-export {useMessageFormatter} from '../src/i18n/useMessageFormatter';
 export {useNumberFormatter} from '../src/i18n/useNumberFormatter';
 export {useListFormatter} from '../src/i18n/useListFormatter';
 export {useFocus} from '../src/interactions/useFocus';
@@ -173,10 +172,8 @@ export type {FocusRingProps} from '../src/focus/FocusRing';
 export type {DateFormatter} from '@internationalized/date';
 export type {DateFormatterOptions} from '../src/i18n/useDateFormatter';
 export type {Filter} from '../src/i18n/useFilter';
-export type {FormatMessage} from '../src/i18n/useMessageFormatter';
 export type {I18nProviderProps, Locale} from '../src/i18n/I18nProvider';
 export type {LocalizedStringFormatter} from '@internationalized/string';
-export type {LocalizedStrings} from '@internationalized/message';
 export type {ClipboardProps, ClipboardResult} from '../src/dnd/useClipboard';
 export type {DirectoryDropItem, DragEndEvent, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragItem, DragMoveEvent, DragPreviewRenderer, DragStartEvent, DragTypes, DropEnterEvent, DropEvent, DropExitEvent, DropItem, DropMoveEvent, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, DropTargetDelegate, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-types/shared';
 export type {DraggableCollectionOptions} from '../src/dnd/useDraggableCollection';

packages/react-aria/exports/private/i18n/useMessageFormatter.ts

@@ -44,7 +44,6 @@
   },
   "dependencies": {
     "@internationalized/date": "^3.12.0",
-    "@internationalized/message": "^3.1.8",
     "@internationalized/number": "^3.6.5",
     "@internationalized/string": "^3.2.7",
     "@react-types/shared": "^3.33.1",