Merge branch 'main' into csp-focus-guards

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # Add the following users as reviewers on new pull requests
 
-* @benoitgrelard @andy-hook @vladmoroz @lucasmotta
+* @StephenHaney @vladmoroz @lucasmotta @hadihallak @chaance

.github/CONTRIBUTING.md

@@ -55,40 +55,40 @@ cd primitives
 git remote add upstream https://github.com/radix-ui/primitives.git
 ```
 
-1. Synchronize your local `main` branch with the upstream remote:
+3. Synchronize your local `main` branch with the upstream remote:
 
 ```sh
 git checkout main
 git pull upstream main
 ```
 
-1. Make sure your Node version matches the [.nvmrc](../.nvmrc).
+4. Make sure your Node version matches the [.nvmrc](../.nvmrc).
 
 ```
 node -v
 ```
 
-1. Install dependencies with [yarn](https://yarnpkg.com):
+5. Install dependencies with [yarn](https://yarnpkg.com):
 
 ```sh
 yarn install
 ```
 
-1. Create a new branch related to your PR:
+6. Create a new branch related to your PR:
 
 ```sh
 git checkout -b my-bug-fix
 ```
 
-6. Make changes, then commit and push to your forked repository:
+7. Make changes, then commit and push to your forked repository:
 
 ```sh
 git push -u origin HEAD
 ```
 
-7. Go to [the repository](https://github.com/radix-ui/primitives) and [make a Pull Request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
+8. Go to [the repository](https://github.com/radix-ui/primitives) and [make a Pull Request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
 
-8. We will review your Pull Request and either merge it, request changes to it, or close it with an explanation.
+9. We will review your Pull Request and either merge it, request changes to it, or close it with an explanation.
 
 ## Working locally
 

.storybook/main.ts

@@ -17,6 +17,16 @@ const config: StorybookConfig = {
       strictMode: true,
     },
   },
+  swc: () => ({
+    jsc: {
+      transform: {
+        react: {
+          // Do not require importing React into scope to use JSX
+          runtime: 'automatic',
+        },
+      },
+    },
+  }),
 
   // we need to add aliases to webpack so it knows how to follow
   // to the source of the packages rather than the built version (dist)

.yarn/versions/b20a66e3.yml → .yarn/versions/19bdd400.yml

@@ -1,5 +1,5 @@
 releases:
-  "@radix-ui/react-slider": minor
+  "@radix-ui/react-avatar": patch
 
 declined:
   - primitives

.yarn/versions/efa9f1f5.yml → .yarn/versions/41451f5a.yml

@@ -2,13 +2,12 @@ releases:
   "@radix-ui/react-alert-dialog": patch
   "@radix-ui/react-context-menu": patch
   "@radix-ui/react-dialog": patch
-  "@radix-ui/react-dismissable-layer": patch
   "@radix-ui/react-dropdown-menu": patch
   "@radix-ui/react-hover-card": patch
   "@radix-ui/react-menu": patch
   "@radix-ui/react-menubar": patch
-  "@radix-ui/react-navigation-menu": patch
   "@radix-ui/react-popover": patch
+  "@radix-ui/react-portal": patch
   "@radix-ui/react-select": patch
   "@radix-ui/react-toast": patch
   "@radix-ui/react-tooltip": patch

.yarn/versions/75dcd823.yml → .yarn/versions/8a3bd6ee.yml

@@ -1,18 +1,22 @@
 releases:
+  "@radix-ui/react-accordion": patch
   "@radix-ui/react-alert-dialog": patch
+  "@radix-ui/react-checkbox": patch
+  "@radix-ui/react-collapsible": patch
   "@radix-ui/react-context-menu": patch
   "@radix-ui/react-dialog": patch
-  "@radix-ui/react-dismissable-layer": patch
   "@radix-ui/react-dropdown-menu": patch
   "@radix-ui/react-hover-card": patch
   "@radix-ui/react-menu": patch
   "@radix-ui/react-menubar": patch
   "@radix-ui/react-navigation-menu": patch
   "@radix-ui/react-popover": patch
-  "@radix-ui/react-select": patch
+  "@radix-ui/react-presence": patch
+  "@radix-ui/react-radio-group": patch
+  "@radix-ui/react-scroll-area": patch
+  "@radix-ui/react-tabs": patch
   "@radix-ui/react-toast": patch
   "@radix-ui/react-tooltip": patch
-  "@radix-ui/react-use-escape-keydown": patch
 
 declined:
   - primitives

.yarn/versions/a0df87d9.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-checkbox": patch
+
+declined:
+  - primitives

.yarn/versions/a54ad5a9.yml

@@ -0,0 +1,6 @@
+releases:
+  "@radix-ui/react-scroll-area": minor
+
+declined:
+  - primitives
+  - ssr-testing

.yarn/versions/c80771b8.yml

@@ -0,0 +1,33 @@
+releases:
+  "@radix-ui/react-context": patch
+
+declined:
+  - primitives
+  - "@radix-ui/react-accordion"
+  - "@radix-ui/react-alert-dialog"
+  - "@radix-ui/react-avatar"
+  - "@radix-ui/react-checkbox"
+  - "@radix-ui/react-collapsible"
+  - "@radix-ui/react-collection"
+  - "@radix-ui/react-context-menu"
+  - "@radix-ui/react-dialog"
+  - "@radix-ui/react-dropdown-menu"
+  - "@radix-ui/react-form"
+  - "@radix-ui/react-hover-card"
+  - "@radix-ui/react-menu"
+  - "@radix-ui/react-menubar"
+  - "@radix-ui/react-navigation-menu"
+  - "@radix-ui/react-popover"
+  - "@radix-ui/react-popper"
+  - "@radix-ui/react-progress"
+  - "@radix-ui/react-radio-group"
+  - "@radix-ui/react-roving-focus"
+  - "@radix-ui/react-scroll-area"
+  - "@radix-ui/react-select"
+  - "@radix-ui/react-slider"
+  - "@radix-ui/react-switch"
+  - "@radix-ui/react-tabs"
+  - "@radix-ui/react-toast"
+  - "@radix-ui/react-toggle-group"
+  - "@radix-ui/react-toolbar"
+  - "@radix-ui/react-tooltip"

.yarn/versions/dd1eb89d.yml → .yarn/versions/cc138cf5.yml

@@ -1,5 +1,4 @@
 releases:
-  "@radix-ui/react-scroll-area": patch
   "@radix-ui/react-select": patch
 
 declined:

.yarn/versions/cccc0adb.yml

@@ -0,0 +1,5 @@
+releases:
+  "@radix-ui/react-select": patch
+
+declined:
+  - primitives

.yarn/versions/f24f9512.yml

@@ -0,0 +1,2 @@
+releases:
+  "@radix-ui/react-select": patch

build.mjs

@@ -0,0 +1,48 @@
+import { globSync } from 'glob';
+import * as esbuild from 'esbuild';
+import * as tsup from 'tsup';
+
+async function build(path) {
+  const file = `${path}/src/index.ts`;
+  const dist = `${path}/dist`;
+
+  const esbuildConfig = {
+    entryPoints: [file],
+    external: ['@radix-ui/*'],
+    packages: 'external',
+    bundle: true,
+    sourcemap: true,
+    format: 'cjs',
+    target: 'es2022',
+    outdir: dist,
+  };
+
+  await esbuild.build(esbuildConfig);
+  console.log(`Built ${path}/dist/index.js`);
+
+  await esbuild.build({
+    ...esbuildConfig,
+    format: 'esm',
+    outExtension: { '.js': '.mjs' },
+  });
+  console.log(`Built ${path}/dist/index.mjs`);
+
+  // tsup is used to emit d.ts files only (esbuild can't do that).
+  //
+  // Notes:
+  // 1. Emitting d.ts files is super slow for whatever reason.
+  // 2. It could have fully replaced esbuild (as it uses that internally),
+  //    but at the moment its esbuild version is somewhat outdated.
+  //    It’s also harder to configure and esbuild docs are more thorough.
+  await tsup.build({
+    entry: [file],
+    format: ['cjs', 'esm'],
+    dts: { only: true },
+    outDir: dist,
+    silent: true,
+    external: [/@radix-ui\/.+/],
+  });
+  console.log(`Built ${path}/dist/index.d.ts`);
+}
+
+globSync('packages/*/*').forEach(build);

cypress/integration/Form.spec.ts

@@ -8,6 +8,7 @@ describe('Form', () => {
   });
 
   function checkControlMessageAssociation() {
+    cy.get('@control').should('have.attr', 'aria-describedby');
     cy.get('@control')
       .invoke('attr', 'aria-describedby')
       .then((ariaDescribedby) =>