chore: rename react-aria to "@react-aria-nutrient/*"

.storybook-s2/docs/typography.js

@@ -1,6 +1,6 @@
 import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
 import {Link as S2Link} from '@react-spectrum/s2';
-import {useFocusRing, useHover} from 'react-aria';
+import {useFocusRing, useHover} from '@react-aria-nutrient/react-aria';
 
 function AnchorLink({id, isHovered}) {
   let { isFocusVisible, focusProps } = useFocusRing({within: true});

lib/yarn-plugin-rsp-duplicates.js

@@ -24,7 +24,7 @@ module.exports = {
             let packages = new Map();
             let hasRSP = false;
             for (const pkg of project.storedPackages.values()) {
-              if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === 'react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) {
+              if (!structUtils.isVirtualLocator(pkg) && (pkg.scope === '@react-aria-nutrient/react-aria' || pkg.scope === 'react-spectrum' || pkg.scope === 'react-stately')) {
                 let key = `@${pkg.scope}/${pkg.name}`;
                 if (!packages.has(key)) {
                   packages.set(key, new Set([pkg.version]));

packages/@react-aria/autocomplete/docs/useSearchAutocomplete.mdx

@@ -204,7 +204,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/combobox/docs/useComboBox.mdx

@@ -231,7 +231,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/datepicker/docs/useDatePicker.mdx

@@ -244,7 +244,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/datepicker/docs/useDateRangePicker.mdx

@@ -256,7 +256,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/disclosure/docs/useDisclosure.mdx

@@ -72,7 +72,7 @@ This example displays a basic disclosure with a button that toggles the visibili
 import {useDisclosureState} from '@react-stately/disclosure';
 import {useDisclosure} from '@react-aria-nutrient/disclosure';
 import {useButton} from '@react-aria-nutrient/button';
-import {mergeProps, useFocusRing} from 'react-aria';
+import {mergeProps, useFocusRing} from '@react-aria-nutrient/react-aria';
 
 function Disclosure(props) {
   let state = useDisclosureState(props);

packages/@react-aria/menu/docs/useMenu.mdx

@@ -267,7 +267,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/overlays/docs/usePopover.mdx

@@ -81,7 +81,7 @@ The `Popover` component uses an &lt;<TypeLink links={docs.links} type={docs.expo
 <TypeLink links={docs.links} type={docs.exports.usePopover} /> also hides content outside the popover from screen readers, which is important since the surrounding content won't be in context of the original trigger due to the portal. To allow screen reader users to dismiss the popover without a keyboard (e.g. on mobile), visually hidden &lt;<TypeLink links={docs.links} type={docs.exports.DismissButton} />&gt; elements are added at the start and end of the popover. An underlay is also used to prevent scrolling and interacting with elements outside the popover with a pointer, to avoid unintentially repositioning or closing it.
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/select/docs/useSelect.mdx

@@ -208,7 +208,7 @@ See [usePopover](usePopover.html) for more examples of popovers.
   <summary style={{fontWeight: 'bold'}}><ChevronRight size="S" /> Show code</summary>
 
 ```tsx example export=true render=false
-import type {AriaPopoverProps} from 'react-aria';
+import type {AriaPopoverProps} from '@react-aria-nutrient/react-aria';
 import type {OverlayTriggerState} from 'react-stately';
 import {usePopover, Overlay, DismissButton} from '@react-aria-nutrient/overlays';
 

packages/@react-aria/ssr/src/SSRProvider.tsx

@@ -152,14 +152,14 @@ function useLegacySSRSafeId(defaultId?: string): string {
   }
 
   let counter = useCounter(!!defaultId);
-  let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${ctx.prefix}`;
+  let prefix = ctx === defaultContext && process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${ctx.prefix}`;
   return defaultId || `${prefix}-${counter}`;
 }
 
 function useModernSSRSafeId(defaultId?: string): string {
   let id = React.useId();
   let [didSSR] = useState(useIsSSR());
-  let prefix = didSSR || process.env.NODE_ENV === 'test' ? 'react-aria' : `react-aria${defaultContext.prefix}`;
+  let prefix = didSSR || process.env.NODE_ENV === 'test' ? '@react-aria-nutrient/react-aria' : `react-aria${defaultContext.prefix}`;
   return defaultId || `${prefix}-${id}`;
 }
 

packages/@react-aria/ssr/test/SSRProvider.test.js

@@ -30,7 +30,7 @@ describe('SSRProvider', function () {
 
     let divs = tree.getAllByTestId('test');
     if (React.useId) {
-      expect(divs[0].id.startsWith('react-aria')).toBe(true);
+      expect(divs[0].id.startsWith('@react-aria-nutrient/react-aria')).toBe(true);
       expect(divs[0].id).not.toBe(divs[1].id);
     } else {
       expect(divs[0].id).toBe('react-aria-1');
@@ -129,7 +129,7 @@ describe('SSRProvider', function () {
     let env = process.env.NODE_ENV;
     process.env.NODE_ENV = 'test';
     let tree = render(<Test />);
-    expect(/^react-aria-/.test(tree.getByTestId('test').id)).toBe(true);
+    expect(/^@react-aria-nutrient\/react-aria-/.test(tree.getByTestId('test').id)).toBe(true);
     process.env.NODE_ENV = env;
   });
 });

packages/@react-aria/table/stories/example-docs.tsx

@@ -14,7 +14,7 @@ import ariaStyles from './docs-example.css';
 import {classNames} from '@react-spectrum/utils';
 import {mergeProps} from '@react-aria-nutrient/utils';
 import React, {useCallback, useRef} from 'react';
-import {useButton} from 'react-aria';
+import {useButton} from '@react-aria-nutrient/react-aria';
 import {useFocusRing} from '@react-aria-nutrient/focus';
 import {useTable, useTableCell, useTableColumnHeader, useTableColumnResize, useTableHeaderRow, useTableRow, useTableRowGroup} from '@react-aria-nutrient/table';
 import {useTableColumnResizeState, useTableState} from '@react-stately/table';

packages/@react-aria/tabs/docs/useTabList.mdx

@@ -391,7 +391,7 @@ This example uses [React Router](https://reactrouter.com/en/main) to setup route
 
 ```tsx
 import {useLocation, useNavigate, BrowserRouter, Routes, Route} from 'react-router-dom';
-import {RouterProvider} from 'react-aria';
+import {RouterProvider} from '@react-aria-nutrient/react-aria';
 
 function AppTabs() {
   let {pathname} = useLocation();

packages/@react-aria/toast/stories/Example.tsx

@@ -12,7 +12,7 @@
 
 import React, {createContext, useContext, useRef} from 'react';
 import {ToastState, useToastState} from '@react-stately/toast';
-import {useButton} from 'react-aria';
+import {useButton} from '@react-aria-nutrient/react-aria';
 import {useToast, useToastRegion} from '../src';
 
 const ToastContext = createContext<ToastState<string> | null>(null);

packages/@react-spectrum/dropzone/stories/DropZone.stories.tsx

@@ -16,7 +16,7 @@ import {Cell, Column, Row, TableBody, TableHeader, TableView} from '@react-spect
 import {classNames} from '@react-spectrum/utils';
 import {Content} from '@react-spectrum/view';
 import {Draggable} from '@react-aria-nutrient/dnd/stories/dnd.stories';
-import {DropEvent, FileDropItem, TextDropItem, useDrag} from 'react-aria';
+import {DropEvent, FileDropItem, TextDropItem, useDrag} from '@react-aria-nutrient/react-aria';
 import {DropZone} from '../';
 import File from '@spectrum-icons/illustrations/File';
 import {FileTrigger} from 'react-aria-components';

packages/@react-spectrum/s2/chromatic/DropZone.stories.tsx

@@ -14,7 +14,7 @@ import {Button, ButtonGroup, Content, DropZone, FileTrigger, Heading, Illustrate
 import Cloud from '../spectrum-illustrations/linear/Cloud';
 import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
 import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
-import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
+import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria';
 import type {Meta} from '@storybook/react';
 import React, {useState} from 'react';
 import {style} from '../style/spectrum-theme' with { type: 'macro' };

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

@@ -135,6 +135,7 @@
     "@react-aria-nutrient/i18n": "^3.12.7",
     "@react-aria-nutrient/interactions": "^3.24.1",
     "@react-aria-nutrient/live-announcer": "^3.4.1",
+    "@react-aria-nutrient/react-aria": "^3.38.1",
     "@react-aria-nutrient/utils": "^3.28.1",
     "@react-spectrum/utils": "^3.12.3",
     "@react-stately/layout": "^4.2.1",
@@ -146,7 +147,6 @@
     "@react-types/table": "^3.11.0",
     "@react-types/textfield": "^3.12.0",
     "csstype": "^3.0.2",
-    "react-aria": "^3.38.1",
     "react-aria-components": "^1.7.1"
   },
   "peerDependencies": {

packages/@react-spectrum/s2/src/ActionBar.tsx

@@ -16,7 +16,7 @@ import {CloseButton} from './CloseButton';
 import {ContextValue, SlotProps} from 'react-aria-components';
 import {createContext, ForwardedRef, forwardRef, ReactElement, ReactNode, RefObject, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {DOMRef, DOMRefValue, Key} from '@react-types/shared';
-import {FocusScope, useKeyboard} from 'react-aria';
+import {FocusScope, useKeyboard} from '@react-aria-nutrient/react-aria';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
 import {style} from '../style' with {type: 'macro'};

packages/@react-spectrum/s2/src/AvatarGroup.tsx

@@ -18,7 +18,7 @@ import {filterDOMProps} from '@react-aria-nutrient/utils';
 import {getAllowedOverrides, StylesPropWithoutWidth, UnsafeStyles} from './style-utils' with {type: 'macro'};
 import {style} from '../style' with {type: 'macro'};
 import {useDOMRef} from '@react-spectrum/utils';
-import {useLabel} from 'react-aria';
+import {useLabel} from '@react-aria-nutrient/react-aria';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 export interface AvatarGroupProps extends UnsafeStyles, DOMProps, AriaLabelingProps, SlotProps {

packages/@react-spectrum/s2/src/Breadcrumbs.tsx

@@ -23,7 +23,7 @@ import {
   Provider,
   Breadcrumbs as RACBreadcrumbs
 } from 'react-aria-components';
-import {AriaBreadcrumbItemProps, useLocale} from 'react-aria';
+import {AriaBreadcrumbItemProps, useLocale} from '@react-aria-nutrient/react-aria';
 import ChevronIcon from '../ui-icons/Chevron';
 import {Collection, DOMRef, DOMRefValue, LinkDOMProps, Node} from '@react-types/shared';
 import {createContext, forwardRef, Fragment, ReactNode, RefObject, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';

packages/@react-spectrum/s2/src/ComboBox.tsx

@@ -52,7 +52,7 @@ import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
 import {IconContext} from './Icon';
 import {menu} from './Picker';
 import {mergeRefs, useResizeObserver} from '@react-aria-nutrient/utils';
-import {Placement} from 'react-aria';
+import {Placement} from '@react-aria-nutrient/react-aria';
 import {PopoverBase} from './Popover';
 import {pressScale} from './pressScale';
 import {TextFieldRef} from '@react-types/textfield';

packages/@react-spectrum/s2/src/InlineAlert.tsx

@@ -25,7 +25,7 @@ import InfoCircle from '../s2wf-icons/S2_Icon_InfoCircle_20_N.svg';
 import intlMessages from '../intl/*.json';
 import NoticeSquare from '../s2wf-icons/S2_Icon_AlertDiamond_20_N.svg';
 import {useDOMRef} from '@react-spectrum/utils';
-import {useFocusRing} from 'react-aria';
+import {useFocusRing} from '@react-aria-nutrient/react-aria';
 import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 

packages/@react-spectrum/s2/src/Menu.tsx

@@ -42,7 +42,7 @@ import {IconContext} from './Icon'; // chevron right removed??
 import {ImageContext} from './Image';
 import LinkOutIcon from '../ui-icons/LinkOut';
 import {mergeStyles} from '../style/runtime';
-import {Placement, useLocale} from 'react-aria';
+import {Placement, useLocale} from '@react-aria-nutrient/react-aria';
 import {PopoverBase} from './Popover';
 import {PressResponder} from '@react-aria-nutrient/interactions';
 import {pressScale} from './pressScale';

packages/@react-spectrum/s2/src/NumberField.tsx

@@ -32,7 +32,7 @@ import {FormContext} from './Form';
 import {HelpTextProps, SpectrumLabelableProps} from '@react-types/shared';
 import {pressScale} from './pressScale';
 import {TextFieldRef} from '@react-types/textfield';
-import {useButton, useFocusRing, useHover} from 'react-aria';
+import {useButton, useFocusRing, useHover} from '@react-aria-nutrient/react-aria';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
 
 

packages/@react-spectrum/s2/src/Picker.tsx

@@ -56,7 +56,7 @@ import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
 // @ts-ignore
 import intlMessages from '../intl/*.json';
-import {Placement} from 'react-aria';
+import {Placement} from '@react-aria-nutrient/react-aria';
 import {PopoverBase} from './Popover';
 import {PressResponder} from '@react-aria-nutrient/interactions';
 import {pressScale} from './pressScale';

packages/@react-spectrum/s2/src/TableView.tsx

@@ -68,7 +68,7 @@ import {useLoadMore} from '@react-aria-nutrient/utils';
 import {useLocalizedStringFormatter} from '@react-aria-nutrient/i18n';
 import {useScale} from './utils';
 import {useSpectrumContextProps} from './useSpectrumContextProps';
-import {VisuallyHidden} from 'react-aria';
+import {VisuallyHidden} from '@react-aria-nutrient/react-aria';
 
 interface S2TableProps {
   /** Whether the Table should be displayed with a quiet style. */

packages/@react-spectrum/s2/src/TabsPicker.tsx

@@ -44,7 +44,7 @@ import {FocusableRef, FocusableRefValue, SpectrumLabelableProps} from '@react-ty
 import {forwardRefType} from './types';
 import {HeaderContext, HeadingContext, Text, TextContext} from './Content';
 import {IconContext} from './Icon';
-import {Placement} from 'react-aria';
+import {Placement} from '@react-aria-nutrient/react-aria';
 import {PopoverBase} from './Popover';
 import {pressScale} from './pressScale';
 import {raw} from '../style/style-macro' with {type: 'macro'};

packages/@react-spectrum/s2/src/TreeView.tsx

@@ -38,7 +38,7 @@ import {raw} from '../style/style-macro' with {type: 'macro'};
 import React, {createContext, forwardRef, JSXElementConstructor, ReactElement, ReactNode, useContext, useRef} from 'react';
 import {TextContext} from './Content';
 import {useDOMRef} from '@react-spectrum/utils';
-import {useLocale} from 'react-aria';
+import {useLocale} from '@react-aria-nutrient/react-aria';
 import {useScale} from './utils';
 
 interface S2TreeProps {

packages/@react-spectrum/s2/src/useSpectrumContextProps.ts

@@ -12,7 +12,7 @@
 
 import {Context, ForwardedRef, useMemo} from 'react';
 import {ContextValue, SlotProps, useSlottedContext} from 'react-aria-components';
-import {mergeProps, useObjectRef} from 'react-aria';
+import {mergeProps, useObjectRef} from '@react-aria-nutrient/react-aria';
 import {mergeRefs} from '@react-aria-nutrient/utils';
 import {mergeStyles} from '../style/runtime';
 import {RefObject} from '@react-types/shared';

packages/@react-spectrum/s2/stories/Accordion.stories.tsx

@@ -11,7 +11,7 @@
  */
 
 import {Accordion, ActionButton, Disclosure, DisclosureHeader, DisclosurePanel, DisclosureTitle, TextField} from '../src';
-import {Key} from 'react-aria';
+import {Key} from '@react-aria-nutrient/react-aria';
 import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import React from 'react';

packages/@react-spectrum/s2/stories/ActionButton.stories.tsx

@@ -18,7 +18,7 @@ import type {Meta, StoryObj} from '@storybook/react';
 import NewIcon from '../s2wf-icons/S2_Icon_New_20_N.svg';
 import {style} from '../style' with { type: 'macro' };
 import './unsafe.css';
-import {useNumberFormatter} from 'react-aria';
+import {useNumberFormatter} from '@react-aria-nutrient/react-aria';
 
 const meta: Meta<typeof ActionButton> = {
   component: ActionButton,

packages/@react-spectrum/s2/stories/Breadcrumbs.stories.tsx

@@ -55,7 +55,7 @@ export const Example = (args: any) => (
 
 let items = [
   {id: 'home', name: 'Home'},
-  {id: 'react-aria', name: 'React Aria'},
+  {id: '@react-aria-nutrient/react-aria', name: 'React Aria'},
   {id: 'breadcrumbs', name: 'Breadcrumbs'}
 ];
 export const WithActions = (args: any) => (

packages/@react-spectrum/s2/stories/DropZone.stories.tsx

@@ -15,7 +15,7 @@ import {categorizeArgTypes} from './utils';
 import Cloud from '../spectrum-illustrations/linear/Cloud';
 import CloudUpload from '../spectrum-illustrations/gradient/generic1/CloudUpload';
 import DropToUpload from '../spectrum-illustrations/linear/DropToUpload';
-import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from 'react-aria';
+import {FocusRing, mergeProps, useButton, useClipboard, useDrag} from '@react-aria-nutrient/react-aria';
 import type {Meta} from '@storybook/react';
 import React, {useState} from 'react';
 import {style} from '../style' with { type: 'macro' };

packages/@react-stately/combobox/test/useComboBoxState.test.js

@@ -14,7 +14,7 @@ import {actHook as act, renderHook} from '@react-spectrum/test-utils-internal';
 import {Item} from '@react-stately/collections';
 import React from 'react';
 import {useComboBoxState} from '../';
-import {useFilter} from 'react-aria';
+import {useFilter} from '@react-aria-nutrient/react-aria';
 
 describe('useComboBoxState tests', function () {
   describe('open state', function () {

packages/@react-stately/tooltip/test/useTooltipTriggerState.test.js

@@ -11,7 +11,7 @@
  */
 
 import {act, fireEvent, render} from '@react-spectrum/test-utils-internal';
-import {mergeProps, useTooltip, useTooltipTrigger} from 'react-aria';
+import {mergeProps, useTooltip, useTooltipTrigger} from '@react-aria-nutrient/react-aria';
 import React from 'react';
 import {useTooltipTriggerState} from '../src';
 

packages/dev/codemods/src/use-monopackages/src/codemod.ts

@@ -15,7 +15,7 @@ function areSpecifiersAlphabetized(specifiers: ImportSpecifier[]) {
  *
  * Works for:
  * - `@react-spectrum/*` -> `@adobe/react-spectrum`.
- * - `@react-aria-nutrient/*` -> `react-aria`.
+ * - `@react-aria/*` -> `react-aria`.
  * - `@react-stately/*` -> `react-stately`.
  *
  * By default this will apply to all the above packages, or optionally you can specify which packages to apply this by passing a comma-separated list to the packages option: `--packages=react-aria,react-stately,react-spectrum`.

packages/dev/docs/pages/react-aria/home/A11y.tsx

@@ -14,7 +14,7 @@ import {Button} from 'tailwind-starter/Button';
 import {ChevronDown, WifiIcon} from 'lucide-react';
 import {createPortal, flushSync} from 'react-dom';
 import {Finger} from './components';
-import {Key, useDateFormatter} from 'react-aria';
+import {Key, useDateFormatter} from '@react-aria-nutrient/react-aria';
 import {Label} from 'tailwind-starter/Field';
 import {ListBox, Select, SelectValue} from 'react-aria-components';
 import {Popover} from 'tailwind-starter/Popover';

packages/dev/docs/pages/react-aria/home/ExampleApp.tsx

@@ -32,7 +32,7 @@ import {Tag, TagGroup} from 'tailwind-starter/TagGroup';
 import {TextField} from 'tailwind-starter/TextField';
 import {Tooltip} from 'tailwind-starter/Tooltip';
 import {tv} from 'tailwind-variants';
-import {useCollator, useFilter, VisuallyHidden} from 'react-aria';
+import {useCollator, useFilter, VisuallyHidden} from '@react-aria-nutrient/react-aria';
 import {useMediaQuery} from '@react-spectrum/utils';
 
 type Plant = typeof plants[0] & {isFavorite: boolean};