Merge branch 'master' into revert-grid-wrap-deprecation

.circleci/config.yml

@@ -142,7 +142,7 @@ jobs:
                 name: '`pnpm dedupe` was run?'
                 command: |
                   # #default-branch-switch
-                  if [[ $(git diff --name-status next | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
+                  if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
                   then
                       echo "No changes to dependencies detected. Skipping..."
                   else

.eslintignore

@@ -1,6 +1,5 @@
 /.git
 /.yarn
-/benchmark/**/dist
 /coverage
 /docs/export
 /docs/pages/playground/
@@ -29,6 +28,7 @@
 /tmp
 .next
 build
+dist
 node_modules
 .nyc_output
 pnpm-lock.yaml

.eslintrc.js

@@ -223,6 +223,11 @@ module.exports = {
         selector:
           'ImportDeclaration[source.value="react-dom/server"] ImportDefaultSpecifier, ImportDeclaration[source.value="react-dom/server"] ImportSpecifier',
       },
+      {
+        message:
+          "The 'use client' pragma can't be used with export * in the same module. This is not supported by Next.js.",
+        selector: 'ExpressionStatement[expression.value="use client"] ~ ExportAllDeclaration',
+      },
     ],
 
     // We re-export default in many places, remove when https://github.com/airbnb/javascript/issues/2500 gets resolved

.github/workflows/closed-issue-message.yml

@@ -12,7 +12,7 @@ jobs:
   add-comment:
     name: Add closing message
     if: github.event.issue.state_reason == 'completed'
-    uses: mui/mui-public/.github/workflows/reusable/add-closing-message-to-issue.yml@04275a99fe10cee127ee417b8a872cfebc7d08e7
+    uses: mui/mui-public/.github/workflows/add-closing-message-to-issue.yml@master
     permissions:
       contents: read
       issues: write

.github/workflows/codeql.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
         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@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5

.github/workflows/scorecards.yml

@@ -43,6 +43,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
         with:
           sarif_file: results.sarif

.gitignore

@@ -11,7 +11,6 @@
 *.tsbuildinfo
 /.eslintcache
 /.nyc_output
-/benchmark/**/dist
 /coverage
 /docs/.env.local
 /docs/export
@@ -34,6 +33,7 @@
 # created by netlify dev (to perform local debug)
 .netlify
 build
+dist
 node_modules
 package-lock.json
 size-snapshot.json

CHANGELOG.md

@@ -1,5 +1,51 @@
 # [Versions](https://mui.com/versions/)
 
+## 6.0.0
+
+<!-- generated comparing v6.0.0-rc.0..master -->
+
+_Aug 27, 2024_
+
+We are excited to announce the stable release of Material-UI v6 🎉, check out [the blog post](https://mui.com/blog/material-ui-v6-is-out/) to see all the updates.
+
+### `@mui/material@6.0.0`
+
+- Change React.ReactElement<any,any> type from any to unknown (#43358) @sai6855
+- [Pagination] Update `getItemAriaLabel` page param type (#43399) @sydneyjodon-wk
+- [Unstable_TrapFocus] Fix `getTabbable` function return type (#42237) @KalmarLorand
+
+### `@mui/lab@6.0.0-beta.8`
+
+- [button] Add missing customize points for span (#43436) @oliviertassinari
+
+### Docs
+
+- Fix broken links (#43144) @DiegoAndai
+- Updated mui-x roadmap links with the new project URL (#43444) @michelengelen
+- Update pnpm order, move to second (#42712) @ahmadnadeem6236
+- Fix CSS theme variables section (#43439) @siriwatknp
+- Add two Toolpad Core components to Material UI sidebar (#43391) @prakhargupta1
+- Fix licensingModel -> licenseModel @oliviertassinari
+- Fix Stack Overflow issue canned response @oliviertassinari
+- Avoid referencing MUI Core @oliviertassinari
+- Fix description of eslint-plugin-material-ui @oliviertassinari
+- [docs-infra] Polish reportBrokenLinks.js to support Base UI @oliviertassinari
+- [material-ui] Clarify RTL language support in localization guide (#41784) @bahmanworld
+- [material-ui] Refine templates theme selector (#43396) @zanivan
+
+### Core
+
+- Prepare for v6 stable release (#43454) @siriwatknp
+- [blog] Polish Upcoming changes to MUI X pricing in 2024 (#43438) @oliviertassinari
+- [blog] Add Material UI v6 stable release (#41932) @siriwatknp
+- [ci] Fix the release:changelog cmd (#43451) @mnajdova
+- [core] Allow `^6.0.0` for `@mui/` dependencies in `@mui/docs` (#43445) @LukasTy
+- [code-infra] Babel plugin to fully resolve imported paths (#43294) @Janpot
+- [infra] Add closing message workflow (#43450) @michelengelen
+- [website] Make beta chip consistent for Toolpad (#43392) @prakhargupta1
+
+All contributors of this release in alphabetical order: @ahmadnadeem6236, @bahmanworld, @DiegoAndai, @Janpot, @KalmarLorand, @LukasTy, @michelengelen, @mnajdova, @oliviertassinari, @prakhargupta1, @sai6855, @siriwatknp, @sydneyjodon-wk, @zanivan
+
 ## 6.0.0-rc.0
 
 <!-- generated comparing v6.0.0-beta.6..next -->

CONTRIBUTING.md

@@ -72,11 +72,11 @@ git remote add upstream https://github.com/mui/material-ui.git
 
 <!-- #default-branch-switch -->
 
-3. Synchronize your local `next` branch with the upstream one:
+3. Synchronize your local `master` branch with the upstream one:
 
 ```bash
-git checkout next
-git pull upstream next
+git checkout master
+git pull upstream master
 ```
 
 4. Install the dependencies with pnpm (yarn or npm aren't supported):
@@ -146,7 +146,7 @@ Make sure the following is true:
 
 <!-- #default-branch-switch -->
 
-- The branch is targeted at `next` for ongoing development. All tests are passing. Code that lands in `next` must be compatible with the latest alpha/beta release. It may contain additional features but no breaking changes. We should be able to release a new minor version from the tip of `next` at any time.
+- The branch is targeted at `master` for ongoing development. All tests are passing. Code that lands in `master` must be compatible with the latest stable release. It may contain additional features but no breaking changes. We should be able to release a new minor version from the tip of `master` at any time.
 - If a feature is being added:
   - If the result was already achievable with the core library, you've explained why this feature needs to be added to the core.
   - If this is a common use case, you've added an example to the documentation.

apps/pigment-css-next-app/package.json

@@ -25,7 +25,7 @@
   "devDependencies": {
     "@pigment-css/nextjs-plugin": "0.0.20",
     "@types/node": "^20.5.7",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "eslint": "^8.57.0",
     "typescript": "^5.5.4"

apps/pigment-css-vite-app/package.json

@@ -26,12 +26,12 @@
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
     "@pigment-css/vite-plugin": "0.0.20",
-    "@types/react": "^18.3.3",
+    "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "@vitejs/plugin-react": "^4.3.1",
     "postcss": "^8.4.41",
     "postcss-combine-media-query": "^1.0.1",
-    "vite": "5.4.1",
+    "vite": "5.4.2",
     "vite-plugin-pages": "^0.32.3"
   },
   "nx": {

babel.config.js

@@ -92,8 +92,8 @@ module.exports = function getBabelConfig(api) {
       '@babel/plugin-transform-runtime',
       {
         useESModules,
-        // any package needs to declare 7.4.4 as a runtime dependency. default is ^7.0.0
-        version: '^7.4.4',
+        // any package needs to declare 7.25.0 as a runtime dependency. default is ^7.0.0
+        version: '^7.25.0',
       },
     ],
     [

docs/data/base/getting-started/quickstart/quickstart.md

@@ -10,24 +10,18 @@ If you're using Next.js 13.4 or later, check out the [Next.js App Router guide](
 
 `@mui/base` is completely standalone – run one of the following commands to add Base UI to your React project:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
-<!-- #default-branch-switch -->
-
 <codeblock storageKey="package-manager">
 
 ```bash npm
-npm install @mui/base@next
+npm install @mui/base
 ```
 
 ```bash pnpm
-pnpm add @mui/base@next
+pnpm add @mui/base
 ```
 
 ```bash yarn
-yarn add @mui/base@next
+yarn add @mui/base
 ```
 
 </codeblock>

docs/data/base/guides/working-with-tailwind-css/working-with-tailwind-css.md

@@ -31,14 +31,8 @@ We'll use [`create-react-app` with TypeScript](https://create-react-app.dev/docs
 After you have created the project, follow the instructions given on the [Tailwind CSS installation page](https://tailwindcss.com/docs/guides/create-react-app) in order to configure `tailwind`.
 Next, install `@mui/base` in the project:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
-<!-- #default-branch-switch -->
-
 ```bash
-npm install @mui/base@next
+npm install @mui/base
 ```
 
 ## Adding the player markup

docs/data/joy/getting-started/installation/installation.md

@@ -6,24 +6,18 @@
 
 Run one of the following commands to add Joy UI to your project:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
-<!-- #default-branch-switch -->
-
 <codeblock storageKey="package-manager">
 
 ```bash npm
-npm install @mui/joy@next @emotion/react @emotion/styled
+npm install @mui/joy @emotion/react @emotion/styled
 ```
 
 ```bash pnpm
-pnpm add @mui/joy@next @emotion/react @emotion/styled
+pnpm add @mui/joy @emotion/react @emotion/styled
 ```
 
 ```bash yarn
-yarn add @mui/joy@next @emotion/react @emotion/styled
+yarn add @mui/joy @emotion/react @emotion/styled
 ```
 
 </codeblock>

docs/data/joy/integrations/icon-libraries/icon-libraries.md

@@ -13,12 +13,8 @@ This section assumes that you've already installed Joy UI in your app—see [In
 
 #### yarn
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
 ```bash
-yarn add @mui/icons-material@next @mui/material@next
+yarn add @mui/icons-material @mui/material
 ```
 
 :::warning
@@ -43,14 +39,8 @@ You can keep track of the progress in [this issue](https://github.com/mui/materi
 
 #### npm
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
-<!-- #default-branch-switch -->
-
 ```bash
-npm install @mui/icons-material@next @mui/material@next
+npm install @mui/icons-material @mui/material
 ```
 
 :::warning

docs/data/material/components/about-the-lab/about-the-lab.md

@@ -19,24 +19,20 @@ For a component to be ready to move to the core, the following criteria are cons
 
 To install and save in your `package.json` dependencies, run one of the following commands:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
 <!-- #default-branch-switch -->
 
 <codeblock storageKey="package-manager">
 
 ```bash npm
-npm install @mui/lab@next @mui/material@next
+npm install @mui/lab @mui/material
 ```
 
 ```bash pnpm
-pnpm add @mui/lab@next @mui/material@next
+pnpm add @mui/lab @mui/material
 ```
 
 ```bash yarn
-yarn add @mui/lab@next @mui/material@next
+yarn add @mui/lab @mui/material
 ```
 
 </codeblock>

docs/data/material/components/dialogs/dialogs.md

@@ -113,7 +113,7 @@ function MyComponent() {
 Confirmation dialogs require users to explicitly confirm their choice before an option is committed.
 For example, users can listen to multiple ringtones but only make a final selection upon touching "OK".
 
-Touching "Cancel" in a confirmation dialog, or pressing Back, cancels the action, discards any changes, and closes the dialog.
+Touching "Cancel" in a confirmation dialog, cancels the action, discards any changes, and closes the dialog.
 
 {{"demo": "ConfirmationDialog.js"}}
 

docs/data/material/components/icons/icons.md

@@ -26,23 +26,19 @@ You can [search the full list of these icons](/material-ui/material-icons/).
 
 Run one of the following commands to install it and save it to your `package.json` dependencies:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
 <!-- #default-branch-switch -->
 
 <codeblock storageKey="package-manager">
 ```bash npm
-npm install @mui/icons-material@next
+npm install @mui/icons-material
 ```
 
 ```bash pnpm
-pnpm add @mui/icons-material@next
+pnpm add @mui/icons-material
 ```
 
 ```bash yarn
-yarn add @mui/icons-material@next
+yarn add @mui/icons-material
 ```
 
 </codeblock>

docs/data/material/components/material-icons/material-icons.md

@@ -18,24 +18,20 @@ includes the 2,100+ official [Material Icons](https://fonts.google.com/icons?ico
 It depends on `@mui/material`, which requires Emotion packages.
 Use one of the following commands to install it:
 
-:::info
-The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
-:::
-
 <!-- #default-branch-switch -->
 
 <codeblock storageKey="package-manager">
 
 ```bash npm
-npm install @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
+npm install @mui/icons-material @mui/material @emotion/styled @emotion/react
 ```
 
 ```bash pnpm
-pnpm add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
+pnpm add @mui/icons-material @mui/material @emotion/styled @emotion/react
 ```
 
 ```bash yarn
-yarn add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
+yarn add @mui/icons-material @mui/material @emotion/styled @emotion/react
 ```
 
 </codeblock>