Skip to content

Commit 46bac33

Browse files
authored
Prepare for v6 stable release (#43454)
1 parent ea49b9f commit 46bac33

File tree

265 files changed

+884
-966
lines changed

Some content is hidden

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

265 files changed

+884
-966
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ jobs:
142142
name: '`pnpm dedupe` was run?'
143143
command: |
144144
# #default-branch-switch
145-
if [[ $(git diff --name-status next | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
145+
if [[ $(git diff --name-status master | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
146146
then
147147
echo "No changes to dependencies detected. Skipping..."
148148
else

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ git remote add upstream https://github.com/mui/material-ui.git
7272

7373
<!-- #default-branch-switch -->
7474

75-
3. Synchronize your local `next` branch with the upstream one:
75+
3. Synchronize your local `master` branch with the upstream one:
7676

7777
```bash
78-
git checkout next
79-
git pull upstream next
78+
git checkout master
79+
git pull upstream master
8080
```
8181

8282
4. Install the dependencies with pnpm (yarn or npm aren't supported):
@@ -146,7 +146,7 @@ Make sure the following is true:
146146

147147
<!-- #default-branch-switch -->
148148

149-
- 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.
149+
- 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.
150150
- If a feature is being added:
151151
- If the result was already achievable with the core library, you've explained why this feature needs to be added to the core.
152152
- If this is a common use case, you've added an example to the documentation.

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,18 @@ If you're using Next.js 13.4 or later, check out the [Next.js App Router guide](
1010

1111
`@mui/base` is completely standalone – run one of the following commands to add Base UI to your React project:
1212

13-
:::info
14-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
15-
:::
16-
17-
<!-- #default-branch-switch -->
18-
1913
<codeblock storageKey="package-manager">
2014

2115
```bash npm
22-
npm install @mui/base@next
16+
npm install @mui/base
2317
```
2418

2519
```bash pnpm
26-
pnpm add @mui/base@next
20+
pnpm add @mui/base
2721
```
2822

2923
```bash yarn
30-
yarn add @mui/base@next
24+
yarn add @mui/base
3125
```
3226

3327
</codeblock>

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,8 @@ We'll use [`create-react-app` with TypeScript](https://create-react-app.dev/docs
3131
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`.
3232
Next, install `@mui/base` in the project:
3333

34-
:::info
35-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
36-
:::
37-
38-
<!-- #default-branch-switch -->
39-
4034
```bash
41-
npm install @mui/base@next
35+
npm install @mui/base
4236
```
4337

4438
## Adding the player markup

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,18 @@
66

77
Run one of the following commands to add Joy UI to your project:
88

9-
:::info
10-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
11-
:::
12-
13-
<!-- #default-branch-switch -->
14-
159
<codeblock storageKey="package-manager">
1610

1711
```bash npm
18-
npm install @mui/joy@next @emotion/react @emotion/styled
12+
npm install @mui/joy @emotion/react @emotion/styled
1913
```
2014

2115
```bash pnpm
22-
pnpm add @mui/joy@next @emotion/react @emotion/styled
16+
pnpm add @mui/joy @emotion/react @emotion/styled
2317
```
2418

2519
```bash yarn
26-
yarn add @mui/joy@next @emotion/react @emotion/styled
20+
yarn add @mui/joy @emotion/react @emotion/styled
2721
```
2822

2923
</codeblock>

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@ This section assumes that you've already installed Joy UI in your app—see [In
1313

1414
#### yarn
1515

16-
:::info
17-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
18-
:::
19-
2016
```bash
21-
yarn add @mui/icons-material@next @mui/material@next
17+
yarn add @mui/icons-material @mui/material
2218
```
2319

2420
:::warning
@@ -43,14 +39,8 @@ You can keep track of the progress in [this issue](https://github.com/mui/materi
4339

4440
#### npm
4541

46-
:::info
47-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
48-
:::
49-
50-
<!-- #default-branch-switch -->
51-
5242
```bash
53-
npm install @mui/icons-material@next @mui/material@next
43+
npm install @mui/icons-material @mui/material
5444
```
5545

5646
:::warning

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,20 @@ For a component to be ready to move to the core, the following criteria are cons
1919

2020
To install and save in your `package.json` dependencies, run one of the following commands:
2121

22-
:::info
23-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
24-
:::
25-
2622
<!-- #default-branch-switch -->
2723

2824
<codeblock storageKey="package-manager">
2925

3026
```bash npm
31-
npm install @mui/lab@next @mui/material@next
27+
npm install @mui/lab @mui/material
3228
```
3329

3430
```bash pnpm
35-
pnpm add @mui/lab@next @mui/material@next
31+
pnpm add @mui/lab @mui/material
3632
```
3733

3834
```bash yarn
39-
yarn add @mui/lab@next @mui/material@next
35+
yarn add @mui/lab @mui/material
4036
```
4137

4238
</codeblock>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,23 +26,19 @@ You can [search the full list of these icons](/material-ui/material-icons/).
2626

2727
Run one of the following commands to install it and save it to your `package.json` dependencies:
2828

29-
:::info
30-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
31-
:::
32-
3329
<!-- #default-branch-switch -->
3430

3531
<codeblock storageKey="package-manager">
3632
```bash npm
37-
npm install @mui/icons-material@next
33+
npm install @mui/icons-material
3834
```
3935

4036
```bash pnpm
41-
pnpm add @mui/icons-material@next
37+
pnpm add @mui/icons-material
4238
```
4339

4440
```bash yarn
45-
yarn add @mui/icons-material@next
41+
yarn add @mui/icons-material
4642
```
4743

4844
</codeblock>

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,20 @@ includes the 2,100+ official [Material Icons](https://fonts.google.com/icons?ico
1818
It depends on `@mui/material`, which requires Emotion packages.
1919
Use one of the following commands to install it:
2020

21-
:::info
22-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
23-
:::
24-
2521
<!-- #default-branch-switch -->
2622

2723
<codeblock storageKey="package-manager">
2824

2925
```bash npm
30-
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
3127
```
3228

3329
```bash pnpm
34-
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
3531
```
3632

3733
```bash yarn
38-
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
3935
```
4036

4137
</codeblock>

docs/data/material/customization/dark-mode/dark-mode.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ We provide codemods to migrate your codebase from using `theme.palette.mode` to
198198
You can run each codemod below or all of them at once.
199199

200200
```bash
201-
npx @mui/codemod@next v6.0.0/styled <path/to/folder-or-file>
202-
npx @mui/codemod@next v6.0.0/sx-prop <path/to/folder-or-file>
203-
npx @mui/codemod@next v6.0.0/theme-v6 <path/to/theme-file>
201+
npx @mui/codemod@latest v6.0.0/styled <path/to/folder-or-file>
202+
npx @mui/codemod@latest v6.0.0/sx-prop <path/to/folder-or-file>
203+
npx @mui/codemod@latest v6.0.0/theme-v6 <path/to/theme-file>
204204
```
205205

206206
> Run `v6.0.0/theme-v6` against the file that contains the custom `styleOverrides`. Ignore this codemod if you don't have a custom theme.

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,20 @@
66

77
Run one of the following commands to add Material UI to your project:
88

9-
:::info
10-
The `next` tag is used to download the latest <b>pre-release</b>, v6 version. Remove it to get the current stable version.
11-
:::
12-
139
<!-- #default-branch-switch -->
1410

1511
<codeblock storageKey="package-manager">
1612

1713
```bash npm
18-
npm install @mui/material@next @emotion/react @emotion/styled
14+
npm install @mui/material @emotion/react @emotion/styled
1915
```
2016

2117
```bash pnpm
22-
pnpm add @mui/material@next @emotion/react @emotion/styled
18+
pnpm add @mui/material @emotion/react @emotion/styled
2319
```
2420

2521
```bash yarn
26-
yarn add @mui/material@next @emotion/react @emotion/styled
22+
yarn add @mui/material @emotion/react @emotion/styled
2723
```
2824

2925
</codeblock>
@@ -162,7 +158,7 @@ You can start using Material UI right away with minimal front-end infrastructur
162158

163159
<!-- #default-branch-switch -->
164160

165-
Follow [this CDN example](https://github.com/mui/material-ui/tree/next/examples/material-ui-via-cdn) to get started.
161+
Follow [this CDN example](https://github.com/mui/material-ui/tree/master/examples/material-ui-via-cdn) to get started.
166162

167163
:::error
168164
We do _not_ recommend using this approach in production.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react, markdown-to-jsx.
99
3. Import and use the `Blog` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @emotion/styled, @emotion/react.
99
3. Import and use the `Checkout` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react, @mui/x-charts.
99
3. Import and use the `Dashboard` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react.
99
3. Import and use the `MarketingPage` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react.
99
3. Import and use the `SignInSide` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react.
99
3. Import and use the `SignIn` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<!-- #default-branch-switch -->
66

7-
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/next/examples).
7+
1. Copy the files into your project, or one of the [example projects](https://github.com/mui/material-ui/tree/master/examples).
88
2. Make sure your project has the required dependencies: @mui/material, @mui/icons-material, @emotion/styled, @emotion/react.
99
3. Import and use the `SignUp` component.
1010

1111
## Demo
1212

1313
<!-- #default-branch-switch -->
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/guides/localization/localization.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ The [Data Grid and Data Grid Pro](/x/react-data-grid/) components have their own
9898

9999
<!-- #default-branch-switch -->
100100

101-
You can [find the source](https://github.com/mui/material-ui/blob/next/packages/mui-material/src/locale/index.ts) in the GitHub repository.
101+
You can [find the source](https://github.com/mui/material-ui/blob/master/packages/mui-material/src/locale/index.ts) in the GitHub repository.
102102

103103
To create your own translation, or to customize the English text, copy this file to your project, make any changes needed and import the locale from there.
104104

docs/data/material/guides/typescript/typescript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<!-- #default-branch-switch -->
88

9-
Material UI requires a minimum version of TypeScript 4.7. Have a look at the [Create React App with TypeScript](https://github.com/mui/material-ui/tree/next/examples/material-ui-cra-ts) example.
9+
Material UI requires a minimum version of TypeScript 4.7. Have a look at the [Create React App with TypeScript](https://github.com/mui/material-ui/tree/master/examples/material-ui-cra-ts) example.
1010

1111
For types to work, it's recommended that you have at least the following options enabled in your `tsconfig.json`:
1212

0 commit comments

Comments
 (0)