Merge branch 'master' into docs/async-combobox

Signed-off-by: atomiks <cc.glows@gmail.com>

Author: atomiks

.circleci/config.yml

@@ -72,43 +72,30 @@ commands:
                 name: Install pnpm package manager
                 # See https://stackoverflow.com/a/73411601
                 command: corepack enable --install-directory ~/bin
-      - run:
-          name: Resolve React version
-          command: |
-            echo 'Using React version: << parameters.react-version >>'
-            node scripts/useReactVersion.mjs
-            # log a patch for maintainers who want to check out this change
-            git --no-pager diff HEAD
       - run:
           name: View install environment
           command: |
             node --version
             pnpm --version
-      - when:
-          condition:
-            equal: [<< parameters.react-version >>, stable]
-          steps:
-            - run:
-                name: Install JS dependencies
-                command: pnpm install
-      - unless:
-          condition:
-            equal: [<< parameters.react-version >>, stable]
-          steps:
-            - run:
-                name: Install JS dependencies (without frozen lockfile)
-                command: pnpm install --no-frozen-lockfile
-            - run:
-                name: Restore clean working copy
-                command: git restore .
+      - run:
+          name: Install js dependencies
+          command: |
+            args=""
+            if [ -n "$REACT_VERSION" ] && [ "$REACT_VERSION" != "stable" ]; then
+              args="react@$REACT_VERSION"
+            fi
+            if [ -n "$args" ]; then
+              pnpm dlx @mui/internal-code-infra@canary set-version-overrides --pkg $args
+            else
+              pnpm install
+            fi
 
 jobs:
   test_unit:
     <<: *default-job
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: Run tests on JSDOM
           command: pnpm test:jsdom:coverage
@@ -129,8 +116,7 @@ jobs:
     <<: *default-job
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: '`pnpm prettier` changes committed?'
           command: |
@@ -147,18 +133,14 @@ jobs:
       - run:
           name: Stylelint
           command: pnpm stylelint
-      - run:
-          name: Lint JSON
-          command: pnpm jsonlint
       - run:
           name: Lint Markdown
           command: pnpm markdownlint
   test_static:
     <<: *default-job
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: '`pnpm dedupe` was run?'
           command: |
@@ -195,16 +177,15 @@ jobs:
     resource_class: 'medium+'
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: Tests TypeScript definitions
           command: pnpm typescript
           environment:
             NODE_OPTIONS: --max-old-space-size=3072
       - run:
           name: Any defect declaration files?
-          command: node scripts/testBuiltTypes.mjs
+          command: pnpm code-infra validate-built-types
       - save_cache:
           name: Save generated declaration files
           key: typescript-declaration-files-{{ .Branch }}-{{ .Revision }}
@@ -216,8 +197,7 @@ jobs:
     resource_class: 'medium+'
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: Resolve typescript version
           command: |
@@ -240,17 +220,16 @@ jobs:
             # Fixing these takes some effort that isn't viable to merge in a single PR.
             # We'll simply monitor them for now.
             set +e
-            node scripts/testBuiltTypes.mjs
+            pnpm code-infra validate-built-types
             exit 0
   test_browser:
     <<: *default-job
     resource_class: 'medium+'
     docker:
-      - image: mcr.microsoft.com/playwright:v1.55.1-noble
+      - image: mcr.microsoft.com/playwright:v1.56.1-noble
     steps:
       - checkout
       - install_js:
-          react-version: << parameters.react-version >>
           browsers: true
       - run:
           name: Run tests on headless Chromium
@@ -271,11 +250,10 @@ jobs:
   test_regressions:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.55.1-noble
+      - image: mcr.microsoft.com/playwright:v1.56.1-noble
     steps:
       - checkout
       - install_js:
-          react-version: << parameters.react-version >>
           browsers: true
       - run:
           name: Run visual regression tests
@@ -286,7 +264,7 @@ jobs:
   test_e2e:
     <<: *default-job
     docker:
-      - image: mcr.microsoft.com/playwright:v1.55.1-noble
+      - image: mcr.microsoft.com/playwright:v1.56.1-noble
     steps:
       - checkout
       - install_js:
@@ -299,14 +277,13 @@ jobs:
     <<: *default-job
     steps:
       - checkout
-      - install_js:
-          react-version: << parameters.react-version >>
+      - install_js
       - run:
           name: Build packages
           command: pnpm release:build
       - run:
           name: Validate type declarations
-          command: pnpm validate-declarations
+          command: pnpm code-infra validate-built-types
       - run:
           name: Check public types
           command: pnpm -r run release:test

.github/workflows/ci.yml

@@ -27,9 +27,9 @@ jobs:
           # fetch all tags which are required for `pnpm release:changelog`
           fetch-depth: 0
       - name: Set up pnpm
-        uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+        uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
       - name: Use Node.js 22.x
-        uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
+        uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
         with:
           node-version: '22.18'
           cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           languages: typescript
           config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
           # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
           # queries: security-extended,security-and-quality
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0

.github/workflows/scorecards.yml

@@ -40,6 +40,6 @@ jobs:
           publish_results: true
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           sarif_file: results.sarif

.markdownlint-cli2.mjs

@@ -7,5 +7,6 @@ export default {
   config: {
     ...baseline.config,
     MD038: false, // false positives in MDX
+    MD041: false, // false positives in MDX
   },
 };

AGENTS.md

@@ -13,7 +13,7 @@ This repository contains the source code and documentation for Base UI: a headl
 ## Code guidelines
 
 - Always use the `useTimeout` utility from `@base-ui-components/utils/useTimeout` instead of `window.setTimeout`, and `useAnimationFrame` from `@base-ui-components/utils/useAnimationFrame` instead of `requestAnimationFrame`. Search for other example usage in the codebase if unsure how to use them.
-- Use the `useEventCallback` utility from `@base-ui-components/utils/useEventCallback` instead of `React.useCallback` if the function is called within an effect or event handler. The utility cannot be used to memoize functions that are called directly in the body of a component (during render), so continue with `React.useCallback` in those scenarios.
+- Use the `useStableCallback` utility from `@base-ui-components/utils/useStableCallback` instead of `React.useCallback` if the function is called within an effect or event handler. The utility cannot be used to memoize functions that are called directly in the body of a component (during render), so continue with `React.useCallback` in those scenarios.
 - Always use the `useIsoLayoutEffect` utility from `@base-ui-components/utils/useIsoLayoutEffect` instead of `React.useLayoutEffect`.
 - Avoid duplicating logic where necessary. If two components can share logic (such as event handlers), define the logic/handlers in the parent and share it through a context to the child; use the existing context if it exists.
 

README.md

@@ -25,11 +25,11 @@ To see the latest updates, check out the [releases](https://base-ui.com/react/ov
 ## Team
 
 - **Colm Tuite** (Radix) [@colmtuite](https://x.com/colmtuite)
-- **Vlad Moroz** (Radix) [@vladyslavmoroz](https://x.com/vladyslavmoroz)
 - **James Nelson** (Floating UI) [@atomiksdev](https://x.com/atomiksdev)
 - **Michał Dudak** (Material UI) [@michaldudak](https://x.com/michaldudak)
 - **Marija Najdova** (Material UI + Fluent UI) [@marijanajdova](https://x.com/marijanajdova)
 - **Albert Yu** (Material UI) [@mj12albert](https://github.com/mj12albert)
+- **Lukas Tyla** (Material UI) [@LukasTy](https://github.com/LukasTy)
 
 ## License
 

babel.config.mjs

@@ -1,10 +1,29 @@
 import getBaseConfig from '@mui/internal-code-infra/babel-config';
+import * as path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const errorCodesPath = path.join(dirname, 'docs/src/error-codes.json');
 
 export default function getBabelConfig(api) {
   const baseConfig = getBaseConfig(api);
 
+  const plugins = [
+    [
+      '@mui/internal-babel-plugin-minify-errors',
+      {
+        missingError: 'annotate',
+        runtimeModule: '#formatErrorMessage',
+        detection: 'opt-out',
+        errorCodesPath,
+      },
+    ],
+  ];
+
   return {
     ...baseConfig,
+    plugins: [...baseConfig.plugins, ...plugins],
     overrides: [
       {
         exclude: /\.test\.(js|ts|tsx)$/,

docs/README.md

@@ -16,3 +16,20 @@ Package managers other than pnpm (like npm or Yarn) are not supported and will n
 
 [You can follow this guide](https://github.com/mui/base-ui/blob/HEAD/CONTRIBUTING.md)
 on how to get started contributing to Base UI.
+
+## Error code extraction
+
+Errors in production are minified. They are extracted out of the source code by running the command
+
+```bash
+pnpm extract-error-codes
+```
+
+This updates the `./src/error-codes.json` file with the newly extracted errors.
+
+Important: If you just altered the text of an error, you are allowed to update the existing error code with the new text in `./src/error-codes.json`, but only under the following conditions:
+
+1. There hasn't been an update to the semantic meaning of the error message. Error codes need to outlive Base UI versions, so the same code must mean the same thing across versions.
+2. There hasn't been a change in parameters, no added and no removed.
+
+In both of those cases, always create a new error code lline in `./src/error-codes.json`.

docs/next.config.mjs

@@ -2,7 +2,7 @@
 import * as path from 'path';
 import * as url from 'url';
 import * as fs from 'fs';
-import withDocsInfra from '@mui/monorepo/docs/nextConfigDocsInfra.js';
+import { withDeploymentConfig } from '@mui/internal-docs-infra/withDocsInfra';
 import nextMdx from '@next/mdx';
 import rehypeExtractToc from '@stefanprobst/rehype-extract-toc';
 import remarkGfm from 'remark-gfm';
@@ -59,7 +59,7 @@ const nextConfig = {
   devIndicators: false,
 };
 
-const mergedConfig = withMdx(withDocsInfra(nextConfig));
+const mergedConfig = withMdx(withDeploymentConfig(nextConfig));
 
 if (!process.env.CI) {
   delete mergedConfig.experimental?.cpus;