Merge branch 'main' into update-eslint-plugin-react-hooks

# Conflicts:
#	yarn.lock

Author: snowystinger

.circleci/config.yml

@@ -816,9 +816,10 @@ jobs:
       - run:
           name: deploy
           command: |
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt"
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8"
-            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8"
+            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt;*.html;*.rsc"
+            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8" --cache-control "max-age=300"
+            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8" --cache-control "max-age=300"
+            azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.html;*.rsc" --cache-control "max-age=300"
 
   comment:
     executor: rsp

.gitignore

@@ -1,7 +1,6 @@
 .DS_Store
 .cache
 .idea
-.nyc_output
 .package-lock.json
 .parcel-cache
 build-storybook.log

.npmignore

@@ -1,8 +1,6 @@
 .DS_Store
 .storybook
 .editorconfig
-.nycrc
-.nyc_output
 coverage
 Makefile
 yarn.lock

.nycrc

@@ -77,32 +77,6 @@ Or run the documentation and browse to [http://localhost:1234/](http://localhost
 yarn start:docs
 ```
 
-### Component/Hook scaffolding
-If you are looking to contribute a brand new component or Hook in a package that does not exist yet, please run the following command.
-```bash
-yarn plop
-```
-This will start a series of cli prompts to determine what template files and folders should be generated to help quick start your contribution.
-The prompts are as follows:
-
-1. What type of project are you setting up?
-    - Select "React Spectrum v3"
-
-2. Scope name(s)
-    - Select the package scopes that make sense for your contribution (e.g. react-spectrum if you are contributing a component, react-aria for an aria Hook, etc)
-
-3. Package name, all lowercase (e.g. textfield)
-
-4. Component name, please use appropriate uppercase (e.g. TextField)
-    - If you are contributing a non-component Hook, just enter the name of your Hook.
-
-5. Component css module name, blank if N/A. If unsure, check @adobe/spectrum-css-temp/components for a module containing the desired css (e.g. textfield)
-    - If you cannot find the component CSS module name in @adobe/spectrum-css-temp/components, feel free to reach out to a team member via GitHub Issues or Discussions.
-
-Upon answering all the prompts, the appropriate package(s) should be generated and ready for modification.
-
-**Note:** With regards to the generated docs files, please feel free to remove them if you won't be contributing docs. If you are contributing docs for a new component or Hook, please submit them in a separate pull request so that we can decide when to deploy them to our docs site.
-
 ### Tests
 We use [jest](https://jestjs.io/) for unit tests and [react-testing-library](https://testing-library.com/docs/react-testing-library/intro) for rendering and writing assertions. Please make sure you include tests with your pull requests. Our CI will run the tests on PRs as well as the linter and type checker. You can see on each PR whether you have passed all our checks. We split the tests into 2 groups.
 
@@ -154,7 +128,7 @@ yarn start:docs
 Then, open [http://localhost:1234](http://localhost:1234) in your browser.
 
 ### Verdaccio
-We use [Verdaccio](https://verdaccio.org/) to set up a private registry for our packages to test our components in our example apps. 
+We use [Verdaccio](https://verdaccio.org/) to set up a private registry for our packages to test our components in our example apps.
 
 To run verdaccio, first ensure that your `git status` is clean. If your computer has an Intel chip, add the line `shopt -s globstar extglob` in the `verdaccio.sh` file after line 21. Save and commit these changes under a clear message like "Do not push". If you have an Apple silicon chip, you may skip this step.
 

CONTRIBUTING.md

@@ -146,16 +146,16 @@ s2-api-diff:
 	node scripts/api-diff.js --skip-same --skip-style-props
 
 s2-docs:
-	BASE_URL=https://reactspectrum.blob.core.windows.net PUBLIC_URL=/reactspectrum/$$(git rev-parse HEAD)/s2-docs DIST_DIR=dist/$$(git rev-parse HEAD)/s2-docs $(MAKE) build-s2-docs
+	PUBLIC_URL=https://reactspectrum.blob.core.windows.net/reactspectrum/$$(git rev-parse HEAD)/s2-docs DIST_DIR=dist/$$(git rev-parse HEAD)/s2-docs $(MAKE) build-s2-docs
 
 s2-docs-production:
-	BASE_URL=https://react-spectrum.adobe.com PUBLIC_URL=/beta DIST_DIR=dist/production/docs/beta $(MAKE) build-s2-docs
+	PUBLIC_URL=https://react-spectrum.adobe.com/beta DIST_DIR=dist/production/docs/beta $(MAKE) build-s2-docs
 
 build-s2-docs:
 	yarn workspace @react-spectrum/s2-docs generate:md
 	yarn workspace @react-spectrum/s2-docs generate:og
-	REGISTRY_URL=$(BASE_URL)$(PUBLIC_URL)/registry node scripts/buildRegistry.mjs
-	REGISTRY_URL=$(BASE_URL)$(PUBLIC_URL)/registry yarn build:s2-docs --public-url $(PUBLIC_URL)
+	REGISTRY_URL=$(PUBLIC_URL)/registry node scripts/buildRegistry.mjs
+	REGISTRY_URL=$(PUBLIC_URL)/registry yarn build:s2-docs --public-url $(PUBLIC_URL)
 	mkdir -p $(DIST_DIR)
 	mv packages/dev/s2-docs/dist/* $(DIST_DIR)
 	mkdir -p $(DIST_DIR)/registry

Makefile

@@ -23,11 +23,6 @@
         ]
       ]
     },
-    "cover": {
-      "plugins": [
-        "istanbul"
-      ]
-    },
     "production": {
       "plugins": [
         [

babel-esm.config.json

@@ -22,11 +22,6 @@
         ]
       ]
     },
-    "cover": {
-      "plugins": [
-        "istanbul"
-      ]
-    },
     "production": {
       "plugins": [
         [

babel.config.json

@@ -44,7 +44,6 @@
     "build:icons": "babel-node --presets @babel/env ./scripts/buildIcons.js",
     "clean:icons": "babel-node --presets @babel/env ./scripts/cleanIcons.js",
     "postinstall": "patch-package && yarn build:icons",
-    "plop": "plop --plopfile scripts/plopfile.js",
     "chromatic": "NODE_ENV=production CHROMATIC=1 chromatic --project-token $CHROMATIC_PROJECT_TOKEN --build-script-name 'build:chromatic'",
     "chromatic:forced-colors": "NODE_ENV=production CHROMATIC=1 chromatic --project-token $CHROMATIC_FC_PROJECT_TOKEN --build-script-name 'build:chromatic-fc'",
     "merge:css": "babel-node --presets @babel/env ./scripts/merge-spectrum-css.js",
@@ -139,11 +138,9 @@
     "autoprefixer": "^9.6.0",
     "axe-core": "^4.6.3",
     "axe-playwright": "^1.1.11",
-    "babel-plugin-istanbul": "^6.0.0",
     "babel-plugin-macros": "^3.0.1",
     "babel-plugin-react-remove-properties": "^0.3.0",
     "babel-plugin-transform-glob-import": "^1.0.1",
-    "babelify": "^10.0.0",
     "chalk": "^4.1.2",
     "chromatic": "^13.1.3",
     "clsx": "^2.0.0",
@@ -165,8 +162,7 @@
     "fast-check": "^2.19.0",
     "fast-glob": "^3.1.0",
     "fs-extra": "^11.0.0",
-    "glob": "^8.0.3",
-    "glob-promise": "^6.0.5",
+    "glob": "^11.0.3",
     "globals": "^15.11.0",
     "identity-obj-proxy": "^3.0.0",
     "ignore-styles": "^5.0.1",
@@ -181,30 +177,25 @@
     "md5": "^2.2.1",
     "motion": "^12.23.6",
     "npm-cli-login": "^1.0.0",
-    "nyc": "^10.2.0",
-    "p-queue": "^6.2.1",
     "parcel": "^2.16.0",
     "parcel-optimizer-strict-mode": "workspace:^",
     "patch-package": "^6.2.0",
     "playwright": "^1.45.3",
-    "plop": "^2.4.0",
     "postcss": "^8.4.24",
     "postcss-custom-properties": "^13.2.0",
     "postcss-import": "^15.1.0",
     "prettier": "^3.6.2",
     "prop-types": "^15.6.0",
     "raf": "^3.4.0",
     "react": "^19.1.0",
-    "react-axe": "^3.0.2",
     "react-dom": "^19.1.0",
     "react-frame-component": "^5.0.0",
     "react-test-renderer": "^19.1.0",
     "recast": "^0.23",
     "recursive-readdir": "^2.2.2",
     "regenerator-runtime": "0.13.3",
-    "rimraf": "^2.6.3",
+    "rimraf": "^6.0.1",
     "sharp": "^0.33.5",
-    "sinon": "^7.3.1",
     "storybook": "^8.6.14",
     "storybook-dark-mode": "^4.0.2",
     "storybook-react-parcel": "workspace:^",
@@ -217,8 +208,7 @@
     "verdaccio": "^6.0.0",
     "walk-object": "^4.0.0",
     "wsrun": "^5.0.0",
-    "xml": "^1.0.1",
-    "yargs": "^17.2.1"
+    "xml": "^1.0.1"
   },
   "resolutions": {
     "@babel/cli": "7.24.1",
@@ -229,7 +219,7 @@
     "@babel/traverse": "7.24.1",
     "@babel/types": "7.24.0",
     "@mdx-js/react": "2.0.0-rc.2",
-    "postcss": "8.4.24",
+    "postcss": "8.4.31",
     "postcss-custom-properties": "13.2.0",
     "postcss-import": "15.1.0",
     "react-refresh": "0.9.0",