Skip to content

Commit ef401af

Browse files
committed
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
1 parent ce9102c commit ef401af

File tree

961 files changed

+10048
-5130
lines changed

Some content is hidden

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

961 files changed

+10048
-5130
lines changed

.circleci/config.yml

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -179,36 +179,6 @@ jobs:
179179
paths:
180180
- '*/storybook-s2/'
181181

182-
docs:
183-
executor: rsp
184-
steps:
185-
- restore_cache:
186-
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
187-
188-
- run:
189-
name: build docs
190-
command: make website
191-
192-
- persist_to_workspace:
193-
root: dist
194-
paths:
195-
- '*/docs/'
196-
197-
docs-production:
198-
executor: rsp
199-
steps:
200-
- restore_cache:
201-
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
202-
203-
- run:
204-
name: build docs
205-
command: make website-production
206-
207-
- persist_to_workspace:
208-
root: dist
209-
paths:
210-
- '*/docs/'
211-
212182
verdaccio:
213183
executor: rsp
214184
steps:
@@ -231,28 +201,6 @@ jobs:
231201
paths:
232202
- storage
233203

234-
v-docs:
235-
executor: rsp
236-
steps:
237-
- restore_cache:
238-
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
239-
240-
- attach_workspace:
241-
at: /tmp/verdaccio-workspace
242-
243-
- run:
244-
name: build docs off verdaccio
245-
command: |
246-
./scripts/verdaccio-ci.sh
247-
./scripts/verdaccio-build.sh
248-
environment:
249-
VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
250-
251-
- persist_to_workspace:
252-
root: verdaccio_dist
253-
paths:
254-
- '*/verdaccio/docs'
255-
256204
v-rsp-cra-18:
257205
executor: rsp
258206
steps:
@@ -522,18 +470,12 @@ workflows:
522470
- typecheck-docs:
523471
requires:
524472
- install
525-
- docs:
526-
requires:
527-
- install
528473
- verdaccio:
529474
filters:
530475
branches:
531476
only: main
532477
requires:
533478
- install
534-
- v-docs:
535-
requires:
536-
- verdaccio
537479
- v-rsp-cra-18:
538480
requires:
539481
- verdaccio
@@ -574,11 +516,9 @@ workflows:
574516
- lint
575517
- test
576518
- test-esm
577-
- docs
578519
- comment:
579520
name: comment-verdaccio
580521
requires:
581-
- v-docs
582522
- v-rsp-cra-18
583523
- v-webpack-4
584524
- v-nextjs

.storybook-s2/docs/typography.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { style } from '../../packages/@react-spectrum/s2/style/spectrum-theme' with {type: 'macro'};
22
import {Link as S2Link} from '@react-spectrum/s2';
3-
import {useFocusRing, useHover} from 'react-aria';
3+
import {useFocusRing, useHover} from '@react-aria-nutrient/react-aria';
44

55
function AnchorLink({id, isHovered}) {
66
let { isFocusVisible, focusProps } = useFocusRing({within: true});

bin/useLayoutEffectRule.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
return {
1616
ImportDeclaration(node) {
1717
const source = node.source.value;
18-
if (source === '@react-aria/utils' || source === './useLayoutEffect' || source === './') {
18+
if (source === '@react-aria-nutrient/utils' || source === './useLayoutEffect' || source === './') {
1919
return;
2020
}
2121
const importSpecifiers = node.specifiers.filter(specifier => specifier.type === 'ImportSpecifier');
@@ -24,7 +24,7 @@ module.exports = {
2424
(item) => {
2525
let itemName = getName(item);
2626
if (itemName === 'useLayoutEffect') {
27-
context.report(node, 'Please use useLayoutEffect from @react-aria/utils instead.');
27+
context.report(node, 'Please use useLayoutEffect from @react-aria-nutrient/utils instead.');
2828
}
2929
}
3030
);

eslint.config.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -469,10 +469,10 @@ export default [{
469469
rules: {
470470
"no-restricted-globals": [ERROR, {
471471
name: "window",
472-
message: "Use getOwnerWindow from @react-aria/utils instead.",
472+
message: "Use getOwnerWindow from @react-aria-nutrient/utils instead.",
473473
}, {
474474
name: "document",
475-
message: "Use getOwnerDocument from @react-aria/utils instead.",
475+
message: "Use getOwnerDocument from @react-aria-nutrient/utils instead.",
476476
}],
477477
},
478478
}, {
@@ -484,10 +484,10 @@ export default [{
484484
rules: {
485485
"no-restricted-globals": [WARN, {
486486
name: "window",
487-
message: "Use getOwnerWindow from @react-aria/utils instead.",
487+
message: "Use getOwnerWindow from @react-aria-nutrient/utils instead.",
488488
}, {
489489
name: "document",
490-
message: "Use getOwnerDocument from @react-aria/utils instead.",
490+
message: "Use getOwnerDocument from @react-aria-nutrient/utils instead.",
491491
}],
492492
},
493493
}, {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const localesPlugin = require('@react-aria/optimize-locales-plugin');
1+
const localesPlugin = require('@react-aria-nutrient/optimize-locales-plugin');
22
const glob = require('glob');
33

44
/** @type {import('next').NextConfig} */

examples/next-app/next.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const localesPlugin = require('@react-aria/optimize-locales-plugin');
1+
const localesPlugin = require('@react-aria-nutrient/optimize-locales-plugin');
22
const glob = require('glob');
33

44
/** @type {import('next').NextConfig} */

examples/rac-tailwind/.parcelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "@parcel/config-default",
3-
"resolvers": ["@react-aria/parcel-resolver-optimize-locales", "@parcel/resolver-glob", "..."],
3+
"resolvers": ["@react-aria-nutrient/parcel-resolver-optimize-locales", "@parcel/resolver-glob", "..."],
44
"transformers": {
55
"**/intl/*.json": ["parcel-transformer-intl"]
66
}

examples/rac-tailwind/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"dependencies": {
1111
"@heroicons/react": "^2.0.16",
12-
"@react-aria/parcel-resolver-optimize-locales": "^1.0.0",
12+
"@react-aria-nutrient/parcel-resolver-optimize-locales": "^1.0.0",
1313
"@tailwindcss/postcss": "^4.0.0",
1414
"framer-motion": "^10.12.16",
1515
"parcel": "^2.13.0",

examples/remix/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { unstable_vitePlugin as remix } from "@remix-run/dev";
22
import { defineConfig } from "vite";
33
import tsconfigPaths from "vite-tsconfig-paths";
4-
import optimizeLocales from '@react-aria/optimize-locales-plugin';
4+
import optimizeLocales from '@react-aria-nutrient/optimize-locales-plugin';
55

66
export default defineConfig({
77
plugins: [

examples/rsp-cra-18/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@adobe/react-spectrum": "latest",
99
"@babel/plugin-proposal-private-property-in-object": "^7.16.7",
1010
"@babel/preset-react": "^7.24.1",
11-
"@react-aria/dnd": "^3.6.1",
11+
"@react-aria-nutrient/dnd": "^3.6.1",
1212
"@react-spectrum/provider": "^3.9.7",
1313
"@react-spectrum/toast": "^3.0.0-beta.16",
1414
"@spectrum-icons/illustrations": "^3.6.8",

0 commit comments

Comments
 (0)