Skip to content

Commit 0e93d2c

Browse files
DiegoAndaiDiegoAndai
committed
Merge branch 'next' into deprecate-step-connector-classes
2 parents 3c7f5c3 + 9e5e2e0 commit 0e93d2c

File tree

207 files changed

+7537
-15385
lines changed

Some content is hidden

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

207 files changed

+7537
-15385
lines changed

‎.github/ISSUE_TEMPLATE/1.bug.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Bug report 🐛
2-
description: Create a bug report for Material UI, Base UI, MUI System, or Joy UI.
2+
description: Create a bug report for Material UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer']
44
body:
55
- type: markdown

‎.github/ISSUE_TEMPLATE/2.feature.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Feature request 💄
2-
description: Suggest a new idea for Material UI, Base UI, MUI System, or Joy UI.
2+
description: Suggest a new idea for Material UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer']
44
body:
55
- type: markdown

‎.github/ISSUE_TEMPLATE/4.docs-feedback.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Docs feedback
2-
description: Improve documentation about Material UI, Base UI, MUI System, or Joy UI.
2+
description: Improve documentation about Material UI, MUI System, or Joy UI.
33
labels: ['status: waiting for maintainer', 'support: docs-feedback']
44
title: '[docs] '
55
body:

‎.github/ISSUE_TEMPLATE/5.priority-support.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'Priority Support: SLA ⏰'
2-
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with Material UI, Base UI, MUI System, or Joy UI.
2+
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with Material UI, MUI System, or Joy UI.
33
title: '[question] '
44
labels: ['status: waiting for maintainer', 'support: unknown']
55
body:

‎.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
contact_links:
22
- name: Support ❔
33
url: https://mui.com/getting-started/support/
4-
about: I need support with Material UI, Base UI, MUI System, or Joy UI.
4+
about: I need support with Material UI, MUI System, or Joy UI.

‎.github/workflows/cherry-pick-next-to-master.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Cherry pick next to master
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- next
7+
types: ['closed']
8+
9+
permissions: {}
10+
11+
jobs:
12+
cherry_pick_to_master:
13+
runs-on: ubuntu-latest
14+
name: Cherry pick into master
15+
permissions:
16+
pull-requests: write
17+
contents: write
18+
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
22+
with:
23+
fetch-depth: 0
24+
- name: Cherry pick and create the new PR
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
28+
with:
29+
branch: master
30+
body: 'Cherry-pick of #{old_pull_request_id}'
31+
cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
32+
title: '{old_title} (@${{ github.event.pull_request.user.login }})'
33+
labels: |
34+
cherry-pick

‎.github/workflows/codeql.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
22+
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# 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
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
33+
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10

‎.github/workflows/priority-support-validation-prompt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Find Comment
19-
uses: peter-evans/find-comment@d5fe37641ad8451bdd80312415672ba26c86575e # v3
19+
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
2020
id: findComment
2121
with:
2222
issue-number: ${{ github.event.issue.number }}

‎.github/workflows/scorecards.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
46+
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
4747
with:
4848
sarif_file: results.sarif

‎CHANGELOG.md

+168-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,131 @@
11
# [Versions](https://mui.com/versions/)
22

3+
## v6.0.0-alpha.2
4+
5+
<!-- generated comparing v6.0.0-alpha.1..next -->
6+
7+
_Apr 9, 2024_
8+
9+
A big thanks to the 5 contributors who made this release possible.
10+
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.
11+
12+
### `@mui/[email protected]`
13+
14+
- &#8203;<!-- 03 -->[typescript][Select] Fix `muiName` property TypeScript error (#41726) @EyaOuenniche
15+
- &#8203;<!-- 04 -->[l10n] Fix typo in is-IS locale (#41810) @magnimarels
16+
17+
### `@pigment-css/[email protected]`
18+
19+
- &#8203;<!-- 12 -->[core] Remove `muiName` during eval phase (#41811) @brijeshb42
20+
21+
### `@pigment-css/[email protected]`
22+
23+
- &#8203;<!-- 02 -->[nextjs] Handle file references passed through imports (#41817) @brijeshb42
24+
- &#8203;<!-- 01 -->[nextjs] Allow usage of url() CSS function (#41758) @brijeshb42
25+
26+
### Docs
27+
28+
- &#8203;<!-- 11 -->[docs] Fix 301 links @oliviertassinari
29+
- &#8203;<!-- 06 -->[pigment-css][docs] Fix README typo (#41808) @aarongarciah
30+
- &#8203;<!-- 05 -->[pigment-css][docs] Fix output on dynamic styles example (#41805) @aarongarciah
31+
- &#8203;<!-- 07 -->[material-ui][docs] Fix Material 3 message typo (#41821) @aarongarciah
32+
- &#8203;<!-- 08 -->[material-ui][docs] Add stray design tweaks to free templates (#41696) @zanivan
33+
34+
### Core
35+
36+
- &#8203;<!-- 13 -->[core] Remove unused files (#41818) @mnajdova
37+
- &#8203;<!-- 10 -->[docs-infra] Fix analytics about inline ads (#41474) (#41819) @alexfauquette
38+
- &#8203;<!-- 08 -->[docs-infra] Fix drawer performances (#41807) @alexfauquette
39+
40+
All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @brijeshb42, @EyaOuenniche, @oliviertassinari
41+
42+
## v6.0.0-alpha.1
43+
44+
<!-- generated comparing v6.0.0-alpha.0..next -->
45+
46+
_Apr 5, 2024_
47+
48+
A big thanks to the 19 contributors who made this release possible. Here are some highlights ✨:
49+
50+
- 🔥 Converted 3 more Material UI components to use Pigment CSS. Current progress is 36%!
51+
- 🚀 Added a spacing CSS variable to the Material UI and Joy UI themes.
52+
- 💫 Added 3 redesigned free Material UI templates: [Sign-in](https://next.mui.com/material-ui/getting-started/templates/sign-in/), [Sign-in side](https://next.mui.com/material-ui/getting-started/templates/sign-in-side/), and [Sign-up](https://next.mui.com/material-ui/getting-started/templates/sign-up/).
53+
54+
### `@mui/[email protected]`
55+
56+
- [AppBar] Convert to support CSS extraction (#41247) @mnajdova
57+
- [Badge] Deprecate components and componentsProps (#41655) @skmanoj322
58+
- [Button] Convert to support CSS extraction (#41378) @siriwatknp
59+
- [ButtonGroup] Convert to support CSS extraction (#41666) @zanivan
60+
- [RadioGroup] Apply classnames (#41610) @ZeeshanTamboli
61+
- [Slider] Move palette styles to the bottom (#41676) @siriwatknp
62+
- Add the `spacing` theme token (#40224) @siriwatknp
63+
64+
### `@mui/[email protected]`
65+
66+
- Add the `spacing` theme token to be used in `theme.spacing()` (#40224) @siriwatknp
67+
68+
### `@mui/[email protected]`
69+
70+
- [codemod] Setup v6 codemod structure (#41668) @DiegoAndai
71+
72+
### `@mui/[email protected]`
73+
74+
- [TabPanel] Add keepMounted prop to match Joy UI (#41651) @ppaskaris-plooto
75+
76+
### `@mui/[email protected]`
77+
78+
- Add `spacing` theme token (#40224) @siriwatknp
79+
80+
### `@pigment-css/[email protected]`
81+
82+
- Improve sx prop support (#41589) @brijeshb42
83+
- Fix Emotion styled error (#41699) @siriwatknp
84+
- Fix propTypes removal during eval stage (#41695) @brijeshb42
85+
- Fix props forwarding (#41688) @siriwatknp
86+
- Fix sx prop transformation on Box (#41705) @brijeshb42
87+
88+
### `@pigment-css/[email protected]`
89+
90+
- Use constant filename for pigment styles (#41667) @brijeshb42
91+
92+
### `@pigment-css/[email protected]`
93+
94+
- Add missing RTL implementation (#41751) @brijeshb42
95+
96+
### Docs
97+
98+
- [pigment-css] Update README.md installation to use the next tag (#41649) @mnajdova
99+
- [pigment-css] Add "Building design system components" guide with Pigment CSS (#41635) @siriwatknp
100+
- Continue migration of Base UI to sperate repository @oliviertassinari
101+
- Stick to one way to write IE 11 @oliviertassinari
102+
- Fix typo in CONTRIBUTING.md (#41670) @adriancuadrado
103+
- Drop IE 11 official support (#41611) @iammminzzy
104+
- [material-ui] Fix typo on the Accordion page (#41687) @connorshea
105+
- [pigment-css] Add small edits on the README (#41646) @danilo-leal
106+
- [pigment-css] Edit the example app's README files (#41639) @danilo-leal
107+
108+
### Core
109+
110+
- [code-infra] Move BrandingProvider/brandingTheme/InfoCard to @mui/docs (#41206) @Janpot
111+
- [core] Automate cherry-pick of PRs from `next` -> `master` (#41741) @aarongarciah
112+
- [core] Update the prettier script to use the next branch (#41637) @mnajdova
113+
- [docs-infra] Skip loading source for non-editable modules (#41588) @bharatkashyap
114+
- [docs-infra] Vale rule for M3 (#41737) @oliviertassinari
115+
- [docs-infra] Allows to remove edit button (#41702) @alexfauquette
116+
- [pigment-css][examples] Add example project with Remix (#41700) @brijeshb42
117+
- [examples] Update MUI's packages to the next version (#41701) @mnajdova
118+
- [material-ui] Refine the Sign-in and Sign-up templates (#41192) @zanivan
119+
- [test] Add test to display options provided to the options prop even if loading is true. (#41675) @ZeeshanTamboli
120+
- [blog] Refresh the design slightly (#41697) @danilo-leal
121+
- [website] Use en-US over en-UK for career link @oliviertassinari
122+
- [website] Add Aarón to About Us (#41736) @aarongarciah
123+
- [website] Refine button design and other details (#41686) @danilo-leal
124+
- [website] Improve job og image (#41672) @oliviertassinari
125+
- [website] Page <title> should have no dots @oliviertassinari
126+
127+
All contributors of this release in alphabetical order: @aarongarciah, @adriancuadrado, @alexfauquette, @bharatkashyap, @brijeshb42, @connorshea, @danilo-leal, @DiegoAndai, @iammminzzy, @Janpot, @JCQuintas, @levigunz, @mnajdova, @oliviertassinari, @ppaskaris-plooto, @siriwatknp, @skmanoj322, @zanivan, @ZeeshanTamboli
128+
3129
## v6.0.0-alpha.0
4130

5131
<!-- generated comparing v5.15.14..next -->
@@ -79,6 +205,46 @@ A big thanks to the 18 contributors who made this release possible. Here are som
79205

80206
All contributors of this release in alphabetical order: @aacevski, @brijeshb42, @cherniavskii, @cipherlogs, @danilo-leal, @DiegoAndai, @harry-whorlow, @Janpot, @joserodolfofreitas, @michael-land, @michaldudak, @mnajdova, @nekoya, @sai6855, @siriwatknp, @StylesTrip, @zanivan, @ZeeshanTamboli
81207

208+
## v5.15.15
209+
210+
<!-- generated comparing v5.15.14..master -->
211+
212+
_Apr 4, 2024_
213+
214+
A big thanks to the 7 contributors who made this release possible. Here are some highlights ✨:
215+
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.
216+
217+
### `@mui/[email protected]`
218+
219+
- [Autocomplete] Display options provided to the `options` prop even if loading is true (#41677) @ZeeshanTamboli
220+
- [RadioGroup] Apply classnames (#41681) @ZeeshanTamboli
221+
222+
### `@mui/[email protected]`
223+
224+
- Fix typo to avoid infinite recursion in function call (#41678) @ZeeshanTamboli
225+
226+
### Docs
227+
228+
- [material-ui][Slider] Remove `valueLabelFormat` from restricted values demo so that the tooltip thumb label displays the same as the value text (#41679) @ZeeshanTamboli
229+
- [material-ui] Remove deleted page from the sidenav (#41594) @danilo-leal
230+
- [material-ui] Fix typo in CSS theme variables customization (#41680) @ZeeshanTamboli
231+
- Continue migration of Base UI to sperate repository @oliviertassinari
232+
- Add notification for MUI X v7 blog post (#41587) (#41605) @cherniavskii
233+
- Update the versions dropdown to show v6 (#41557) @mnajdova
234+
235+
### Core
236+
237+
- [blog] Link to Romain's blog post in MUI X v7 announcement post (#41641) @cherniavskii
238+
- [blog] Blog post with MUI X v7.0.0 annoucement (#41563) (#41604) @cherniavskii
239+
- [blog] Add post about remote (#41565) @danilo-leal
240+
- [core] Continue rename of Toolpad @oliviertassinari
241+
- [docs-infra] Add Toolpad product/category IDs to types (#41551) @bharatkashyap
242+
- [website] Add Aarón to About Us (#41747) @aarongarciah
243+
- [website] Add stray design adjustments throughout the site (#41642) @mnajdova
244+
- [website] Update pricing table (#41606) @cherniavskii
245+
246+
All contributors of this release in alphabetical order: @aarongarciah, @bharatkashyap, @cherniavskii, @danilo-leal, @mnajdova, @oliviertassinari, @ZeeshanTamboli
247+
82248
## v5.15.14
83249

84250
<!-- generated comparing v5.15.13..master -->
@@ -8001,7 +8167,7 @@ A big thanks to the 25 contributors who made this release possible. Here are som
80018167

80028168
<a href="https://mui.com/components/tables/#unstyled-table"><img width="800" alt="unstyled table" src="https://user-images.githubusercontent.com/4512430/144862194-584356ef-7d9d-462c-a631-186a7e716193.png"></a>
80038169

8004-
You can follow our progress with unstyled components at https://github.com/mui/material-ui/issues/27170.
8170+
You can follow our progress with unstyled components at https://github.com/mui/base-ui/issues/10.
80058171

80068172
- 🎉 We have added an example of how to use MUI with [Remix](https://remix.run/) (#29952) @mnajdova
80078173

@@ -9471,7 +9637,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
94719637

94729638
<a href="https://mui.com/components/switches/#unstyled"><img width="832" alt="switch" src="https://user-images.githubusercontent.com/3165635/125192249-236f8a80-e247-11eb-9df9-17d476379a32.png"></a>
94739639

9474-
You can follow our progress at https://github.com/mui/material-ui/issues/27170.
9640+
You can follow our progress at https://github.com/mui/base-ui/issues/10.
94759641

94769642
- 💄 We have updated the default `info` `success` `warning` color to be more accessible (#26817) @siriwatknp.
94779643
You can find the new [default values](https://mui.com/material-ui/customization/palette/#default-values) in the documentation.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@types/react": "^18.2.55",
3030
"@types/react-dom": "^18.2.19",
3131
"eslint": "^8.57.0",
32-
"typescript": "^5.4.3"
32+
"typescript": "^5.4.4"
3333
},
3434
"nx": {
3535
"targets": {

‎apps/pigment-css-next-app/src/app/layout.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default function RootLayout(props: { children: React.ReactNode }) {
2323
className={`${inter.className} ${css`
2424
background-color: ${({ theme: t }) => t.vars.palette.background.default};
2525
color: ${({ theme: t }) => t.vars.palette.text.primary};
26+
background-image: url('@/assets/mui.svg');
2627
`}`}
2728
>
2829
<AppRouterCacheProvider>

‎apps/pigment-css-next-app/src/app/material-ui/page.tsx

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,25 @@ import Link from 'next/link';
44
import fs from 'fs/promises';
55
import path from 'path';
66
import { css } from '@pigment-css/react';
7+
import Box from '@pigment-css/react/Box';
78

89
export default async function MaterialUIPage() {
910
const rootPaths = await fs.readdir(path.join(process.cwd(), `src/app/material-ui`));
1011
return (
1112
<div>
1213
<h1>Material UI Components</h1>
1314
<nav>
14-
<ul
15-
className={css({
15+
<Box
16+
as="ul"
17+
sx={{
1618
margin: 0,
1719
marginBlock: '1rem',
1820
padding: 0,
1921
paddingLeft: '1.5rem',
2022
display: 'flex',
2123
flexDirection: 'column',
2224
gap: '0.5rem',
23-
})}
25+
}}
2426
>
2527
{rootPaths
2628
.filter((item) => !item.match(/\.(js|tsx)$/))
@@ -37,7 +39,7 @@ export default async function MaterialUIPage() {
3739
</Link>
3840
</li>
3941
))}
40-
</ul>
42+
</Box>
4143
</nav>
4244
</div>
4345
);

‎apps/pigment-css-next-app/src/assets/mui.svg

+1
Loading

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

+8-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"react-dom": "^18.2.0",
2323
"react-error-boundary": "^4.0.13",
2424
"react-router": "^6.22.3",
25-
"react-router-dom": "^6.22.1"
25+
"react-router-dom": "^6.22.3"
2626
},
2727
"devDependencies": {
2828
"@babel/preset-react": "^7.24.1",
@@ -33,15 +33,20 @@
3333
"@vitejs/plugin-react": "^4.2.1",
3434
"postcss": "^8.4.38",
3535
"postcss-combine-media-query": "^1.0.1",
36-
"vite": "5.2.2",
37-
"vite-plugin-pages": "^0.32.0"
36+
"vite": "5.2.7",
37+
"vite-plugin-pages": "^0.32.1"
3838
},
3939
"nx": {
4040
"targets": {
4141
"preview": {
4242
"dependsOn": [
4343
"^build"
4444
]
45+
},
46+
"dev": {
47+
"dependsOn": [
48+
"^build"
49+
]
4550
}
4651
}
4752
}

‎apps/pigment-css-vite-app/src/main.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ThemeProvider, createTheme } from '@mui/material/styles';
55
import CircularProgress from '@mui/material/CircularProgress';
66
import CssBaseline from '@mui/material/CssBaseline';
77
import { css } from '@pigment-css/react';
8-
import { Box } from '@pigment-css/react/Box';
8+
import Box from '@pigment-css/react/Box';
99
import { ErrorBoundary } from 'react-error-boundary';
1010
import routes from '~react-pages';
1111
import '@pigment-css/react/styles.css';

0 commit comments

Comments
 (0)