Merge branch 'main' of github.com:adobe/react-spectrum into loadmore_rac

LFDanLu · LFDanLu · commit fb0aff35a245 · 2025-05-09T10:58:13.000-07:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -13,28 +13,25 @@ parameters:
     type: string
     default: ""
 
-orbs:
-  azure-cli: circleci/azure-cli@1.2.0
-
 executors:
   rsp:
     docker:
-      - image: cimg/node:20.18.2
+      - image: cimg/node:22.13.1
     environment:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
   rsp-large:
     docker:
-      - image: cimg/node:20.18.2
+      - image: cimg/node:22.13.1
     resource_class: large
     environment:
       CACHE_VERSION: v1
     working_directory: ~/react-spectrum
 
   rsp-xlarge:
     docker:
-      - image: cimg/node:20.18.2
+      - image: cimg/node:22.13.1
     resource_class: xlarge
     environment:
       CACHE_VERSION: v1
@@ -786,7 +783,6 @@ jobs:
           command: make publish-nightly
 
 workflows:
-  version: 2
   commit:
     jobs:
       - install
diff --git a/.github/actions/branch/action.yml b/.github/actions/branch/action.yml
@@ -1,5 +1,5 @@
 name: 'Branch from fork'
 description: 'creates a branch based off PR from fork'
 runs:
-  using: 'node20'
+  using: 'node22'
   main: 'index.js'
diff --git a/.github/actions/comment/action.yml b/.github/actions/comment/action.yml
@@ -1,5 +1,5 @@
 name: 'PR Comment'
 description: 'Comment on the PR attached to a commit'
 runs:
-  using: 'node20'
+  using: 'node22'
   main: 'index.js'
diff --git a/.github/actions/permissions/action.yml b/.github/actions/permissions/action.yml
@@ -1,5 +1,5 @@
 name: 'Check permissions'
 description: 'Checks if commentor has write access or above'
 runs:
-  using: 'node20'
+  using: 'node22'
   main: 'index.js'
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-20.*
+22.*
diff --git a/examples/remix/package.json b/examples/remix/package.json
@@ -30,7 +30,7 @@
     "vite-tsconfig-paths": "^4.2.1"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22.0.0"
   },
   "workspaces": [
     "../../packages/react-aria-components",
diff --git a/examples/rsp-webpack-4/package.json b/examples/rsp-webpack-4/package.json
@@ -19,24 +19,23 @@
   "dependencies": {
     "@adobe/react-spectrum": "^3.24.1",
     "@react-spectrum/provider": "^3.9.7",
-    "@react-spectrum/tag": "^3.0.0-rc.0",
     "@spectrum-icons/workflow": "^4.2.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.3",
     "@babel/cli": "^7.24.3",
+    "@babel/core": "^7.24.3",
     "@babel/preset-env": "^7.24.3",
     "@babel/preset-react": "^7.24.1",
-    "webpack": "4.46.0",
-    "webpack-cli": "3.1.1",
-    "webpack-dev-server": "3.1.8",
+    "babel-loader": "^8.0.2",
+    "css-loader": "^1.0.0",
+    "jest": "^29",
+    "patch-package": "^8.0.0",
     "style-loader": "0.23.0",
-    "css-loader": "1.0.0",
-    "babel-loader": "8.0.2",
-    "jest": "^26",
-    "patch-package": "^8.0.0"
+    "webpack": "^4.46.0",
+    "webpack-cli": "^3.1.1",
+    "webpack-dev-server": "^3.1.8"
   },
   "resolutions": {
     "terser-webpack-plugin": "4.2.3"
diff --git a/examples/rsp-webpack-4/patches/terser-webpack-plugin+4.2.3.patch b/examples/rsp-webpack-4/patches/terser-webpack-plugin+4.2.3.patch
diff --git a/examples/rsp-webpack-4/patches/webpack+4.46.0.patch b/examples/rsp-webpack-4/patches/webpack+4.46.0.patch
diff --git a/package.json b/package.json
@@ -161,7 +161,7 @@
     "fast-check": "^2.19.0",
     "fast-glob": "^3.1.0",
     "framer-motion": "^11.3.0-alpha.0",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^11.0.0",
     "glob": "^8.0.3",
     "glob-promise": "^6.0.5",
     "globals": "^15.11.0",
diff --git a/packages/@internationalized/date/tests/DateFormatter.test.js b/packages/@internationalized/date/tests/DateFormatter.test.js
@@ -78,8 +78,8 @@ describe('DateFormatter', function () {
     expect(formatter.resolvedOptions().hourCycle).toBe('h12');
 
     formatter = new DateFormatter('ja', {hour: 'numeric', hour12: true});
-    expect(formatter.format(new Date(2020, 1, 3, 0))).toBe('午前0時');
-    expect(formatter.resolvedOptions().hourCycle).toBe('h11');
+    expect(formatter.format(new Date(2020, 1, 3, 0))).toBe('午前12時');
+    expect(formatter.resolvedOptions().hourCycle).toBe('h12');
   });
 
   it('should work around buggy resolved hour cycle', function () {
diff --git a/packages/@spectrum-icons/build-tools/package.json b/packages/@spectrum-icons/build-tools/package.json
@@ -11,7 +11,7 @@
   "private": true,
   "dependencies": {
     "@svgr/core": "^8.1.0",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^11.0.0"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/@spectrum-icons/express/package.json b/packages/@spectrum-icons/express/package.json
@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "@spectrum-icons/build-tools": "3.0.0-alpha.1",
-    "fs-extra": "^10.0.0"
+    "fs-extra": "^11.0.0"
   },
   "peerDependencies": {
     "@react-spectrum/provider": "^3.0.0",
diff --git a/scripts/verdaccio-build-nextjs.sh b/scripts/verdaccio-build-nextjs.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-rac-rsp-tailwind.sh b/scripts/verdaccio-build-rac-rsp-tailwind.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-rac-tailwind.sh b/scripts/verdaccio-build-rac-tailwind.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-rsp-cra-18.sh b/scripts/verdaccio-build-rsp-cra-18.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-s2-parcel.sh b/scripts/verdaccio-build-s2-parcel.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-s2-webpack.sh b/scripts/verdaccio-build-s2-webpack.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build-webpack-4.sh b/scripts/verdaccio-build-webpack-4.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-build.sh b/scripts/verdaccio-build.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-ci.sh b/scripts/verdaccio-ci.sh
@@ -3,6 +3,7 @@
 port=4000
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 
 set -e
 
diff --git a/scripts/verdaccio-deploy.sh b/scripts/verdaccio-deploy.sh
@@ -5,7 +5,7 @@ port=4000
 original_registry=`npm get registry`
 registry="http://localhost:$port"
 output="output.out"
-ci=false
+touch $output
 
 echo "Build and deploy to verdaccio"
 
diff --git a/scripts/verdaccio.sh b/scripts/verdaccio.sh
@@ -5,6 +5,7 @@ port=4000
 original_registry=`npm get registry`
 registry="http://localhost:$port"
 output="output.out"
+touch $output
 ci=false
 commit_to_revert="HEAD"
 
diff --git a/yarn.lock b/yarn.lock
