Skip to content

Commit ef27de0

Browse files
authored
chore: update to node 22 (#8101)
* chore: update to node 22 * fix tests * fix test again * update fs-extra * make verdaccio scripts more resistant to breaking * maybe fix webpack 4 build * more trying to fix the build * actually fix the build * turn off verdaccio again
1 parent 22a9d27 commit ef27de0

25 files changed

+39
-191
lines changed

.circleci/config.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,25 @@ parameters:
1313
type: string
1414
default: ""
1515

16-
orbs:
17-
azure-cli: circleci/azure-cli@1.2.0
18-
1916
executors:
2017
rsp:
2118
docker:
22-
- image: cimg/node:20.18.2
19+
- image: cimg/node:22.13.1
2320
environment:
2421
CACHE_VERSION: v1
2522
working_directory: ~/react-spectrum
2623

2724
rsp-large:
2825
docker:
29-
- image: cimg/node:20.18.2
26+
- image: cimg/node:22.13.1
3027
resource_class: large
3128
environment:
3229
CACHE_VERSION: v1
3330
working_directory: ~/react-spectrum
3431

3532
rsp-xlarge:
3633
docker:
37-
- image: cimg/node:20.18.2
34+
- image: cimg/node:22.13.1
3835
resource_class: xlarge
3936
environment:
4037
CACHE_VERSION: v1
@@ -786,7 +783,6 @@ jobs:
786783
command: make publish-nightly
787784

788785
workflows:
789-
version: 2
790786
commit:
791787
jobs:
792788
- install

.github/actions/branch/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'Branch from fork'
22
description: 'creates a branch based off PR from fork'
33
runs:
4-
using: 'node20'
4+
using: 'node22'
55
main: 'index.js'

.github/actions/comment/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'PR Comment'
22
description: 'Comment on the PR attached to a commit'
33
runs:
4-
using: 'node20'
4+
using: 'node22'
55
main: 'index.js'
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'Check permissions'
22
description: 'Checks if commentor has write access or above'
33
runs:
4-
using: 'node20'
4+
using: 'node22'
55
main: 'index.js'

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.*
1+
22.*

examples/remix/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"vite-tsconfig-paths": "^4.2.1"
3131
},
3232
"engines": {
33-
"node": ">=20.0.0"
33+
"node": ">=22.0.0"
3434
},
3535
"workspaces": [
3636
"../../packages/react-aria-components",

examples/rsp-webpack-4/package.json

+8-9
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,23 @@
1919
"dependencies": {
2020
"@adobe/react-spectrum": "^3.24.1",
2121
"@react-spectrum/provider": "^3.9.7",
22-
"@react-spectrum/tag": "^3.0.0-rc.0",
2322
"@spectrum-icons/workflow": "^4.2.12",
2423
"react": "^18.2.0",
2524
"react-dom": "^18.2.0"
2625
},
2726
"devDependencies": {
28-
"@babel/core": "^7.24.3",
2927
"@babel/cli": "^7.24.3",
28+
"@babel/core": "^7.24.3",
3029
"@babel/preset-env": "^7.24.3",
3130
"@babel/preset-react": "^7.24.1",
32-
"webpack": "4.46.0",
33-
"webpack-cli": "3.1.1",
34-
"webpack-dev-server": "3.1.8",
31+
"babel-loader": "^8.0.2",
32+
"css-loader": "^1.0.0",
33+
"jest": "^29",
34+
"patch-package": "^8.0.0",
3535
"style-loader": "0.23.0",
36-
"css-loader": "1.0.0",
37-
"babel-loader": "8.0.2",
38-
"jest": "^26",
39-
"patch-package": "^8.0.0"
36+
"webpack": "^4.46.0",
37+
"webpack-cli": "^3.1.1",
38+
"webpack-dev-server": "^3.1.8"
4039
},
4140
"resolutions": {
4241
"terser-webpack-plugin": "4.2.3"

examples/rsp-webpack-4/patches/terser-webpack-plugin+4.2.3.patch

-13
This file was deleted.

examples/rsp-webpack-4/patches/webpack+4.46.0.patch

-144
This file was deleted.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
"fast-check": "^2.19.0",
161161
"fast-glob": "^3.1.0",
162162
"framer-motion": "^11.3.0-alpha.0",
163-
"fs-extra": "^10.0.0",
163+
"fs-extra": "^11.0.0",
164164
"glob": "^8.0.3",
165165
"glob-promise": "^6.0.5",
166166
"globals": "^15.11.0",

packages/@internationalized/date/tests/DateFormatter.test.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ describe('DateFormatter', function () {
7878
expect(formatter.resolvedOptions().hourCycle).toBe('h12');
7979

8080
formatter = new DateFormatter('ja', {hour: 'numeric', hour12: true});
81-
expect(formatter.format(new Date(2020, 1, 3, 0))).toBe('午前0時');
82-
expect(formatter.resolvedOptions().hourCycle).toBe('h11');
81+
expect(formatter.format(new Date(2020, 1, 3, 0))).toBe('午前12時');
82+
expect(formatter.resolvedOptions().hourCycle).toBe('h12');
8383
});
8484

8585
it('should work around buggy resolved hour cycle', function () {

packages/@spectrum-icons/build-tools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"private": true,
1212
"dependencies": {
1313
"@svgr/core": "^8.1.0",
14-
"fs-extra": "^10.0.0"
14+
"fs-extra": "^11.0.0"
1515
},
1616
"publishConfig": {
1717
"access": "public"

packages/@spectrum-icons/express/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
},
2929
"devDependencies": {
3030
"@spectrum-icons/build-tools": "3.0.0-alpha.1",
31-
"fs-extra": "^10.0.0"
31+
"fs-extra": "^11.0.0"
3232
},
3333
"peerDependencies": {
3434
"@react-spectrum/provider": "^3.0.0",

scripts/verdaccio-build-nextjs.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-rac-rsp-tailwind.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-rac-tailwind.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-rsp-cra-18.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-s2-parcel.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-s2-webpack.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build-webpack-4.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-build.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-ci.sh

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
port=4000
44
registry="http://localhost:$port"
55
output="output.out"
6+
touch $output
67

78
set -e
89

scripts/verdaccio-deploy.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ port=4000
55
original_registry=`npm get registry`
66
registry="http://localhost:$port"
77
output="output.out"
8-
ci=false
8+
touch $output
99

1010
echo "Build and deploy to verdaccio"
1111

scripts/verdaccio.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ port=4000
55
original_registry=`npm get registry`
66
registry="http://localhost:$port"
77
output="output.out"
8+
touch $output
89
ci=false
910
commit_to_revert="HEAD"
1011

0 commit comments

Comments
 (0)