Skip to content

Commit 8a70ab7

Browse files
reidbarberreidbarber
committed
Merge remote-tracking branch 'origin/main' into s1-to-s2-upgrade-skill
2 parents 202903e + 6a0d13c commit 8a70ab7

5,500 files changed

Lines changed: 97990 additions & 86193 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.

‎.chromatic-fc/.parcelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"transformers": {
55
"illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
66
"packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
7-
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
7+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
88
// Disable PostCSS from running over style macro output
99
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
1010
"packages/@react-spectrum/s2/**/*.svg": ["@parcel/transformer-svg-react"]

‎.chromatic/.parcelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"transformers": {
55
"illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
66
"packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
7-
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
7+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
88
// Disable PostCSS from running over style macro output
99
"packages/@react-spectrum/s2/**/*.css": ["@parcel/transformer-css"],
1010
"packages/@react-spectrum/s2/**/*.svg": ["@parcel/transformer-svg-react"]

‎.circleci/config.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ jobs:
390390
- store_artifacts:
391391
path: ~/junit
392392

393-
test-esm:
393+
test-build:
394394
executor: rsp-2xlarge
395395
steps:
396396
- restore_cache:
@@ -401,6 +401,7 @@ jobs:
401401
command: |
402402
make build
403403
node --loader ./scripts/esm-support/loader.mjs ./scripts/esm-support/testESM.mjs
404+
node scripts/testCJS.cjs
404405
405406
lint:
406407
executor: rsp-xlarge
@@ -921,7 +922,7 @@ workflows:
921922
- test-ssr-18:
922923
requires:
923924
- install-18
924-
- test-esm:
925+
- test-build:
925926
requires:
926927
- install
927928
- lint:
@@ -1014,7 +1015,7 @@ workflows:
10141015
- test-17
10151016
- test-ssr-18
10161017
- test-18
1017-
- test-esm
1018+
- test-build
10181019
- storybook
10191020
- storybook-s2
10201021
- deploy-s3-stage:

‎.parcelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"docs:*.{js,ts,tsx,json}": ["parcel-transformer-docs", "@parcel/transformer-inline"],
77
"docs-json:*.{js,ts,tsx,json}": ["parcel-transformer-docs"],
88
"extract:*.mdx": ["parcel-transformer-mdx-extract"],
9-
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
9+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
1010
"bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
1111
"*.{md,mdx}": ["parcel-transformer-mdx-docs"],
1212
"*.svg": ["@parcel/transformer-svg-react"],

‎.parcelrc-build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"bundler": "@parcel/bundler-library",
55
"transformers": {
66
"style-types:*.ts": ["@parcel/transformer-typescript-types"],
7-
"packages/**/intl/*.json": ["parcel-transformer-intl"],
7+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
88
"bundle-text:*.svg": ["@parcel/transformer-svg", "@parcel/transformer-inline-string"],
99
"illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
1010
"packages/@react-spectrum/s2/{s2wf-icons,spectrum-illustrations}/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],

‎.parcelrc-storybook‎

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

‎.storybook-s2/.parcelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"transformers": {
55
"illustration:*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
66
"packages/@react-spectrum/s2/s2wf-icons/**/*.svg": ["@react-spectrum/parcel-transformer-s2-icon"],
7-
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
7+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
88
// Disable PostCSS from running over style macro output
99
"*.css": ["@parcel/transformer-css"],
1010
"*.svg": ["@parcel/transformer-svg-react"],

‎.storybook/.parcelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"extends": "@parcel/config-storybook",
33
"resolvers": ["@parcel/resolver-glob", "..."],
44
"transformers": {
5-
"packages/*/*/intl/*.json": ["parcel-transformer-intl"],
5+
"packages/**/intl/**/*.json": ["parcel-transformer-intl"],
66
"raw:*": ["@parcel/transformer-raw"]
77
}
88
}

‎.storybook/main.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ module.exports = {
33
stories: [
44
'../packages/@{react-aria,react-stately,spectrum-icons}/*/stories/*.stories.{js,jsx,ts,tsx}',
55
'../packages/@react-spectrum/!(s2)/stories/*.stories.{js,jsx,ts,tsx}',
6+
'../packages/@adobe/react-spectrum/stories/*/*.stories.{js,jsx,ts,tsx}',
7+
'../packages/react-aria/stories/*/*.stories.{js,jsx,ts,tsx}',
8+
'../packages/react-stately/stories/*/*.stories.{js,jsx,ts,tsx}',
69
'../packages/react-aria-components/stories/*.stories.{js,jsx,ts,tsx}'
710
],
811

‎Makefile‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +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
4243

4344
clean_parcel:
4445
rm -rf .parcel-cache
@@ -98,14 +99,16 @@ publish-nightly: build
9899
yarn publish:nightly
99100

100101
build:
101-
parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/react-aria-components --no-optimize --config .parcelrc-build
102+
mkdir -p dist
103+
yarn tsgo --project tsconfig.build.json --declaration --emitDeclarationOnly --outDir dist/types --rootDir packages
104+
parcel build packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/{react-aria,react-stately,react-aria-components,@adobe/react-spectrum} --no-optimize --config .parcelrc-build
102105
yarn workspaces foreach --all -pt run prepublishOnly
103-
for pkg in packages/@react-{spectrum,aria,stately}/*/ packages/@internationalized/{message,string,date,number}/ packages/@adobe/react-spectrum/ packages/react-aria/ packages/react-stately/ packages/react-aria-components/; \
104-
do node scripts/buildEsm.js $$pkg; \
105-
done
106+
node scripts/buildEsm.js
106107
node scripts/buildI18n.js
107108
node scripts/generateIconDts.js
108109
node scripts/fixUseClient.js
110+
node scripts/moveTypes.mjs
111+
rm -rf types
109112

110113
website:
111114
yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

0 commit comments

Comments
 (0)