Skip to content

Commit 17e26a2

Browse files
reidbarberreidbarber
committed
Merge remote-tracking branch 'origin/main' into s1-to-s2-upgrade-skill
2 parents 3d7fb2a + c13660d commit 17e26a2

1,152 files changed

Lines changed: 8780 additions & 7446 deletions

File tree

Some content is hidden

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

‎.browserslistrc‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
chrome >= 79
2-
firefox >= 85
3-
safari >= 13
4-
edge >= 88
1+
baseline widely available

‎.parcelrc-build‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"packages/@react-spectrum/s2/{s2wf-icons,spectrum-illustrations}/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
1111
// Disable PostCSS from running over style macro output
1212
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
13+
"*.css": ["parcel-transformer-css-env", "..."],
1314
"*.svg": ["@parcel/transformer-svg-react"],
1415
"*.{js,mjs,jsm,jsx,es6,cjs,ts,tsx}": [
1516
"@parcel/transformer-js",

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ clean_dist:
3939
rm -rf packages/@adobe/react-spectrum/i18n
4040
rm -rf packages/@react-aria/i18n/server
4141
rm -rf packages/@react-spectrum/s2/style/dist packages/@react-spectrum/s2/page.css packages/@react-spectrum/s2/icons packages/@react-spectrum/s2/illustrations
42-
rm -rf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately,react-aria-components}/*.js
42+
git clean -Xdf packages/{@adobe/react-spectrum,@react-spectrum/s2,react-aria,react-stately,react-aria-components}
4343

4444
clean_parcel:
4545
rm -rf .parcel-cache

‎eslint.config.mjs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,8 @@ export default [{
493493
},
494494
}, {
495495
files: [
496-
"packages/@react-aria/interactions/src/**/*.ts",
497-
"packages/@react-aria/interactions/src/**/*.tsx",
496+
"packages/react-aria/src/interactions/**/*.ts",
497+
"packages/react-aria/src/interactions/**/*.tsx",
498498
],
499499

500500
rules: {

‎examples/rsp-next-ts-17/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@
3131
},
3232
"resolutions": {
3333
"next/@swc/helpers": "0.4.36"
34-
}
34+
},
35+
"browserslist": "defaults"
3536
}

‎examples/rsp-next-ts/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@
3939
"string-width": "4.2.3",
4040
"strip-ansi": "6.0.1",
4141
"wrap-ansi": "7.0.0"
42-
}
42+
},
43+
"browserslist": "defaults"
4344
}

‎examples/rsp-webpack-4/package.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323
"react": "^18.2.0",
2424
"react-dom": "^18.2.0"
2525
},
26+
"NOTE": "Do not update Jest. The old version is used for testing.",
2627
"devDependencies": {
2728
"@babel/cli": "^7.24.3",
2829
"@babel/core": "^7.24.3",
2930
"@babel/preset-env": "^7.24.3",
3031
"@babel/preset-react": "^7.24.1",
3132
"babel-loader": "^8.0.2",
3233
"css-loader": "^1.0.0",
33-
"jest": "^29",
34+
"jest": "^26",
3435
"patch-package": "^8.0.0",
3536
"style-loader": "0.23.0",
3637
"webpack": "^4.46.0",

0 commit comments

Comments
 (0)