Skip to content

Commit 97cc2af

Browse files
DiegoAndaiDiegoAndai
authored
[core] Prepare master for v7 stable (#45674)
1 parent d8aa7fc commit 97cc2af

File tree

219 files changed

+596
-593
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

219 files changed

+596
-593
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- #host-reference -->
22
<!-- markdownlint-disable-next-line -->
33
<p align="center">
4-
<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>
4+
<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>
55
</p>
66

77
<h1 align="center">Material UI</h1>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ To install and save in your `package.json` dependencies, run one of the followin
2424
<codeblock storageKey="package-manager">
2525

2626
```bash npm
27-
npm install @mui/lab@next @mui/material@next
27+
npm install @mui/lab @mui/material
2828
```
2929

3030
```bash pnpm
31-
pnpm add @mui/lab@next @mui/material@next
31+
pnpm add @mui/lab @mui/material
3232
```
3333

3434
```bash yarn
35-
yarn add @mui/lab@next @mui/material@next
35+
yarn add @mui/lab @mui/material
3636
```
3737

3838
</codeblock>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ Run one of the following commands to install it and save it to your `package.jso
3030

3131
<codeblock storageKey="package-manager">
3232
```bash npm
33-
npm install @mui/icons-material@next
33+
npm install @mui/icons-material
3434
```
3535

3636
```bash pnpm
37-
pnpm add @mui/icons-material@next
37+
pnpm add @mui/icons-material
3838
```
3939

4040
```bash yarn
41-
yarn add @mui/icons-material@next
41+
yarn add @mui/icons-material
4242
```
4343

4444
</codeblock>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ Use one of the following commands to install it:
2323
<codeblock storageKey="package-manager">
2424

2525
```bash npm
26-
npm install @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
26+
npm install @mui/icons-material @mui/material @emotion/styled @emotion/react
2727
```
2828

2929
```bash pnpm
30-
pnpm add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
30+
pnpm add @mui/icons-material @mui/material @emotion/styled @emotion/react
3131
```
3232

3333
```bash yarn
34-
yarn add @mui/icons-material@next @mui/material@next @emotion/styled @emotion/react
34+
yarn add @mui/icons-material @mui/material @emotion/styled @emotion/react
3535
```
3636

3737
</codeblock>

‎docs/data/material/getting-started/installation/installation.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ Run one of the following commands to add Material UI to your project:
1111
<codeblock storageKey="package-manager">
1212

1313
```bash npm
14-
npm install @mui/material@next @emotion/react @emotion/styled
14+
npm install @mui/material @emotion/react @emotion/styled
1515
```
1616

1717
```bash pnpm
18-
pnpm add @mui/material@next @emotion/react @emotion/styled
18+
pnpm add @mui/material @emotion/react @emotion/styled
1919
```
2020

2121
```bash yarn
22-
yarn add @mui/material@next @emotion/react @emotion/styled
22+
yarn add @mui/material @emotion/react @emotion/styled
2323
```
2424

2525
</codeblock>

‎docs/data/material/getting-started/support/support.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ This includes issues introduced by external sources, like browser upgrades or ch
7272

7373
### Supported versions
7474

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

8686
## Community
8787

‎docs/data/material/getting-started/templates/blog/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/blog/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/blog/.

‎docs/data/material/getting-started/templates/checkout/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/checkout/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/checkout/.

‎docs/data/material/getting-started/templates/dashboard/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/dashboard/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/dashboard/.

‎docs/data/material/getting-started/templates/marketing-page/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/marketing-page/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/marketing-page/.

‎docs/data/material/getting-started/templates/sign-in-side/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in-side/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/sign-in-side/.

‎docs/data/material/getting-started/templates/sign-in/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-in/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/sign-in/.

‎docs/data/material/getting-started/templates/sign-up/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212

1313
<!-- #host-reference -->
1414

15-
View the demo at https://next.mui.com/material-ui/getting-started/templates/sign-up/.
15+
View the demo at https://mui.com/material-ui/getting-started/templates/sign-up/.

‎docs/data/material/integrations/styled-components/styled-components.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ If you're using yarn, you can configure it using a package resolution:
3535
```diff title="package.json"
3636
{
3737
"dependencies": {
38-
- "@mui/styled-engine": "next"
39-
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
38+
- "@mui/styled-engine": "latest"
39+
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
4040
},
4141
+ "resolutions": {
42-
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@next"
42+
+ "@mui/styled-engine": "npm:@mui/styled-engine-sc@latest"
4343
+ },
4444
}
4545
```

‎docs/data/material/migration/upgrade-to-v7/upgrade-to-v7.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Depending on your project, you may follow one of the following approaches:
160160
<!-- #npm-tag-reference -->
161161

162162
```bash
163-
npx @mui/codemod@next v7.0.0/grid-props <path/to/folder>
163+
npx @mui/codemod v7.0.0/grid-props <path/to/folder>
164164
```
165165

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

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

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

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

494494
:::warning

‎docs/data/system/getting-started/installation/installation.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ If you want to use [styled-components](https://styled-components.com/) instead,
4444
<codeblock storageKey="package-manager">
4545

4646
```bash npm
47-
npm install @mui/system@next @mui/styled-engine-sc@next styled-components
47+
npm install @mui/system @mui/styled-engine-sc styled-components
4848
```
4949

5050
```bash pnpm
51-
pnpm add @mui/system@next @mui/styled-engine-sc@next styled-components
51+
pnpm add @mui/system @mui/styled-engine-sc styled-components
5252
```
5353

5454
```bash yarn
55-
yarn add @mui/system@next @mui/styled-engine-sc@next styled-components
55+
yarn add @mui/system @mui/styled-engine-sc styled-components
5656
```
5757

5858
</codeblock>

‎docs/package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"build:clean": "rimraf .next && pnpm build",
1010
"build-sw": "node ./scripts/buildServiceWorker.js",
1111
"dev": "next dev",
12-
"deploy": "git push -f material-ui-docs master:next",
12+
"deploy": "git push -f material-ui-docs master:latest",
1313
"icons": "rimraf --glob public/static/icons/* && node ./scripts/buildIcons.js",
1414
"start": "serve ./export",
1515
"create-playground": "cpy --cwd=scripts playground.template.tsx ../../pages/playground --rename=index.tsx",
@@ -31,17 +31,17 @@
3131
"@fortawesome/free-solid-svg-icons": "^6.7.2",
3232
"@fortawesome/react-fontawesome": "^0.2.2",
3333
"@mui/base": "workspace:*",
34-
"@mui/docs": "workspace:*",
35-
"@mui/icons-material": "workspace:*",
34+
"@mui/docs": "workspace:^",
35+
"@mui/icons-material": "workspace:^",
3636
"@mui/internal-markdown": "workspace:^",
3737
"@mui/joy": "workspace:*",
3838
"@mui/lab": "workspace:*",
39-
"@mui/material": "workspace:*",
40-
"@mui/styled-engine": "workspace:*",
41-
"@mui/styled-engine-sc": "workspace:*",
42-
"@mui/system": "workspace:*",
39+
"@mui/material": "workspace:^",
40+
"@mui/styled-engine": "workspace:^",
41+
"@mui/styled-engine-sc": "workspace:^",
42+
"@mui/system": "workspace:^",
4343
"@mui/types": "workspace:^",
44-
"@mui/utils": "workspace:*",
44+
"@mui/utils": "workspace:^",
4545
"@mui/x-charts": "7.28.0",
4646
"@mui/x-data-grid": "7.28.1",
4747
"@mui/x-data-grid-generator": "7.28.1",

‎docs/pages/_app.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,10 @@ function AppWrapper(props) {
178178
wordmarkSvg: muiSvgWordmarkString,
179179
versions: [
180180
{ text: `v${materialPkgJson.version}`, current: true },
181-
{ text: `v6`, href: `https://mui.com${languagePrefix}/material-ui/getting-started/` },
181+
{
182+
text: 'v6',
183+
href: `https://v6.mui.com${languagePrefix}/material-ui/getting-started/`,
184+
},
182185
{
183186
text: 'v5',
184187
href: `https://v5.mui.com${languagePrefix}/getting-started/installation/`,
@@ -215,7 +218,7 @@ function AppWrapper(props) {
215218
wordmarkSvg: muiSvgWordmarkString,
216219
versions: [
217220
{ text: `v${systemPkgJson.version}`, current: true },
218-
{ text: 'v6', href: `https://mui.com${languagePrefix}/system/getting-started/` },
221+
{ text: 'v6', href: `https://v6.mui.com${languagePrefix}/system/getting-started/` },
219222
{ text: 'v5', href: `https://v5.mui.com${languagePrefix}/system/getting-started/` },
220223
{ text: 'v4', href: `https://v4.mui.com${languagePrefix}/system/basics/` },
221224
{

‎docs/public/_redirects

+8-9
Original file line numberDiff line numberDiff line change
@@ -512,10 +512,9 @@ https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
512512
/material-ui/experimental-api/css-theme-variables/customization/ /material-ui/customization/css-theme-variables/configuration/ 301
513513
/base-ui/ https://base-ui.com/ 301
514514
#2025
515-
#host-reference change https:/mui.com to https:/v6.mui.com when domains are switched
516-
/system/styles/basics/ https://mui.com/system/styles/basics/ 301
517-
/system/styles/advanced/ https://mui.com/system/styles/advanced/ 301
518-
/system/styles/api/ https://mui.com/system/styles/api/ 301
515+
/system/styles/basics/ https://v6.mui.com/system/styles/basics/ 301
516+
/system/styles/advanced/ https://v6.mui.com/system/styles/advanced/ 301
517+
/system/styles/api/ https://v6.mui.com/system/styles/api/ 301
519518

520519
# Proxies
521520

@@ -530,11 +529,11 @@ https://v4.material-ui.com/* https://v4.mui.com/:splat 301!
530529
## MUI X
531530
## Unlike the store that expect to be hosted under a subfolder,
532531
## MUI X is configured to be hosted at the root.
533-
/static/x/* https://docs-next--material-ui-x.netlify.app/static/x/:splat 200
534-
/x/_next/* https://docs-next--material-ui-x.netlify.app/_next/:splat 200
535-
/x/* https://docs-next--material-ui-x.netlify.app/x/:splat 200
536-
/r/x-* https://docs-next--material-ui-x.netlify.app/r/x-:splat 200
537-
/:lang/x/* https://docs-next--material-ui-x.netlify.app/:lang/x/:splat 200
532+
/static/x/* https://material-ui-x.netlify.app/static/x/:splat 200
533+
/x/_next/* https://material-ui-x.netlify.app/_next/:splat 200
534+
/x/* https://material-ui-x.netlify.app/x/:splat 200
535+
/r/x-* https://material-ui-x.netlify.app/r/x-:splat 200
536+
/:lang/x/* https://material-ui-x.netlify.app/:lang/x/:splat 200
538537

539538
## Toolpad
540539
/toolpad/core/templates/nextjs-dashboard/_next/* https://toolpad-core-nextjs-themed.vercel.app/_next/:splat 200

‎docs/scripts/reportBrokenLinks.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ Object.keys(usedLinks)
4747
//
4848
// <!-- #host-reference -->
4949
//
50-
write(`- https://next.mui.com${linkKey}`);
51-
console.log(`https://next.mui.com${linkKey}`);
50+
write(`- https://mui.com${linkKey}`);
51+
console.log(`https://mui.com${linkKey}`);
5252

5353
console.log(`used in`);
5454
usedLinks[linkKey].forEach((f) => console.log(`- ${path.relative(docsSpaceRoot, f)}`));

‎docs/src/modules/components/Head.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { pathnameToLanguage } from 'docs/src/modules/utils/helpers';
88
// #host-reference
99
const HOST = process.env.PULL_REQUEST_ID
1010
? `https://deploy-preview-${process.env.PULL_REQUEST_ID}--${process.env.NETLIFY_SITE_NAME}.netlify.app`
11-
: 'https://next.mui.com';
11+
: 'https://mui.com';
1212

1313
interface HeadProps {
1414
card?: string;
@@ -64,7 +64,7 @@ export default function Head(props: HeadProps) {
6464
<link
6565
key={userLanguage2}
6666
rel="alternate"
67-
href={`https://next.mui.com${
67+
href={`https://mui.com${
6868
userLanguage2 === 'en' ? '' : `/${userLanguage2}`
6969
}${canonicalAs}`}
7070
hrefLang={userLanguage2}

‎docs/src/modules/sandbox/CodeSandbox.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('CodeSandbox', () => {
3434
dependencies: {
3535
react: 'latest',
3636
// #npm-tag-reference
37-
'@mui/material': 'next',
37+
'@mui/material': 'latest',
3838
'react-dom': 'latest',
3939
'@emotion/react': 'latest',
4040
'@emotion/styled': 'latest',
@@ -125,7 +125,7 @@ ReactDOM.createRoot(document.querySelector("#root")).render(
125125
dependencies: {
126126
react: 'latest',
127127
// #npm-tag-reference
128-
'@mui/material': 'next',
128+
'@mui/material': 'latest',
129129
'react-dom': 'latest',
130130
'@emotion/react': 'latest',
131131
'@emotion/styled': 'latest',
@@ -233,7 +233,7 @@ ReactDOM.createRoot(document.querySelector("#root")!).render(
233233
'@emotion/react': 'latest',
234234
'@emotion/styled': 'latest',
235235
// #npm-tag-reference
236-
'@mui/material': 'next',
236+
'@mui/material': 'latest',
237237
'@types/react': 'latest',
238238
'@types/react-dom': 'latest',
239239
react: 'latest',

0 commit comments

Comments
 (0)