Merge branch 'main' into make-home-roller-title-more-responsive

# Conflicts:
#	packages/dev/s2-docs/pages/s2/home/Home.tsx

Author: snowystinger

.circleci/config.yml

@@ -85,7 +85,6 @@ jobs:
     executor: rsp-large
     steps:
       - checkout
-
       - run:
           name: Write npmrc
           command: |
@@ -762,6 +761,28 @@ jobs:
           paths:
             - '*/verdaccio/publish-stats'
 
+  v-starters:
+    executor: rsp-xlarge
+    steps:
+      - restore_cache:
+          key: react-spectrum-{{ .Environment.CACHE_VERSION }}-{{ .Environment.CIRCLE_SHA1 }}
+
+      - attach_workspace:
+          at: /tmp/verdaccio-workspace
+
+      - run:
+          name: build s2-next off verdaccio
+          command: |
+            ./scripts/verdaccio-ci.sh
+            ./scripts/verdaccio-build-starters.sh
+          environment:
+            VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
+
+      - persist_to_workspace:
+          root: dist
+          paths:
+            - 's2-docs/'
+
   deploy:
     docker:
       - image: mcr.microsoft.com/azure-cli:2.63.0
@@ -987,6 +1008,9 @@ workflows:
             - v-webpack-4
             - v-nextjs
             - v-rsp-cra-18
+      - v-starters:
+          requires:
+            - verdaccio
       - deploy:
           requires:
             - lint
@@ -1013,6 +1037,7 @@ workflows:
           requires:
             - s2-docs
             - s2-docs-stage
+            - v-starters
           filters:
             branches:
               only: main

.yarn/patches/@parcel-packager-react-static-npm-2.16.1-138e4b8f05.patch

@@ -92,6 +92,7 @@ publish: build
 	yarn publish
 
 publish-nightly: build
+	git update-index --refresh
 	yarn version:nightly
 	yarn publish:nightly
 
@@ -123,7 +124,7 @@ website-production:
 	mv starters/tailwind/react-aria-tailwind-starter.zip dist/production/docs/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip
 
 check-examples:
-	node scripts/extractExamples.mjs
+	node scripts/extractExamplesS2.mjs
 	yarn tsc --project dist/docs-examples/tsconfig.json
 
 starter:
@@ -157,7 +158,6 @@ s2-docs-stage:
 	DOCS_ENV=stage PUBLIC_URL=/ $(MAKE) build-s2-docs
 	cp packages/dev/docs/pages/disallow-robots.txt dist/s2-docs/react-aria/robots.txt
 	cp packages/dev/docs/pages/disallow-robots.txt dist/s2-docs/s2/robots.txt
-	$(MAKE) build-starters
 
 s2-docs-production:
 	DOCS_ENV=prod PUBLIC_URL=/ $(MAKE) build-s2-docs
@@ -187,7 +187,8 @@ build-s2-docs:
 build-starters:
 	$(MAKE) starter-zip
 	$(MAKE) tailwind-starter
-	mv starters/docs/storybook-static dist/s2-docs/react-aria-starter
-	mv starters/docs/react-aria-starter.zip dist/s2-docs/react-aria-starter.$$(git rev-parse --short HEAD).zip
-	mv starters/tailwind/storybook-static dist/s2-docs/react-aria-tailwind-starter
-	mv starters/tailwind/react-aria-tailwind-starter.zip dist/s2-docs/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip
+	mkdir -p dist/s2-docs/react-aria/$(PUBLIC_URL)
+	mv starters/docs/storybook-static dist/s2-docs/react-aria/$(PUBLIC_URL)/react-aria-starter
+	mv starters/docs/react-aria-starter.zip dist/s2-docs/react-aria/$(PUBLIC_URL)/react-aria-starter.$$(git rev-parse --short HEAD).zip
+	mv starters/tailwind/storybook-static dist/s2-docs/react-aria/$(PUBLIC_URL)/react-aria-tailwind-starter
+	mv starters/tailwind/react-aria-tailwind-starter.zip dist/s2-docs/react-aria/$(PUBLIC_URL)/react-aria-tailwind-starter.$$(git rev-parse --short HEAD).zip

Makefile

@@ -20,7 +20,9 @@ const devDependencies = new Set([
   '@adobe/spectrum-css-temp',
   '@react-spectrum/style-macro-s1',
   '@parcel/macros',
-  '@adobe/spectrum-tokens'
+  '@adobe/spectrum-tokens',
+  'playwright',
+  'axe-playwright'
 ]);
 
 module.exports = {

bin/imports.js

@@ -13,7 +13,7 @@
     "@spectrum-icons/illustrations": "latest",
     "@spectrum-icons/workflow": "latest",
     "@tailwindcss/postcss": "^4.0.0",
-    "parcel": "^2.16.1",
+    "parcel": "^2.16.3",
     "postcss": "^8.2.1",
     "react": "^18.2.0",
     "react-aria-components": "latest",