Skip to content

Commit bba710e

Browse files
yihuiliaoyihuiliao
committed
Merge branch 'main' into update-testing-sheet-automation
2 parents e43129d + 5670b2a commit bba710e

File tree

361 files changed

+9581
-6072
lines changed

Some content is hidden

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

361 files changed

+9581
-6072
lines changed

‎.circleci/config.yml‎

Lines changed: 35 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,28 @@ commands:
6767
echo "AWS credentials not found"
6868
circleci-agent step halt
6969
fi
70-
- aws-s3/sync:
71-
arguments: --cache-control public,max-age=31536000,immutable --include * --exclude *.html --exclude *.rsc --exclude *.txt --exclude *.json --exclude *.md --exclude *.xml
72-
from: /tmp/dist/s2-docs/<< parameters.dir >>
73-
to: << parameters.bucket >>
74-
- aws-s3/sync:
75-
arguments: --cache-control public,max-age=300,stale-while-revalidate=300 --exclude * --include *.html --include *.txt --include *.json --include *.md --include *.xml
76-
from: /tmp/dist/s2-docs/<< parameters.dir >>
77-
to: << parameters.bucket >>
78-
- aws-s3/sync:
79-
arguments: --cache-control public,max-age=300,stale-while-revalidate=300 --content-type text/x-component;charset=utf-8 --exclude * --include *.rsc
80-
from: /tmp/dist/s2-docs/<< parameters.dir >>
81-
to: << parameters.bucket >>
70+
- run:
71+
name: Configure AWS CLI for concurrent requests
72+
command: aws configure set default.s3.max_concurrent_requests 100
73+
- run:
74+
name: Copy immutable assets to S3
75+
command: |
76+
aws s3 cp /tmp/dist/s2-docs/<< parameters.dir >> << parameters.bucket >> --recursive \
77+
--cache-control "public,max-age=31536000,immutable" \
78+
--exclude "*.html" --exclude "*.rsc" --exclude "*.txt" --exclude "*.json" --exclude "*.md" --exclude "*.xml"
79+
- run:
80+
name: Copy HTML and text files to S3
81+
command: |
82+
aws s3 cp /tmp/dist/s2-docs/<< parameters.dir >> << parameters.bucket >> --recursive \
83+
--cache-control "public,max-age=300,stale-while-revalidate=300" \
84+
--exclude "*" --include "*.html" --include "*.txt" --include "*.json" --include "*.md" --include "*.xml"
85+
- run:
86+
name: Copy RSC files to S3
87+
command: |
88+
aws s3 cp /tmp/dist/s2-docs/<< parameters.dir >> << parameters.bucket >> --recursive \
89+
--cache-control "public,max-age=300,stale-while-revalidate=300" \
90+
--content-type "text/x-component;charset=utf-8" \
91+
--exclude "*" --include "*.rsc"
8292
8393
jobs:
8494
install:
@@ -484,21 +494,6 @@ jobs:
484494
paths:
485495
- '*/storybook-s2/'
486496

487-
docs-production:
488-
executor: rsp-xlarge
489-
steps:
490-
- restore_cache:
491-
key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
492-
493-
- run:
494-
name: build docs
495-
command: make website-production
496-
497-
- persist_to_workspace:
498-
root: dist
499-
paths:
500-
- '*/docs/'
501-
502497
s2-docs:
503498
executor: rsp-xlarge
504499
steps:
@@ -828,26 +823,6 @@ jobs:
828823
done
829824
fi
830825
831-
deploy-production:
832-
docker:
833-
- image: mcr.microsoft.com/azure-cli:2.63.0
834-
steps:
835-
- attach_workspace:
836-
at: /tmp/dist
837-
- run:
838-
name: Install AzCopy
839-
command: |
840-
wget -O azcopy.tar.gz https://aka.ms/downloadazcopy-v10-linux
841-
tar -xf azcopy.tar.gz
842-
mv ./azcopy_linux_amd64_*/azcopy /usr/local/bin/
843-
- run:
844-
name: deploy
845-
command: |
846-
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --exclude-pattern "*.md;*.txt;*.html;*.rsc"
847-
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.md" --content-type "text/markdown; charset=utf-8" --cache-control "max-age=300"
848-
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.txt" --content-type "text/plain; charset=utf-8" --cache-control "max-age=300"
849-
azcopy copy "/tmp/dist/production/docs/*" "https://reactspectrum.blob.core.windows.net/\$web${AZURE_STORAGE_SAS_TOKEN}" --recursive --include-pattern "*.html;*.rsc" --cache-control "max-age=300"
850-
851826
deploy-s3-stage:
852827
executor: rsp
853828
steps:
@@ -858,6 +833,16 @@ jobs:
858833
dir: s2
859834
bucket: s3://react-spectrum-stage
860835

836+
deploy-s3-production:
837+
executor: rsp
838+
steps:
839+
- deploy-s3:
840+
dir: react-aria
841+
bucket: s3://react-aria-prod
842+
- deploy-s3:
843+
dir: s2
844+
bucket: s3://react-spectrum-prod
845+
861846
comment:
862847
executor: rsp
863848
steps:
@@ -1075,18 +1060,18 @@ workflows:
10751060
- equal: [ "workflow_dispatch", << pipeline.parameters.GHA_Event >>]
10761061
jobs:
10771062
- install
1078-
- docs-production:
1063+
- s2-docs-production:
10791064
filters:
10801065
branches:
10811066
only: main
10821067
requires:
10831068
- install
1084-
- deploy-production:
1069+
- deploy-s3-production:
10851070
filters:
10861071
branches:
10871072
only: main
10881073
requires:
1089-
- docs-production
1074+
- s2-docs-production
10901075

10911076
nightly:
10921077
triggers:

‎Makefile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,21 +164,20 @@ s2-docs-production:
164164
DOCS_ENV=prod PUBLIC_URL=/ $(MAKE) build-s2-docs
165165
cp packages/dev/docs/pages/robots.txt dist/s2-docs/react-aria/robots.txt
166166
cp packages/dev/docs/pages/robots.txt dist/s2-docs/s2/robots.txt
167+
cd starters/docs && yarn install --no-immutable && yarn up react-aria-components
168+
cd starters/tailwind && yarn install --no-immutable && yarn up react-aria-components tailwindcss-react-aria-components
167169
$(MAKE) build-starters
168170

169171
build-s2-docs:
170172
yarn workspace @react-spectrum/s2-docs generate:md
171173
yarn workspace @react-spectrum/s2-docs generate:og
172-
node scripts/buildRegistry.mjs
174+
LIBRARY=react-aria node scripts/buildRegistry.mjs
173175
yarn build:s2-docs
174-
node scripts/createFeedS2.mjs
176+
LIBRARY=react-aria node scripts/createFeedS2.mjs
175177
mkdir -p dist/s2-docs/react-aria/$(PUBLIC_URL)
176178
mkdir -p dist/s2-docs/s2/$(PUBLIC_URL)
177179
mv packages/dev/s2-docs/dist/react-aria/* dist/s2-docs/react-aria/$(PUBLIC_URL)
178180
mv packages/dev/s2-docs/dist/s2/* dist/s2-docs/s2/$(PUBLIC_URL)
179-
mkdir -p dist/s2-docs/react-aria/$(PUBLIC_URL)/registry
180-
mv starters/docs/registry dist/s2-docs/react-aria/$(PUBLIC_URL)/registry/vanilla
181-
mv starters/tailwind/registry dist/s2-docs/react-aria/$(PUBLIC_URL)/registry/tailwind
182181

183182
# Build old docs pages, which get inter-mixed with the new pages
184183
# TODO: We probably don't need to build this on every PR

‎packages/@adobe/react-spectrum/package.json‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@adobe/react-spectrum",
3-
"version": "3.45.0",
3+
"version": "3.46.0",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -41,67 +41,67 @@
4141
},
4242
"dependencies": {
4343
"@internationalized/string": "^3.2.7",
44-
"@react-aria/collections": "^3.0.0",
45-
"@react-aria/i18n": "^3.12.13",
44+
"@react-aria/collections": "^3.0.1",
45+
"@react-aria/i18n": "^3.12.14",
4646
"@react-aria/ssr": "^3.9.10",
47-
"@react-aria/utils": "^3.31.0",
48-
"@react-aria/visually-hidden": "^3.8.28",
49-
"@react-spectrum/accordion": "^3.0.13",
50-
"@react-spectrum/actionbar": "^3.6.14",
51-
"@react-spectrum/actiongroup": "^3.11.4",
52-
"@react-spectrum/avatar": "^3.0.26",
53-
"@react-spectrum/badge": "^3.1.30",
54-
"@react-spectrum/breadcrumbs": "^3.9.24",
55-
"@react-spectrum/button": "^3.17.4",
56-
"@react-spectrum/buttongroup": "^3.6.26",
57-
"@react-spectrum/calendar": "^3.7.8",
58-
"@react-spectrum/checkbox": "^3.10.4",
59-
"@react-spectrum/color": "^3.1.4",
60-
"@react-spectrum/combobox": "^3.16.4",
61-
"@react-spectrum/contextualhelp": "^3.6.28",
62-
"@react-spectrum/datepicker": "^3.14.8",
63-
"@react-spectrum/dialog": "^3.9.4",
64-
"@react-spectrum/divider": "^3.5.27",
65-
"@react-spectrum/dnd": "^3.6.2",
66-
"@react-spectrum/dropzone": "^3.0.18",
67-
"@react-spectrum/filetrigger": "^3.0.18",
68-
"@react-spectrum/form": "^3.7.19",
69-
"@react-spectrum/icon": "^3.8.9",
70-
"@react-spectrum/illustratedmessage": "^3.5.14",
71-
"@react-spectrum/image": "^3.6.2",
72-
"@react-spectrum/inlinealert": "^3.2.20",
73-
"@react-spectrum/labeledvalue": "^3.2.7",
74-
"@react-spectrum/layout": "^3.6.19",
75-
"@react-spectrum/link": "^3.6.22",
76-
"@react-spectrum/list": "^3.10.8",
77-
"@react-spectrum/listbox": "^3.15.8",
78-
"@react-spectrum/menu": "^3.22.8",
79-
"@react-spectrum/meter": "^3.5.14",
80-
"@react-spectrum/numberfield": "^3.10.2",
81-
"@react-spectrum/overlays": "^5.9.0",
82-
"@react-spectrum/picker": "^3.16.4",
83-
"@react-spectrum/progress": "^3.7.20",
84-
"@react-spectrum/provider": "^3.10.11",
85-
"@react-spectrum/radio": "^3.7.21",
86-
"@react-spectrum/searchfield": "^3.8.23",
87-
"@react-spectrum/slider": "^3.8.2",
88-
"@react-spectrum/statuslight": "^3.5.26",
89-
"@react-spectrum/switch": "^3.6.6",
90-
"@react-spectrum/table": "^3.17.8",
91-
"@react-spectrum/tabs": "^3.8.27",
92-
"@react-spectrum/tag": "^3.3.7",
93-
"@react-spectrum/text": "^3.5.22",
94-
"@react-spectrum/textfield": "^3.14.2",
47+
"@react-aria/utils": "^3.32.0",
48+
"@react-aria/visually-hidden": "^3.8.29",
49+
"@react-spectrum/accordion": "^3.0.14",
50+
"@react-spectrum/actionbar": "^3.6.15",
51+
"@react-spectrum/actiongroup": "^3.11.5",
52+
"@react-spectrum/avatar": "^3.0.27",
53+
"@react-spectrum/badge": "^3.1.31",
54+
"@react-spectrum/breadcrumbs": "^3.9.25",
55+
"@react-spectrum/button": "^3.17.5",
56+
"@react-spectrum/buttongroup": "^3.6.27",
57+
"@react-spectrum/calendar": "^3.7.9",
58+
"@react-spectrum/checkbox": "^3.10.5",
59+
"@react-spectrum/color": "^3.1.5",
60+
"@react-spectrum/combobox": "^3.16.5",
61+
"@react-spectrum/contextualhelp": "^3.6.29",
62+
"@react-spectrum/datepicker": "^3.14.9",
63+
"@react-spectrum/dialog": "^3.9.5",
64+
"@react-spectrum/divider": "^3.5.28",
65+
"@react-spectrum/dnd": "^3.6.3",
66+
"@react-spectrum/dropzone": "^3.0.19",
67+
"@react-spectrum/filetrigger": "^3.0.19",
68+
"@react-spectrum/form": "^3.7.20",
69+
"@react-spectrum/icon": "^3.8.10",
70+
"@react-spectrum/illustratedmessage": "^3.5.15",
71+
"@react-spectrum/image": "^3.6.3",
72+
"@react-spectrum/inlinealert": "^3.2.21",
73+
"@react-spectrum/labeledvalue": "^3.2.8",
74+
"@react-spectrum/layout": "^3.6.20",
75+
"@react-spectrum/link": "^3.6.23",
76+
"@react-spectrum/list": "^3.10.9",
77+
"@react-spectrum/listbox": "^3.15.9",
78+
"@react-spectrum/menu": "^3.22.9",
79+
"@react-spectrum/meter": "^3.5.15",
80+
"@react-spectrum/numberfield": "^3.10.3",
81+
"@react-spectrum/overlays": "^5.9.1",
82+
"@react-spectrum/picker": "^3.16.5",
83+
"@react-spectrum/progress": "^3.7.21",
84+
"@react-spectrum/provider": "^3.10.12",
85+
"@react-spectrum/radio": "^3.7.22",
86+
"@react-spectrum/searchfield": "^3.8.24",
87+
"@react-spectrum/slider": "^3.8.3",
88+
"@react-spectrum/statuslight": "^3.5.27",
89+
"@react-spectrum/switch": "^3.6.7",
90+
"@react-spectrum/table": "^3.17.9",
91+
"@react-spectrum/tabs": "^3.8.28",
92+
"@react-spectrum/tag": "^3.3.8",
93+
"@react-spectrum/text": "^3.5.23",
94+
"@react-spectrum/textfield": "^3.14.3",
9595
"@react-spectrum/theme-dark": "^3.5.22",
9696
"@react-spectrum/theme-default": "^3.5.22",
9797
"@react-spectrum/theme-light": "^3.4.22",
98-
"@react-spectrum/toast": "^3.1.4",
99-
"@react-spectrum/tooltip": "^3.7.11",
100-
"@react-spectrum/tree": "^3.1.8",
101-
"@react-spectrum/view": "^3.6.23",
102-
"@react-spectrum/well": "^3.4.27",
98+
"@react-spectrum/toast": "^3.1.5",
99+
"@react-spectrum/tooltip": "^3.8.0",
100+
"@react-spectrum/tree": "^3.1.9",
101+
"@react-spectrum/view": "^3.6.24",
102+
"@react-spectrum/well": "^3.4.28",
103103
"@react-stately/collections": "^3.12.8",
104-
"@react-stately/data": "^3.14.1",
104+
"@react-stately/data": "^3.15.0",
105105
"@react-types/shared": "^3.32.1",
106106
"client-only": "^0.0.1"
107107
},

‎packages/@internationalized/date/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@internationalized/date",
3-
"version": "3.10.0",
3+
"version": "3.10.1",
44
"description": "Internationalized calendar, date, and time manipulation utilities",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",

‎packages/@react-aria/actiongroup/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/actiongroup",
3-
"version": "3.7.21",
3+
"version": "3.7.22",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -26,11 +26,11 @@
2626
"url": "https://github.com/adobe/react-spectrum"
2727
},
2828
"dependencies": {
29-
"@react-aria/focus": "^3.21.2",
30-
"@react-aria/i18n": "^3.12.13",
31-
"@react-aria/interactions": "^3.25.6",
32-
"@react-aria/utils": "^3.31.0",
33-
"@react-stately/list": "^3.13.1",
29+
"@react-aria/focus": "^3.21.3",
30+
"@react-aria/i18n": "^3.12.14",
31+
"@react-aria/interactions": "^3.26.0",
32+
"@react-aria/utils": "^3.32.0",
33+
"@react-stately/list": "^3.13.2",
3434
"@react-types/actiongroup": "^3.4.21",
3535
"@react-types/shared": "^3.32.1",
3636
"@swc/helpers": "^0.5.0"

‎packages/@react-aria/autocomplete/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/autocomplete",
3-
"version": "3.0.0-rc.3",
3+
"version": "3.0.0-rc.4",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -26,17 +26,17 @@
2626
"url": "https://github.com/adobe/react-spectrum"
2727
},
2828
"dependencies": {
29-
"@react-aria/combobox": "^3.14.0",
30-
"@react-aria/focus": "^3.21.2",
31-
"@react-aria/i18n": "^3.12.13",
32-
"@react-aria/interactions": "^3.25.6",
33-
"@react-aria/listbox": "^3.15.0",
34-
"@react-aria/searchfield": "^3.8.9",
35-
"@react-aria/textfield": "^3.18.2",
36-
"@react-aria/utils": "^3.31.0",
37-
"@react-stately/autocomplete": "3.0.0-beta.3",
38-
"@react-stately/combobox": "^3.12.0",
39-
"@react-types/autocomplete": "3.0.0-alpha.35",
29+
"@react-aria/combobox": "^3.14.1",
30+
"@react-aria/focus": "^3.21.3",
31+
"@react-aria/i18n": "^3.12.14",
32+
"@react-aria/interactions": "^3.26.0",
33+
"@react-aria/listbox": "^3.15.1",
34+
"@react-aria/searchfield": "^3.8.10",
35+
"@react-aria/textfield": "^3.18.3",
36+
"@react-aria/utils": "^3.32.0",
37+
"@react-stately/autocomplete": "3.0.0-beta.4",
38+
"@react-stately/combobox": "^3.12.1",
39+
"@react-types/autocomplete": "3.0.0-alpha.36",
4040
"@react-types/button": "^3.14.1",
4141
"@react-types/shared": "^3.32.1",
4242
"@swc/helpers": "^0.5.0"

‎packages/@react-aria/breadcrumbs/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-aria/breadcrumbs",
3-
"version": "3.5.29",
3+
"version": "3.5.30",
44
"description": "Spectrum UI components in React",
55
"license": "Apache-2.0",
66
"main": "dist/main.js",
@@ -26,9 +26,9 @@
2626
"url": "https://github.com/adobe/react-spectrum"
2727
},
2828
"dependencies": {
29-
"@react-aria/i18n": "^3.12.13",
30-
"@react-aria/link": "^3.8.6",
31-
"@react-aria/utils": "^3.31.0",
29+
"@react-aria/i18n": "^3.12.14",
30+
"@react-aria/link": "^3.8.7",
31+
"@react-aria/utils": "^3.32.0",
3232
"@react-types/breadcrumbs": "^3.7.17",
3333
"@react-types/shared": "^3.32.1",
3434
"@swc/helpers": "^0.5.0"

0 commit comments

Comments
 (0)