Skip to content

[core] Prepare master for v7 stable #45674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 25, 2025
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- #host-reference -->
<!-- markdownlint-disable-next-line -->
<p align="center">
<a href="https://next.mui.com/core/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="Material UI logo"></a>
<a href="https://mui.com/core/" rel="noopener" target="_blank"><img width="150" height="133" src="https://mui.com/static/logo.svg" alt="Material UI logo"></a>
</p>

<h1 align="center">Material UI</h1>
Expand Down
6 changes: 3 additions & 3 deletions docs/data/material/components/about-the-lab/about-the-lab.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ To install and save in your `package.json` dependencies, run one of the followin
<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>
Expand Down
6 changes: 3 additions & 3 deletions docs/data/material/components/icons/icons.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ Run one of the following commands to install it and save it to your `package.jso

<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ Use one of the following commands to install it:
<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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ Run one of the following commands to add Material UI to your project:
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/material@next @emotion/react @emotion/styled
npm install @mui/material @emotion/react @emotion/styled
```

```bash pnpm
pnpm add @mui/material@next @emotion/react @emotion/styled
pnpm add @mui/material @emotion/react @emotion/styled
```

```bash yarn
yarn add @mui/material@next @emotion/react @emotion/styled
yarn add @mui/material @emotion/react @emotion/styled
```

</codeblock>
Expand Down
20 changes: 10 additions & 10 deletions docs/data/material/getting-started/support/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ This includes issues introduced by external sources, like browser upgrades or ch

### Supported versions

| Material UI version | Release | Supported |
| ------------------: | :--------- | :------------------------------------------------------------------ |
| ^7.0.0 | March 2025 | 🚧 Pre release (Continuous support) |
| ^6.0.0 | 2024-08-26 | ✅ Stable major (Continuous support) |
| ^5.0.0 | 2021-09-16 | ⚠️ Long-term support (Support for security issues and regressions). |
| ^4.0.0 | 2019-06-23 | ❌ |
| ^3.0.0 | 2018-08-27 | ❌ |
| ^2.0.0 | / | ❌ |
| ^1.0.0 | 2018-06-18 | ❌ |
| <=1.0.0 | 2014-10-05 | ❌ |
| Material UI version | Release | Supported |
| ------------------: | :--------- | :----------------------------------------------------------------- |
| ^7.0.0 | 2025-03-26 | ✅ Stable major (Continuous support) |
| ^6.0.0 | 2024-08-26 | ⚠️ Long-term support (Support for security issues and regressions) |
| ^5.0.0 | 2021-09-16 | |
| ^4.0.0 | 2019-06-23 | ❌ |
| ^3.0.0 | 2018-08-27 | ❌ |
| ^2.0.0 | / | ❌ |
| ^1.0.0 | 2018-06-18 | ❌ |
| <=1.0.0 | 2014-10-05 | ❌ |

## Community

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/blog/.
View the demo at https://mui.com/material-ui/getting-started/templates/blog/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/checkout/.
View the demo at https://mui.com/material-ui/getting-started/templates/checkout/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/dashboard/.
View the demo at https://mui.com/material-ui/getting-started/templates/dashboard/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/marketing-page/.
View the demo at https://mui.com/material-ui/getting-started/templates/marketing-page/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in-side/.
View the demo at https://mui.com/material-ui/getting-started/templates/sign-in-side/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in/.
View the demo at https://mui.com/material-ui/getting-started/templates/sign-in/.
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@

<!-- #host-reference -->

View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-up/.
View the demo at https://mui.com/material-ui/getting-started/templates/sign-up/.
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ If you're using yarn, you can configure it using a package resolution:
```diff title="package.json"
{
"dependencies": {
- "@mui/styled-engine": "next"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
- "@mui/styled-engine": "latest"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
},
+ "resolutions": {
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
+ },
}
```
Expand Down
6 changes: 3 additions & 3 deletions docs/data/material/migration/upgrade-to-v7/upgrade-to-v7.md
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ Depending on your project, you may follow one of the following approaches:
<!-- #npm-tag-reference -->

```bash
npx @mui/codemod@next v7.0.0/grid-props <path/to/folder>
npx @mui/codemod v7.0.0/grid-props <path/to/folder>
```

See the [Grid upgrade guide](/material-ui/migration/upgrade-to-grid-v2/) for more information.
Expand Down Expand Up @@ -233,7 +233,7 @@ Use this codemod to automatically update the `size` value:
<!-- #npm-tag-reference -->

```bash
npx @mui/codemod@next v7.0.0/input-label-size-normal-medium <path/to/folder>
npx @mui/codemod v7.0.0/input-label-size-normal-medium <path/to/folder>
```

### SvgIcon's data-testid removed
Expand Down Expand Up @@ -488,7 +488,7 @@ Use this codemod to automatically update the imports:
<!-- #npm-tag-reference -->

```bash
npx @mui/codemod@next v7.0.0/lab-removed-components <path/to/folder>
npx @mui/codemod v7.0.0/lab-removed-components <path/to/folder>
```

:::warning
Expand Down
6 changes: 3 additions & 3 deletions docs/data/system/getting-started/installation/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ If you want to use [styled-components](https://styled-components.com/) instead,
<codeblock storageKey="package-manager">

```bash npm
npm install @mui/system@next @mui/styled-engine-sc@next styled-components
npm install @mui/system @mui/styled-engine-sc styled-components
```

```bash pnpm
pnpm add @mui/system@next @mui/styled-engine-sc@next styled-components
pnpm add @mui/system @mui/styled-engine-sc styled-components
```

```bash yarn
yarn add @mui/system@next @mui/styled-engine-sc@next styled-components
yarn add @mui/system @mui/styled-engine-sc styled-components
```

</codeblock>
Expand Down
16 changes: 8 additions & 8 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:clean": "rimraf .next && pnpm build",
"build-sw": "node ./scripts/buildServiceWorker.js",
"dev": "next dev",
"deploy": "git push -f material-ui-docs master:next",
"deploy": "git push -f material-ui-docs master:latest",
"icons": "rimraf --glob public/static/icons/* && node ./scripts/buildIcons.js",
"start": "serve ./export",
"create-playground": "cpy --cwd=scripts playground.template.tsx ../../pages/playground --rename=index.tsx",
Expand All @@ -31,17 +31,17 @@
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/base": "workspace:*",
"@mui/docs": "workspace:*",
"@mui/icons-material": "workspace:*",
"@mui/docs": "workspace:^",
"@mui/icons-material": "workspace:^",
"@mui/internal-markdown": "workspace:^",
"@mui/joy": "workspace:*",
"@mui/lab": "workspace:*",
"@mui/material": "workspace:*",
"@mui/styled-engine": "workspace:*",
"@mui/styled-engine-sc": "workspace:*",
"@mui/system": "workspace:*",
"@mui/material": "workspace:^",
"@mui/styled-engine": "workspace:^",
"@mui/styled-engine-sc": "workspace:^",
"@mui/system": "workspace:^",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:*",
"@mui/utils": "workspace:^",
"@mui/x-charts": "7.28.0",
"@mui/x-data-grid": "7.28.1",
"@mui/x-data-grid-generator": "7.28.1",
Expand Down
7 changes: 5 additions & 2 deletions docs/pages/_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ function AppWrapper(props) {
wordmarkSvg: muiSvgWordmarkString,
versions: [
{ text: `v${materialPkgJson.version}`, current: true },
{ text: `v6`, href: `https://mui.com${languagePrefix}/material-ui/getting-started/` },
{
text: 'v6',
href: `https://v6.mui.com${languagePrefix}/material-ui/getting-started/`,
},
{
text: 'v5',
href: `https://v5.mui.com${languagePrefix}/getting-started/installation/`,
Expand Down Expand Up @@ -215,7 +218,7 @@ function AppWrapper(props) {
wordmarkSvg: muiSvgWordmarkString,
versions: [
{ text: `v${systemPkgJson.version}`, current: true },
{ text: 'v6', href: `https://mui.com${languagePrefix}/system/getting-started/` },
{ text: 'v6', href: `https://v6.mui.com${languagePrefix}/system/getting-started/` },
{ text: 'v5', href: `https://v5.mui.com${languagePrefix}/system/getting-started/` },
{ text: 'v4', href: `https://v4.mui.com${languagePrefix}/system/basics/` },
{
Expand Down
18 changes: 9 additions & 9 deletions docs/public/_redirects
Original file line number Diff line number Diff line change
Expand Up @@ -512,10 +512,10 @@ https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
/material-ui/experimental-api/css-theme-variables/customization/ /material-ui/customization/css-theme-variables/configuration/ 301
/base-ui/ https://base-ui.com/ 301
#2025
#host-reference change https:/mui.com to https:/v6.mui.com when domains are switched
/system/styles/basics/ https://mui.com/system/styles/basics/ 301
/system/styles/advanced/ https://mui.com/system/styles/advanced/ 301
/system/styles/api/ https://mui.com/system/styles/api/ 301
#host-reference
/system/styles/basics/ https://v6.mui.com/system/styles/basics/ 301
/system/styles/advanced/ https://v6.mui.com/system/styles/advanced/ 301
/system/styles/api/ https://v6.mui.com/system/styles/api/ 301

# Proxies

Expand All @@ -530,11 +530,11 @@ https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
## MUI X
## Unlike the store that expect to be hosted under a subfolder,
## MUI X is configured to be hosted at the root.
/static/x/* https://docs-next--material-ui-x.netlify.app/static/x/:splat 200
/x/_next/* https://docs-next--material-ui-x.netlify.app/_next/:splat 200
/x/* https://docs-next--material-ui-x.netlify.app/x/:splat 200
/r/x-* https://docs-next--material-ui-x.netlify.app/r/x-:splat 200
/:lang/x/* https://docs-next--material-ui-x.netlify.app/:lang/x/:splat 200
/static/x/* https://material-ui-x.netlify.app/static/x/:splat 200
/x/_next/* https://material-ui-x.netlify.app/_next/:splat 200
/x/* https://material-ui-x.netlify.app/x/:splat 200
/r/x-* https://material-ui-x.netlify.app/r/x-:splat 200
/:lang/x/* https://material-ui-x.netlify.app/:lang/x/:splat 200
Comment on lines +532 to +536
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverts #45207


## Toolpad
/toolpad/core/templates/nextjs-dashboard/_next/* https://toolpad-core-nextjs-themed.vercel.app/_next/:splat 200
Expand Down
4 changes: 2 additions & 2 deletions docs/scripts/reportBrokenLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ Object.keys(usedLinks)
//
// <!-- #host-reference -->
//
write(`- https://next.mui.com${linkKey}`);
console.log(`https://next.mui.com${linkKey}`);
write(`- https://mui.com${linkKey}`);
console.log(`https://mui.com${linkKey}`);

console.log(`used in`);
usedLinks[linkKey].forEach((f) => console.log(`- ${path.relative(docsSpaceRoot, f)}`));
Expand Down
4 changes: 2 additions & 2 deletions docs/src/modules/components/Head.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
// #host-reference
const HOST = process.env.PULL_REQUEST_ID
? `https://deploy-preview-${process.env.PULL_REQUEST_ID}--${process.env.NETLIFY_SITE_NAME}.netlify.app`
: 'https://next.mui.com';
: 'https://mui.com';

interface HeadProps {
card?: string;
Expand Down Expand Up @@ -64,7 +64,7 @@ export default function Head(props: HeadProps) {
<link
key={userLanguage2}
rel="alternate"
href={`https://next.mui.com${
href={`https://mui.com${
userLanguage2 === 'en' ? '' : `/${userLanguage2}`
}${canonicalAs}`}
hrefLang={userLanguage2}
Expand Down
6 changes: 3 additions & 3 deletions docs/src/modules/sandbox/CodeSandbox.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('CodeSandbox', () => {
dependencies: {
react: 'latest',
// #npm-tag-reference
'@mui/material': 'next',
'@mui/material': 'latest',
'react-dom': 'latest',
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
Expand Down Expand Up @@ -125,7 +125,7 @@ ReactDOM.createRoot(document.querySelector("#root")).render(
dependencies: {
react: 'latest',
// #npm-tag-reference
'@mui/material': 'next',
'@mui/material': 'latest',
'react-dom': 'latest',
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
Expand Down Expand Up @@ -233,7 +233,7 @@ ReactDOM.createRoot(document.querySelector("#root")!).render(
'@emotion/react': 'latest',
'@emotion/styled': 'latest',
// #npm-tag-reference
'@mui/material': 'next',
'@mui/material': 'latest',
'@types/react': 'latest',
'@types/react-dom': 'latest',
react: 'latest',
Expand Down
Loading