refactor: Rename @react-aria/* to @react-aria-nutrient/* (#2)

* Rename packages

* chore: update @react-aria-nutrient/aria-modal-polyfill version to 3.7.13 in package.json

* chore: update @react-aria-nutrient/aria-modal-polyfill version in yarn.lock to 3.7.13

* chore: update @react-aria-nutrient/aria-modal-polyfill version to ^3.7.13 in package.json

* chore: replace @react-aria-nutrient/aria-modal-polyfill with @react-aria/aria-modal-polyfill in package.json and yarn.lock

* chore: update dependencies to use @react-aria/interactions and @react-aria/visually-hidden in package.json and yarn.lock

* chore: remove 'docs' job from CircleCI workflow and update dependencies for comment job

* chore: remove 'docs' and 'v-docs' jobs from CircleCI configuration to streamline workflow

* fixes

* fix: update import paths from @react-aria-nutrient to @react-aria for numberfield and dnd components

* fix: update Makefile to correct package paths by replacing @react-aria-nutrient with @react-aria

* fix: update linting script to replace @react-aria-nutrient/example-theme with @react-aria/example-theme

* chore: rename react-aria to "@react-aria-nutrient/*" (#5)

* Rename react-aria to "@react-aria-nutrient/*"

* chore: update dependencies to include @react-aria-nutrient/react-aria version ^3.38.1 in package.json and yarn.lock

* fix: update path for react-aria components to remove namespace prefix

* fix: update test to reflect new namespace for react-aria components

* fix: update documentation paths to include aria-nutrient namespace in package.json

* fixes

Author: ritz078

.circleci/config.yml

@@ -179,36 +179,6 @@ jobs:
           paths:
             - '*/storybook-s2/'
 
-  docs:
-    executor: rsp
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - run:
-          name: build docs
-          command: make website
-
-      - persist_to_workspace:
-          root: dist
-          paths:
-            - '*/docs/'
-
-  docs-production:
-    executor: rsp
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - run:
-          name: build docs
-          command: make website-production
-
-      - persist_to_workspace:
-          root: dist
-          paths:
-            - '*/docs/'
-
   verdaccio:
     executor: rsp
     steps:
@@ -231,28 +201,6 @@ jobs:
           paths:
             - storage
 
-  v-docs:
-    executor: rsp
-    steps:
-      - restore_cache:
-          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
-
-      - attach_workspace:
-          at: /tmp/verdaccio-workspace
-
-      - run:
-          name: build docs off verdaccio
-          command: |
-            ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build.sh
-          environment:
-            VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
-
-      - persist_to_workspace:
-          root: verdaccio_dist
-          paths:
-            - '*/verdaccio/docs'
-
   v-rsp-cra-18:
     executor: rsp
     steps:
@@ -522,18 +470,12 @@ workflows:
       - typecheck-docs:
           requires:
             - install
-      - docs:
-          requires:
-            - install
       - verdaccio:
           filters:
             branches:
               only: main
           requires:
             - install
-      - v-docs:
-          requires:
-            - verdaccio
       - v-rsp-cra-18:
           requires:
             - verdaccio
@@ -574,11 +516,9 @@ workflows:
             - lint
             - test
             - test-esm
-            - docs
       - comment:
           name: comment-verdaccio
           requires:
-            - v-docs
             - v-rsp-cra-18
             - v-webpack-4
             - v-nextjs

.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});

bin/useLayoutEffectRule.js

@@ -15,7 +15,7 @@ module.exports = {
     return {
       ImportDeclaration(node) {
         const source = node.source.value;
-        if (source === '@react-aria/utils' || source === './useLayoutEffect' || source === './') {
+        if (source === '@react-aria-nutrient/utils' || source === './useLayoutEffect' || source === './') {
           return;
         }
         const importSpecifiers = node.specifiers.filter(specifier => specifier.type === 'ImportSpecifier');
@@ -24,7 +24,7 @@ module.exports = {
           (item) => {
             let itemName = getName(item);
             if (itemName === 'useLayoutEffect') {
-              context.report(node, 'Please use useLayoutEffect from @react-aria/utils instead.');
+              context.report(node, 'Please use useLayoutEffect from @react-aria-nutrient/utils instead.');
             }
           }
         );

eslint.config.mjs

@@ -469,10 +469,10 @@ export default [{
     rules: {
         "no-restricted-globals": [ERROR, {
             name: "window",
-            message: "Use getOwnerWindow from @react-aria/utils instead.",
+            message: "Use getOwnerWindow from @react-aria-nutrient/utils instead.",
         }, {
             name: "document",
-            message: "Use getOwnerDocument from @react-aria/utils instead.",
+            message: "Use getOwnerDocument from @react-aria-nutrient/utils instead.",
         }],
     },
 }, {
@@ -484,10 +484,10 @@ export default [{
     rules: {
         "no-restricted-globals": [WARN, {
             name: "window",
-            message: "Use getOwnerWindow from @react-aria/utils instead.",
+            message: "Use getOwnerWindow from @react-aria-nutrient/utils instead.",
         }, {
             name: "document",
-            message: "Use getOwnerDocument from @react-aria/utils instead.",
+            message: "Use getOwnerDocument from @react-aria-nutrient/utils instead.",
         }],
     },
 }, {

examples/next-app-csp/next.config.js

@@ -1,4 +1,4 @@
-const localesPlugin = require('@react-aria/optimize-locales-plugin');
+const localesPlugin = require('@react-aria-nutrient/optimize-locales-plugin');
 const glob = require('glob');
 
 /** @type {import('next').NextConfig} */

examples/next-app/next.config.js

@@ -1,4 +1,4 @@
-const localesPlugin = require('@react-aria/optimize-locales-plugin');
+const localesPlugin = require('@react-aria-nutrient/optimize-locales-plugin');
 const glob = require('glob');
 
 /** @type {import('next').NextConfig} */

examples/rac-tailwind/.parcelrc

@@ -1,6 +1,6 @@
 {
   "extends": "@parcel/config-default",
-  "resolvers": ["@react-aria/parcel-resolver-optimize-locales", "@parcel/resolver-glob", "..."],
+  "resolvers": ["@react-aria-nutrient/parcel-resolver-optimize-locales", "@parcel/resolver-glob", "..."],
   "transformers": {
     "**/intl/*.json": ["parcel-transformer-intl"]
   }

examples/rac-tailwind/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@heroicons/react": "^2.0.16",
-    "@react-aria/parcel-resolver-optimize-locales": "^1.0.0",
+    "@react-aria-nutrient/parcel-resolver-optimize-locales": "^1.0.0",
     "@tailwindcss/postcss": "^4.0.0",
     "framer-motion": "^10.12.16",
     "parcel": "^2.13.0",

examples/remix/vite.config.ts

@@ -1,7 +1,7 @@
 import { unstable_vitePlugin as remix } from "@remix-run/dev";
 import { defineConfig } from "vite";
 import tsconfigPaths from "vite-tsconfig-paths";
-import optimizeLocales from '@react-aria/optimize-locales-plugin';
+import optimizeLocales from '@react-aria-nutrient/optimize-locales-plugin';
 
 export default defineConfig({
   plugins: [

examples/rsp-cra-18/package.json

@@ -8,7 +8,7 @@
     "@adobe/react-spectrum": "latest",
     "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
     "@babel/preset-react": "^7.24.1",
-    "@react-aria/dnd": "^3.6.1",
+    "@react-aria-nutrient/dnd": "^3.6.1",
     "@react-spectrum/provider": "^3.9.7",
     "@react-spectrum/toast": "^3.0.0-beta.16",
     "@spectrum-icons/illustrations": "^3.6.8",

examples/rsp-cra-18/src/sections/DragAndDropExamples.tsx

@@ -1,7 +1,7 @@
 import {DropZone, Flex, Divider, IllustratedMessage, Heading} from '@adobe/react-spectrum';
 import React from 'react';
 import Upload from '@spectrum-icons/illustrations/Upload';
-import {useDrag} from '@react-aria/dnd';
+import {useDrag} from '@react-aria-nutrient/dnd';
 
 export default function DragAndDropExamples() {
   let [isFilled, setIsFilled] = React.useState(false);

examples/rsp-next-ts/next.config.mjs

@@ -1,4 +1,4 @@
-import localesPlugin from '@react-aria/optimize-locales-plugin';
+import localesPlugin from '@react-aria-nutrient/optimize-locales-plugin';
 import {glob} from 'glob';
 
 export default {

examples/rsp-next-ts/package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@adobe/react-spectrum": "^3.35.0",
-    "@react-aria/optimize-locales-plugin": "^1.1.0",
+    "@react-aria-nutrient/optimize-locales-plugin": "^1.1.0",
     "@react-spectrum/provider": "^3.9.7",
     "@react-spectrum/toast": "^3.0.0-beta.16",
     "@spectrum-icons/illustrations": "^3.6.12",

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/@adobe/react-spectrum/package.json

@@ -38,11 +38,11 @@
   },
   "dependencies": {
     "@internationalized/string": "^3.2.5",
-    "@react-aria/collections": "3.0.0-beta.1",
-    "@react-aria/i18n": "^3.12.7",
-    "@react-aria/ssr": "^3.9.7",
-    "@react-aria/utils": "^3.28.1",
-    "@react-aria/visually-hidden": "^3.8.21",
+    "@react-aria-nutrient/collections": "3.0.0-beta.1",
+    "@react-aria-nutrient/i18n": "^3.12.7",
+    "@react-aria-nutrient/ssr": "^3.9.7",
+    "@react-aria-nutrient/utils": "^3.28.1",
+    "@react-aria-nutrient/visually-hidden": "^3.8.21",
     "@react-spectrum/accordion": "^3.0.4",
     "@react-spectrum/actionbar": "^3.6.5",
     "@react-spectrum/actiongroup": "^3.10.13",

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

@@ -68,11 +68,11 @@ export {Content, Footer, Header, View} from '@react-spectrum/view';
 export {Well} from '@react-spectrum/well';
 export {Item, Section} from '@react-stately/collections';
 export {useAsyncList, useListData, useTreeData} from '@react-stately/data';
-export {VisuallyHidden} from '@react-aria/visually-hidden';
-export {useCollator, useDateFormatter, useFilter, useLocale, useLocalizedStringFormatter, useMessageFormatter, useNumberFormatter} from '@react-aria/i18n';
-export {SSRProvider} from '@react-aria/ssr';
+export {VisuallyHidden} from '@react-aria-nutrient/visually-hidden';
+export {useCollator, useDateFormatter, useFilter, useLocale, useLocalizedStringFormatter, useMessageFormatter, useNumberFormatter} from '@react-aria-nutrient/i18n';
+export {SSRProvider} from '@react-aria-nutrient/ssr';
 export {useDragAndDrop, DIRECTORY_DRAG_TYPE} from '@react-spectrum/dnd';
-export {Collection} from '@react-aria/collections';
+export {Collection} from '@react-aria-nutrient/collections';
 
 export type {SpectrumActionBarContainerProps, SpectrumActionBarProps} from '@react-spectrum/actionbar';
 export type {SpectrumActionGroupProps} from '@react-spectrum/actiongroup';
@@ -123,9 +123,9 @@ export type {SpectrumTreeViewProps, SpectrumTreeViewItemProps, SpectrumTreeViewI
 export type {ContentProps, FooterProps, HeaderProps, ViewProps} from '@react-spectrum/view';
 export type {SpectrumWellProps} from '@react-spectrum/well';
 export type {AsyncListData, AsyncListOptions, ListData, ListOptions, TreeData, TreeOptions} from '@react-stately/data';
-export type {VisuallyHiddenAria, VisuallyHiddenProps} from '@react-aria/visually-hidden';
-export type {DateFormatter, DateFormatterOptions, Filter, FormatMessage, Locale, LocalizedStrings} from '@react-aria/i18n';
-export type {SSRProviderProps} from '@react-aria/ssr';
+export type {VisuallyHiddenAria, VisuallyHiddenProps} from '@react-aria-nutrient/visually-hidden';
+export type {DateFormatter, DateFormatterOptions, Filter, FormatMessage, Locale, LocalizedStrings} from '@react-aria-nutrient/i18n';
+export type {SSRProviderProps} from '@react-aria-nutrient/ssr';
 export type {DirectoryDropItem, DragAndDropHooks, DragAndDropOptions, DraggableCollectionEndEvent, DraggableCollectionMoveEvent, DraggableCollectionStartEvent, DragPreviewRenderer, DragTypes, DropItem, DropOperation, DroppableCollectionDropEvent, DroppableCollectionEnterEvent, DroppableCollectionExitEvent, DroppableCollectionInsertDropEvent, DroppableCollectionMoveEvent, DroppableCollectionOnItemDropEvent, DroppableCollectionReorderEvent, DroppableCollectionRootDropEvent, DropPosition, DropTarget, FileDropItem, ItemDropTarget, RootDropTarget, TextDropItem} from '@react-spectrum/dnd';
 export type {Key, Selection, ItemProps, SectionProps, RouterConfig} from '@react-types/shared';
 export type {SpectrumAccordionProps, SpectrumDisclosureProps, SpectrumDisclosurePanelProps, SpectrumDisclosureTitleProps} from '@react-spectrum/accordion';

packages/@internationalized/number/src/NumberFormatter.ts

@@ -190,7 +190,7 @@ export function numberFormatSignDisplayPolyfill(numberFormat: Intl.NumberFormat,
       // ignore RTL/LTR marker character
       let minus = negative.replace(noSign, '').replace(/\u200e|\u061C/, '');
       if ([...minus].length !== 1) {
-        console.warn('@react-aria/i18n polyfill for NumberFormat signDisplay: Unsupported case');
+        console.warn('@react-aria-nutrient/i18n polyfill for NumberFormat signDisplay: Unsupported case');
       }
       let positive = negative.replace(noSign, '!!!').replace(minus, '+').replace('!!!', noSign);
       return positive;

packages/@react-aria/actiongroup/README.md

@@ -1,3 +1,3 @@
-# @react-aria/actiongroup
+# @react-aria-nutrient/actiongroup
 
 This package is part of [react-spectrum](https://github.com/adobe/react-spectrum). See the repo for more details.

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

@@ -1,5 +1,5 @@
 {
-  "name": "@react-aria/actiongroup",
+  "name": "@react-aria-nutrient/actiongroup",
   "version": "3.7.14",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",
@@ -22,10 +22,10 @@
     "url": "https://github.com/adobe/react-spectrum"
   },
   "dependencies": {
-    "@react-aria/focus": "^3.20.1",
-    "@react-aria/i18n": "^3.12.7",
-    "@react-aria/interactions": "^3.24.1",
-    "@react-aria/utils": "^3.28.1",
+    "@react-aria-nutrient/focus": "^3.20.1",
+    "@react-aria-nutrient/i18n": "^3.12.7",
+    "@react-aria-nutrient/interactions": "^3.24.1",
+    "@react-aria-nutrient/utils": "^3.28.1",
     "@react-stately/list": "^3.12.0",
     "@react-types/actiongroup": "^3.4.15",
     "@react-types/shared": "^3.28.0",

packages/@react-aria/actiongroup/src/useActionGroup.ts

@@ -11,11 +11,11 @@
  */
 
 import {AriaActionGroupProps} from '@react-types/actiongroup';
-import {createFocusManager} from '@react-aria/focus';
+import {createFocusManager} from '@react-aria-nutrient/focus';
 import {DOMAttributes, FocusableElement, Orientation, RefObject} from '@react-types/shared';
-import {filterDOMProps, useLayoutEffect} from '@react-aria/utils';
+import {filterDOMProps, useLayoutEffect} from '@react-aria-nutrient/utils';
 import {ListState} from '@react-stately/list';
-import {useLocale} from '@react-aria/i18n';
+import {useLocale} from '@react-aria-nutrient/i18n';
 import {useState} from 'react';
 
 const BUTTON_GROUP_ROLES = {

packages/@react-aria/actiongroup/src/useActionGroupItem.ts

@@ -12,8 +12,8 @@
 
 import {DOMAttributes, FocusableElement, Key, RefObject} from '@react-types/shared';
 import {ListState} from '@react-stately/list';
-import {mergeProps, useEffectEvent} from '@react-aria/utils';
-import {PressProps} from '@react-aria/interactions';
+import {mergeProps, useEffectEvent} from '@react-aria-nutrient/utils';
+import {PressProps} from '@react-aria-nutrient/interactions';
 import {useEffect} from 'react';
 
 export interface AriaActionGroupItemProps {

packages/@react-aria/aria-modal-polyfill/README.md

@@ -1,4 +1,4 @@
-# @react-aria/aria-modal-polyfill
+# @react-aria-nutrient/aria-modal-polyfill
 
 This package is part of [react-spectrum](https://github.com/adobe/react-spectrum).
 Certain browser + screen reader combinations do not implement aria-modal correctly, allowing users to navigate outside of the modal.
@@ -7,7 +7,7 @@ This package watches a container for aria-modal nodes and hides the rest of the
 ## How to use
 Include this once in your application at the top level before modals are rendered.
 ```
-import {watchModals} from '@react-aria/aria-modal-polyfill';
+import {watchModals} from '@react-aria-nutrient/aria-modal-polyfill';
 watchModals();
 ```
 

packages/@react-aria/aria-modal-polyfill/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@react-aria/aria-modal-polyfill",
+  "name": "@react-aria-nutrient/aria-modal-polyfill",
   "version": "3.7.13",
   "description": "Spectrum UI components in React",
   "license": "Apache-2.0",

packages/@react-aria/autocomplete/README.md

@@ -1,3 +1,3 @@
-# @react-aria/autocomplete
+# @react-aria-nutrient/autocomplete
 
 This package is part of [react-spectrum](https://github.com/adobe/react-spectrum). See the repo for more details.

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

@@ -10,9 +10,9 @@ governing permissions and limitations under the License. */}
 import {Layout} from '@react-spectrum/docs';
 export default Layout;
 
-import docs from 'docs:@react-aria/autocomplete';
+import docs from 'docs:@react-aria-nutrient/autocomplete';
 import {FunctionAPI, HeaderInfo, InterfaceType, TypeContext, TypeLink, PageDescription} from '@react-spectrum/docs';
-import packageData from '@react-aria/autocomplete/package.json';
+import packageData from '@react-aria-nutrient/autocomplete/package.json';
 import statelyDocs from 'docs:@react-stately/autocomplete';
 import {InlineAlert, Content, Heading} from '@adobe/react-spectrum';