Skip to content

Commit 441ac24

Browse files
snowystingersnowystinger
authored
Merge branch 'main' into testing-domlayoutdelegate
2 parents d821b90 + f821086 commit 441ac24

File tree

85 files changed

+3620
-1354
lines changed

Some content is hidden

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

85 files changed

+3620
-1354
lines changed

‎.circleci/comment.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const Octokit = require('@octokit/rest');
2-
const fs = require('fs');
32

43
const octokit = new Octokit({
54
auth: `token ${process.env.GITHUB_TOKEN}`
@@ -36,25 +35,26 @@ async function run() {
3635
repo: 'react-spectrum',
3736
pull_number
3837
});
38+
// eslint-disable-next-line max-depth
3939
if (data && data.head.repo.full_name !== 'adobe/react-spectrum' && data.head.sha === forkHeadCommit) {
4040
pr = pull_number;
4141
break;
4242
}
4343
}
4444
} else if (process.env.CIRCLE_BRANCH === 'main') {
45-
//If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
45+
// If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
4646
await octokit.repos.createCommitComment({
4747
owner: 'adobe',
4848
repo: 'react-spectrum',
4949
commit_sha: process.env.CIRCLE_SHA1,
5050
body: `Verdaccio builds:
5151
[CRA Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rsp-cra-18/index.html)
5252
[NextJS Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/next/index.html)
53-
[RAC Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-tailwind/index.html)
5453
[RAC Spectrum + Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-spectrum-tailwind/index.html)
5554
[S2 Parcel Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-parcel-example/index.html)
5655
[S2 Custom Icons](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/icon-builder-fixture/index.html)
5756
[S2 Webpack Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-webpack-5-example/index.html)
57+
[S2 Next.js Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-next-macros/index.html)
5858
[CRA Test App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/build-stats.txt)
5959
[NextJS App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/next-build-stats.txt)
6060
[Publish stats](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/publish.json)
@@ -85,7 +85,7 @@ async function run() {
8585
* [View the S2 docs](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/s2-docs/index.html)`
8686
});
8787
} catch (err) {
88-
console.error(err)
88+
console.error(err);
8989
}
9090
}
9191
}

‎.circleci/config.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ jobs:
612612
paths:
613613
- '*/verdaccio/next'
614614

615-
v-rac-tailwind:
615+
v-rac-rsp-tailwind:
616616
executor: rsp-xlarge
617617
steps:
618618
- restore_cache:
@@ -622,19 +622,19 @@ jobs:
622622
at: /tmp/verdaccio-workspace
623623

624624
- run:
625-
name: build rac-tailwind off verdaccio
625+
name: build rac-rsp-tailwind off verdaccio
626626
command: |
627627
./scripts/verdaccio-ci.sh
628-
./scripts/verdaccio-build-rac-tailwind.sh
628+
./scripts/verdaccio-build-rac-rsp-tailwind.sh
629629
environment:
630630
VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
631631

632632
- persist_to_workspace:
633633
root: verdaccio_dist
634634
paths:
635-
- '*/verdaccio/rac-tailwind'
635+
- '*/verdaccio/rac-spectrum-tailwind'
636636

637-
v-rac-rsp-tailwind:
637+
v-s2-parcel:
638638
executor: rsp-xlarge
639639
steps:
640640
- restore_cache:
@@ -644,19 +644,19 @@ jobs:
644644
at: /tmp/verdaccio-workspace
645645

646646
- run:
647-
name: build rac-rsp-tailwind off verdaccio
647+
name: build s2-parcel off verdaccio
648648
command: |
649649
./scripts/verdaccio-ci.sh
650-
./scripts/verdaccio-build-rac-rsp-tailwind.sh
650+
./scripts/verdaccio-build-s2-parcel.sh
651651
environment:
652652
VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
653653

654654
- persist_to_workspace:
655655
root: verdaccio_dist
656656
paths:
657-
- '*/verdaccio/rac-spectrum-tailwind'
657+
- '*/verdaccio/s2-parcel-example'
658658

659-
v-s2-parcel:
659+
v-s2-webpack:
660660
executor: rsp-xlarge
661661
steps:
662662
- restore_cache:
@@ -666,19 +666,19 @@ jobs:
666666
at: /tmp/verdaccio-workspace
667667

668668
- run:
669-
name: build s2-parcel off verdaccio
669+
name: build s2-webpack off verdaccio
670670
command: |
671671
./scripts/verdaccio-ci.sh
672-
./scripts/verdaccio-build-s2-parcel.sh
672+
./scripts/verdaccio-build-s2-webpack.sh
673673
environment:
674674
VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
675675

676676
- persist_to_workspace:
677677
root: verdaccio_dist
678678
paths:
679-
- '*/verdaccio/s2-parcel-example'
679+
- '*/verdaccio/s2-webpack-5-example'
680680

681-
v-s2-webpack:
681+
v-s2-next:
682682
executor: rsp-xlarge
683683
steps:
684684
- restore_cache:
@@ -688,17 +688,17 @@ jobs:
688688
at: /tmp/verdaccio-workspace
689689

690690
- run:
691-
name: build s2-webpack off verdaccio
691+
name: build s2-next off verdaccio
692692
command: |
693693
./scripts/verdaccio-ci.sh
694-
./scripts/verdaccio-build-s2-webpack.sh
694+
./scripts/verdaccio-build-s2-next.sh
695695
environment:
696696
VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
697697

698698
- persist_to_workspace:
699699
root: verdaccio_dist
700700
paths:
701-
- '*/verdaccio/s2-webpack-5-example'
701+
- '*/verdaccio/s2-next-macros'
702702

703703
v-icon-builder:
704704
executor: rsp-xlarge
@@ -927,9 +927,6 @@ workflows:
927927
- v-nextjs:
928928
requires:
929929
- verdaccio
930-
- v-rac-tailwind:
931-
requires:
932-
- verdaccio
933930
- v-rac-rsp-tailwind:
934931
requires:
935932
- verdaccio
@@ -939,6 +936,9 @@ workflows:
939936
- v-s2-webpack:
940937
requires:
941938
- verdaccio
939+
- v-s2-next:
940+
requires:
941+
- verdaccio
942942
- v-icon-builder:
943943
requires:
944944
- verdaccio
@@ -970,10 +970,10 @@ workflows:
970970
- v-rsp-cra-18
971971
- v-webpack-4
972972
- v-nextjs
973-
- v-rac-tailwind
974973
- v-rac-rsp-tailwind
975974
- v-s2-parcel
976975
- v-s2-webpack
976+
- v-s2-next
977977
- v-icon-builder
978978
- v-publish-stats
979979
- comment:

‎.storybook-s2/docs/Illustrations.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export function Illustrations() {
3535
size="XS"
3636
isQuiet
3737
aria-label="Copy"
38-
onPress={() => navigator.clipboard.writeText(`import ${name} from '@react-spectrum/s2/illustrations/gradient/${gradientStyle}/${icon}';`)}>
38+
onPress={() => navigator.clipboard.writeText(`import ${icon} from '@react-spectrum/s2/illustrations/gradient/${gradientStyle}/${icon}';`)}>
3939
<Paste />
4040
</ActionButton>
4141
</span>

‎eslint.config.mjs

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -445,29 +445,6 @@ export default [{
445445
"jsdoc/require-jsdoc": OFF,
446446
"jsdoc/require-description": OFF,
447447
},
448-
}, {
449-
files: [
450-
"packages/**/*.ts",
451-
"packages/**/*.tsx"
452-
],
453-
454-
rules: {
455-
"@typescript-eslint/explicit-module-boundary-types": ERROR,
456-
},
457-
}, {
458-
files: [
459-
"**/dev/**",
460-
"**/test/**",
461-
"**/stories/**",
462-
"**/docs/**",
463-
"**/chromatic/**",
464-
"**/chromatic-fc/**",
465-
"**/__tests__/**"
466-
],
467-
468-
rules: {
469-
"@typescript-eslint/explicit-module-boundary-types": OFF,
470-
},
471448
}, {
472449
files: [
473450
"packages/@react-aria/focus/src/**/*.ts",
@@ -504,4 +481,4 @@ export default [{
504481
rules: {
505482
"react/react-in-jsx-scope": OFF,
506483
},
507-
}];
484+
}];

‎examples/rac-tailwind/.parcelrc

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎examples/rac-tailwind/.postcssrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/rac-tailwind/.yarnrc.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎examples/rac-tailwind/package.json

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)