Merge branch 'main' into fix-add-nb-date-placeholder

Author: snowystinger

.circleci/comment.js

@@ -1,5 +1,4 @@
 const Octokit = require('@octokit/rest');
-const fs = require('fs');
 
 const octokit = new Octokit({
   auth: `token ${process.env.GITHUB_TOKEN}`
@@ -36,25 +35,26 @@ async function run() {
             repo: 'react-spectrum',
             pull_number
           });
+          // eslint-disable-next-line max-depth
           if (data && data.head.repo.full_name !== 'adobe/react-spectrum' && data.head.sha === forkHeadCommit) {
             pr = pull_number;
             break;
           }
         }
       } else if (process.env.CIRCLE_BRANCH === 'main') {
-        //If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
+        // If it isn't a PR commit, then we are on main. Create a comment for the test app and docs build
         await octokit.repos.createCommitComment({
           owner: 'adobe',
           repo: 'react-spectrum',
           commit_sha: process.env.CIRCLE_SHA1,
           body: `Verdaccio builds:
       [CRA Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rsp-cra-18/index.html)
       [NextJS Test App](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/next/index.html)
-      [RAC Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-tailwind/index.html)
       [RAC Spectrum + Tailwind Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/rac-spectrum-tailwind/index.html)
       [S2 Parcel Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-parcel-example/index.html)
       [S2 Custom Icons](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/icon-builder-fixture/index.html)
       [S2 Webpack Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-webpack-5-example/index.html)
+      [S2 Next.js Example](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/s2-next-macros/index.html)
       [CRA Test App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/build-stats.txt)
       [NextJS App Size](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/verdaccio/publish-stats/next-build-stats.txt)
       [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() {
   * [View the S2 docs](https://reactspectrum.blob.core.windows.net/reactspectrum/${process.env.CIRCLE_SHA1}/s2-docs/index.html)`
       });
     } catch (err) {
-      console.error(err)
+      console.error(err);
     }
   }
 }

.circleci/config.yml

@@ -532,6 +532,15 @@ jobs:
           environment:
             VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
 
+      - run:
+          name: build docs off verdaccio retry
+          command: |
+            ./scripts/verdaccio-ci.sh
+            ./scripts/verdaccio-build.sh
+          environment:
+            VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
+          when: on_fail
+
       - persist_to_workspace:
           root: verdaccio_dist
           paths:
@@ -603,7 +612,7 @@ jobs:
           paths:
             - '*/verdaccio/next'
 
-  v-rac-tailwind:
+  v-rac-rsp-tailwind:
     executor: rsp-xlarge
     steps:
       - restore_cache:
@@ -613,19 +622,19 @@ jobs:
           at: /tmp/verdaccio-workspace
 
       - run:
-          name: build rac-tailwind off verdaccio
+          name: build rac-rsp-tailwind off verdaccio
           command: |
             ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build-rac-tailwind.sh
+            ./scripts/verdaccio-build-rac-rsp-tailwind.sh
           environment:
             VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
 
       - persist_to_workspace:
           root: verdaccio_dist
           paths:
-            - '*/verdaccio/rac-tailwind'
+            - '*/verdaccio/rac-spectrum-tailwind'
 
-  v-rac-rsp-tailwind:
+  v-s2-parcel:
     executor: rsp-xlarge
     steps:
       - restore_cache:
@@ -635,19 +644,19 @@ jobs:
           at: /tmp/verdaccio-workspace
 
       - run:
-          name: build rac-rsp-tailwind off verdaccio
+          name: build s2-parcel off verdaccio
           command: |
             ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build-rac-rsp-tailwind.sh
+            ./scripts/verdaccio-build-s2-parcel.sh
           environment:
             VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
 
       - persist_to_workspace:
           root: verdaccio_dist
           paths:
-            - '*/verdaccio/rac-spectrum-tailwind'
+            - '*/verdaccio/s2-parcel-example'
 
-  v-s2-parcel:
+  v-s2-webpack:
     executor: rsp-xlarge
     steps:
       - restore_cache:
@@ -657,19 +666,19 @@ jobs:
           at: /tmp/verdaccio-workspace
 
       - run:
-          name: build s2-parcel off verdaccio
+          name: build s2-webpack off verdaccio
           command: |
             ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build-s2-parcel.sh
+            ./scripts/verdaccio-build-s2-webpack.sh
           environment:
             VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
 
       - persist_to_workspace:
           root: verdaccio_dist
           paths:
-            - '*/verdaccio/s2-parcel-example'
+            - '*/verdaccio/s2-webpack-5-example'
 
-  v-s2-webpack:
+  v-s2-next:
     executor: rsp-xlarge
     steps:
       - restore_cache:
@@ -679,17 +688,17 @@ jobs:
           at: /tmp/verdaccio-workspace
 
       - run:
-          name: build s2-webpack off verdaccio
+          name: build s2-next off verdaccio
           command: |
             ./scripts/verdaccio-ci.sh
-            ./scripts/verdaccio-build-s2-webpack.sh
+            ./scripts/verdaccio-build-s2-next.sh
           environment:
             VERDACCIO_STORAGE_PATH: /tmp/verdaccio-workspace/storage
 
       - persist_to_workspace:
           root: verdaccio_dist
           paths:
-            - '*/verdaccio/s2-webpack-5-example'
+            - '*/verdaccio/s2-next-macros'
 
   v-icon-builder:
     executor: rsp-xlarge
@@ -918,9 +927,6 @@ workflows:
       - v-nextjs:
           requires:
             - verdaccio
-      - v-rac-tailwind:
-          requires:
-            - verdaccio
       - v-rac-rsp-tailwind:
           requires:
             - verdaccio
@@ -930,6 +936,9 @@ workflows:
       - v-s2-webpack:
           requires:
             - verdaccio
+      - v-s2-next:
+          requires:
+            - verdaccio
       - v-icon-builder:
           requires:
             - verdaccio
@@ -961,10 +970,10 @@ workflows:
             - v-rsp-cra-18
             - v-webpack-4
             - v-nextjs
-            - v-rac-tailwind
             - v-rac-rsp-tailwind
             - v-s2-parcel
             - v-s2-webpack
+            - v-s2-next
             - v-icon-builder
             - v-publish-stats
       - comment:

.github/labeler.yml

@@ -0,0 +1,3 @@
+needs translations:
+- changed-files:
+  - any-glob-to-any-file: ['**/intl/*.json']

.github/workflows/labeler.yml

@@ -0,0 +1,14 @@
+name: "Pull Request Labeler"
+on:
+- pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v5
+      with:
+        sync-labels: true

.storybook-s2/docs/Illustrations.jsx

@@ -35,7 +35,7 @@ export function Illustrations() {
                     size="XS"
                     isQuiet
                     aria-label="Copy"
-                    onPress={() => navigator.clipboard.writeText(`import ${name} from '@react-spectrum/s2/illustrations/gradient/${gradientStyle}/${icon}';`)}>
+                    onPress={() => navigator.clipboard.writeText(`import ${icon} from '@react-spectrum/s2/illustrations/gradient/${gradientStyle}/${icon}';`)}>
                     <Paste />
                   </ActionButton>
                 </span>

.storybook-s2/docs/Release Notes.mdx

@@ -4,6 +4,32 @@ export default MDXLayout;
 
 # Release Notes
 
+## v0.10.0
+
+### Font update
+
+This release introduces a new font for Spectrum 2: Adobe Clean Spectrum VF. This is an evolution of the previous Adobe Clean, with slightly updated metrics allowing for better vertical centering. Along with this update, the S2 Provider component now automatically handles loading the fonts needed for the user's language. The new font does not affect previous versions of React Spectrum.
+
+If you previously used `page.css` without a `Provider`, you'll need to add a `Provider` around your app to load the fonts. See the [updated docs](?path=/docs/intro--docs#setting-up-your-app) for details.
+
+### New Components
+
+* [Calendar](?path=/docs/calendar--docs)
+* [RangeCalendar](?path=/docs/rangecalendar--docs)
+* [DateField](?path=/docs/datefield--docs)
+* [DatePicker](?path=/docs/datepicker--docs)
+* [DateRangePicker](?path=/docs/daterangepicker--docs)
+* [TimeField](?path=/docs/timefield--docs)
+
+### Updates
+
+* [CardView](?path=/docs/cardview--docs): Fix ActionBar from not scrolling
+* [ActionButton](?path=/docs/actionbutton--docs): Fix avatar-only ActionButtons to have square dimensions
+* [Tabs](?path=/docs/tabs--docs): Improve selection indicator animation, fix collasped tabs
+* [ProgressCircle](?path=/docs/progresscircle--docs): Add track outline in High Contrast Mode
+* [Switch](?path=/docs/switch--docs): Fix the toggle in RTL locales
+* [TreeView](?path=/docs/treeview--docs): Support async loading
+
 ## v0.9.1
 
 ### Updates

Makefile

@@ -100,6 +100,7 @@ build:
 	done
 	node scripts/buildI18n.js
 	node scripts/generateIconDts.js
+	node scripts/fixUseClient.js
 
 website:
 	yarn build:docs --public-url /reactspectrum/$$(git rev-parse HEAD)/docs --dist-dir dist/$$(git rev-parse HEAD)/docs

eslint.config.mjs

@@ -445,29 +445,6 @@ export default [{
         "jsdoc/require-jsdoc": OFF,
         "jsdoc/require-description": OFF,
     },
-}, {
-    files: [
-        "packages/**/*.ts",
-        "packages/**/*.tsx"
-    ],
-
-    rules: {
-        "@typescript-eslint/explicit-module-boundary-types": ERROR,
-    },
-}, {
-    files: [
-        "**/dev/**",
-        "**/test/**",
-        "**/stories/**",
-        "**/docs/**",
-        "**/chromatic/**",
-        "**/chromatic-fc/**",
-        "**/__tests__/**"
-    ],
-
-    rules: {
-        "@typescript-eslint/explicit-module-boundary-types": OFF,
-    },
 }, {
     files: [
         "packages/@react-aria/focus/src/**/*.ts",
@@ -504,4 +481,4 @@ export default [{
     rules: {
         "react/react-in-jsx-scope": OFF,
     },
-}];
+}];