Skip to content

Commit b378348

Browse files
JanpotJanpot
committed
Merge branch 'next' into branding
2 parents 45922b7 + 2a15ad6 commit b378348

File tree

28 files changed

+1447
-3567
lines changed

28 files changed

+1447
-3567
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ jobs:
132132
- run:
133133
name: Check for duplicated packages
134134
command: |
135-
if [[ $(git diff --name-status master | grep pnpm.lock) == "" ]];
135+
# #default-branch-switch
136+
if [[ $(git diff --name-status next | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
136137
then
137138
echo "No changes to dependencies detected. Skipping..."
138139
else

‎CHANGELOG.md‎

Lines changed: 80 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,84 @@
11
# [Versions](https://mui.com/versions/)
22

3+
## v6.0.0-alpha.0
4+
5+
<!-- generated comparing v5.15.14..next -->
6+
7+
_Mar 26, 2024_
8+
9+
A big thanks to the 18 contributors who made this release possible. Here are some highlights ✨:
10+
11+
- 🔥 Converted 10+ Material UI components to support static CSS extraction
12+
- ⬅️ Added RTL support in Pigment CSS (#41570) @brijeshb42
13+
14+
### `@mui/[email protected]`
15+
16+
- [BottomNavigation] Convert to support CSS extraction (#41612) @aacevski
17+
- [AvatarGroup] Convert to support CSS extraction (#41485) @zanivan
18+
- [Backdrop] Convert to support CSS extraction (#41581) @aacevski
19+
- [Breadcrumbs] Convert to support CSS extraction (#41496) @aacevski
20+
- [Card] Convert to support CSS extraction (#41580) @aacevski
21+
- [Divider] Convert to support CSS extraction (#41366) @sai6855
22+
- [FormControl] Convert to support CSS extraction (#41613) @aacevski
23+
- [FormGroup] Convert to support CSS extraction (#41614) @aacevski
24+
- [MobileStepper] Convert to support CSS extraction (#41533) @aacevski
25+
- [Modal] Support CSS extraction (#41483) @sai6855
26+
- [Popover] Convert to support CSS extraction (#41564) @aacevski
27+
- [Stepper] Convert to support CSS extraction (#41546) @aacevski
28+
- [Autocomplete] Display options provided to the `options` prop even if loading is true (#41634) @nekoya
29+
- [Backdrop] Deprecate TransitionComponent (#40677) @harry-whorlow
30+
- [ButtonGroup] Deprecate composed classes (#41259) @sai6855
31+
- [StepLabel] Deprecate `componentProps` prop (#41321) @sai6855
32+
- [Chip] Convert to support CSS extraction (#41592) @DiegoAndai
33+
34+
### `@pigment-css/[email protected]`
35+
36+
- Fix evaluation of undefined variables (#41569) @siriwatknp
37+
- Fix react-modal demos location (#41560) @sai6855
38+
- [react] RTL Support (#41570) @brijeshb42
39+
40+
### `@mui/[email protected]`
41+
42+
- [core] Standardize index pattern (#41574) @DiegoAndai
43+
- Fix typo to avoid infinite recursion in function call (#41616) @michael-land
44+
- Move stylesheet generator to `extendTheme` (#41446) @siriwatknp
45+
46+
### Docs
47+
48+
- [joy-ui] Refresh the marketing example on the Color Inversion page (#41497) @cipherlogs
49+
- [material-ui] Add v5 to v6 migration guide (#41561) @DiegoAndai
50+
- [system] Add v5 to v6 migration guide (#41575) @DiegoAndai
51+
- [material-ui][Slider] Remove `valueLabelFormat` from restricted values demo so that the tooltip thumb label displays the same as the value text (#41567) @StylesTrip
52+
- [pigment-css] Update the RTL section on the readme (#41576) @danilo-leal
53+
54+
### Core
55+
56+
- [blog] Update the callout (#41645) @cherniavskii
57+
- [blog] Link to Romain's blog post in MUI X v7 announcement post (#41640) @cherniavskii
58+
- [blog] Blog post with MUI X v7.0.0 annoucement (#41563) @joserodolfofreitas
59+
- [blog] Add post about remote (#41565) @danilo-leal
60+
- [core] Restore the pnpm-lock.yaml (#41643) @mnajdova
61+
- [core] Fix failing CI steps (#41636) @mnajdova
62+
- [core] Update browser support versions (#41568) @siriwatknp
63+
- [core] Add instructions to deploying docs guide (#41582) @DiegoAndai
64+
- [core] Add comment explaining the frequency of no-response action runs (#41555) @michaldudak
65+
- [core] Init the next branch (#41552) @mnajdova
66+
- [core] Lower the frequency of no-response action runs (#41553) @michaldudak
67+
- [core] Update peerDependencies ranges to include v6 packages (#41662) @michaldudak
68+
- [core] Run pnpm dedupe (#41658) @michaldudak
69+
- [core] Fix dedupe check (#41657) @Janpot
70+
- [pigment-css][demo] Add index page for material-ui (#41577) @brijeshb42
71+
- [pigment-css][demo] Remove app specific pnpm workspace (#41393) @brijeshb42
72+
- [docs] Add notification for MUI X v7 blog post (#41587) @cherniavskii
73+
- [docs] MUI X v7 blog post annoucement followup (#41601) @joserodolfofreitas
74+
- [docs] Update the installation guides to use the next tag (#41558) @mnajdova
75+
- [docs][material-ui] Fix typo in CSS theme variables customization (#41632) @ZeeshanTamboli
76+
- [material-ui][docs] Remove deleted page from the sidenav (#41594) @danilo-leal
77+
- [website] Update pricing table (#41595) @cherniavskii
78+
- [website] Add stray design adjustments throughout the site (#41547) @danilo-leal
79+
80+
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
81+
382
## v5.15.14
483

584
<!-- generated comparing v5.15.13..master -->
@@ -9,7 +88,7 @@ _Mar 18, 2024_
988
A big thanks to the 15 contributors who made this release possible.
1089
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.
1190

12-
### `@mui/[email protected].13`
91+
### `@mui/[email protected].14`
1392

1493
- [Accordion] Convert to support CSS extraction (#41221) @mnajdova
1594
- &#8203;<!-- 24 -->[Autocomplete] Convert to support CSS extraction (#40330) @mnajdova

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

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
'use client';
2+
import * as React from 'react';
3+
import AvatarChips from '../../../../../../docs/data/material/components/chips/AvatarChips';
4+
import BasicChips from '../../../../../../docs/data/material/components/chips/BasicChips';
5+
import ChipsArray from '../../../../../../docs/data/material/components/chips/ChipsArray';
6+
import ClickableAndDeletableChips from '../../../../../../docs/data/material/components/chips/ClickableAndDeletableChips';
7+
import ClickableChips from '../../../../../../docs/data/material/components/chips/ClickableChips';
8+
import ClickableLinkChips from '../../../../../../docs/data/material/components/chips/ClickableLinkChips';
9+
import ColorChips from '../../../../../../docs/data/material/components/chips/ColorChips';
10+
import CustomDeleteIconChips from '../../../../../../docs/data/material/components/chips/CustomDeleteIconChips';
11+
import DeletableChips from '../../../../../../docs/data/material/components/chips/DeletableChips';
12+
import IconChips from '../../../../../../docs/data/material/components/chips/IconChips';
13+
import MultilineChips from '../../../../../../docs/data/material/components/chips/MultilineChips';
14+
import SizesChips from '../../../../../../docs/data/material/components/chips/SizesChips';
15+
16+
export default function Chips() {
17+
return (
18+
<React.Fragment>
19+
<section>
20+
<h2> Avatar Chips</h2>
21+
<div className="demo-container">
22+
<AvatarChips />
23+
</div>
24+
</section>
25+
<section>
26+
<h2> Basic Chips</h2>
27+
<div className="demo-container">
28+
<BasicChips />
29+
</div>
30+
</section>
31+
<section>
32+
<h2> Chips Array</h2>
33+
<div className="demo-container">
34+
<ChipsArray />
35+
</div>
36+
</section>
37+
<section>
38+
<h2> Clickable And Deletable Chips</h2>
39+
<div className="demo-container">
40+
<ClickableAndDeletableChips />
41+
</div>
42+
</section>
43+
<section>
44+
<h2> Clickable Chips</h2>
45+
<div className="demo-container">
46+
<ClickableChips />
47+
</div>
48+
</section>
49+
<section>
50+
<h2> Clickable Link Chips</h2>
51+
<div className="demo-container">
52+
<ClickableLinkChips />
53+
</div>
54+
</section>
55+
<section>
56+
<h2> Color Chips</h2>
57+
<div className="demo-container">
58+
<ColorChips />
59+
</div>
60+
</section>
61+
<section>
62+
<h2> Custom Delete Icon Chips</h2>
63+
<div className="demo-container">
64+
<CustomDeleteIconChips />
65+
</div>
66+
</section>
67+
<section>
68+
<h2> Deletable Chips</h2>
69+
<div className="demo-container">
70+
<DeletableChips />
71+
</div>
72+
</section>
73+
<section>
74+
<h2> Icon Chips</h2>
75+
<div className="demo-container">
76+
<IconChips />
77+
</div>
78+
</section>
79+
<section>
80+
<h2> Multiline Chips</h2>
81+
<div className="demo-container">
82+
<MultilineChips />
83+
</div>
84+
</section>
85+
<section>
86+
<h2> Sizes Chips</h2>
87+
<div className="demo-container">
88+
<SizesChips />
89+
</div>
90+
</section>
91+
</React.Fragment>
92+
);
93+
}

‎apps/pigment-css-vite-app/src/pages/material-ui/react-chip.tsx‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
import * as React from 'react';
2+
import MaterialUILayout from '../../Layout';
3+
import AvatarChips from '../../../../../docs/data/material/components/chips/AvatarChips.tsx';
4+
import BasicChips from '../../../../../docs/data/material/components/chips/BasicChips.tsx';
5+
import ChipsArray from '../../../../../docs/data/material/components/chips/ChipsArray.tsx';
6+
import ClickableAndDeletableChips from '../../../../../docs/data/material/components/chips/ClickableAndDeletableChips.tsx';
7+
import ClickableChips from '../../../../../docs/data/material/components/chips/ClickableChips.tsx';
8+
import ClickableLinkChips from '../../../../../docs/data/material/components/chips/ClickableLinkChips.tsx';
9+
import ColorChips from '../../../../../docs/data/material/components/chips/ColorChips.tsx';
10+
import CustomDeleteIconChips from '../../../../../docs/data/material/components/chips/CustomDeleteIconChips.tsx';
11+
import DeletableChips from '../../../../../docs/data/material/components/chips/DeletableChips.tsx';
12+
import IconChips from '../../../../../docs/data/material/components/chips/IconChips.tsx';
13+
import MultilineChips from '../../../../../docs/data/material/components/chips/MultilineChips.tsx';
14+
import SizesChips from '../../../../../docs/data/material/components/chips/SizesChips.tsx';
15+
16+
export default function Chips() {
17+
return (
18+
<MaterialUILayout>
19+
<h1>Chips</h1>
20+
<section>
21+
<h2> Avatar Chips</h2>
22+
<div className="demo-container">
23+
<AvatarChips />
24+
</div>
25+
</section>
26+
<section>
27+
<h2> Basic Chips</h2>
28+
<div className="demo-container">
29+
<BasicChips />
30+
</div>
31+
</section>
32+
<section>
33+
<h2> Chips Array</h2>
34+
<div className="demo-container">
35+
<ChipsArray />
36+
</div>
37+
</section>
38+
<section>
39+
<h2> Clickable And Deletable Chips</h2>
40+
<div className="demo-container">
41+
<ClickableAndDeletableChips />
42+
</div>
43+
</section>
44+
<section>
45+
<h2> Clickable Chips</h2>
46+
<div className="demo-container">
47+
<ClickableChips />
48+
</div>
49+
</section>
50+
<section>
51+
<h2> Clickable Link Chips</h2>
52+
<div className="demo-container">
53+
<ClickableLinkChips />
54+
</div>
55+
</section>
56+
<section>
57+
<h2> Color Chips</h2>
58+
<div className="demo-container">
59+
<ColorChips />
60+
</div>
61+
</section>
62+
<section>
63+
<h2> Custom Delete Icon Chips</h2>
64+
<div className="demo-container">
65+
<CustomDeleteIconChips />
66+
</div>
67+
</section>
68+
<section>
69+
<h2> Deletable Chips</h2>
70+
<div className="demo-container">
71+
<DeletableChips />
72+
</div>
73+
</section>
74+
<section>
75+
<h2> Icon Chips</h2>
76+
<div className="demo-container">
77+
<IconChips />
78+
</div>
79+
</section>
80+
<section>
81+
<h2> Multiline Chips</h2>
82+
<div className="demo-container">
83+
<MultilineChips />
84+
</div>
85+
</section>
86+
<section>
87+
<h2> Sizes Chips</h2>
88+
<div className="demo-container">
89+
<SizesChips />
90+
</div>
91+
</section>
92+
</MaterialUILayout>
93+
);
94+
}

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/monorepo",
3-
"version": "5.15.14",
3+
"version": "6.0.0-alpha.0",
44
"private": true,
55
"scripts": {
66
"preinstall": "npx only-allow pnpm",
@@ -213,7 +213,7 @@
213213
"@definitelytyped/typescript-versions": "^0.1.1",
214214
"@definitelytyped/utils": "^0.1.5",
215215
"@types/node": "^18.19.25",
216-
"@types/react": "^18.2.55",
216+
"@types/react": "18.2.55",
217217
"@types/react-dom": "18.2.19",
218218
"cross-fetch": "^4.0.0"
219219
},

‎packages-internal/scripts/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/internal-scripts",
3-
"version": "1.0.3",
3+
"version": "1.0.4",
44
"author": "MUI Team",
55
"description": "Utilities supporting MUI libraries build and docs generation. This is an internal package not meant for general use.",
66
"main": "build/index.js",

‎packages/mui-base/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/base",
3-
"version": "5.0.0-beta.40",
3+
"version": "5.0.0-beta.41",
44
"private": false,
55
"author": "MUI Team",
66
"description": "Base UI is a library of headless ('unstyled') React components and low-level hooks. You gain complete control over your app's CSS and accessibility features.",

‎packages/mui-codemod/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/codemod",
3-
"version": "5.15.14",
3+
"version": "6.0.0-alpha.0",
44
"bin": "./codemod.js",
55
"private": false,
66
"author": "MUI Team",

‎packages/mui-core-downloads-tracker/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/core-downloads-tracker",
3-
"version": "5.15.14",
3+
"version": "6.0.0-alpha.0",
44
"private": false,
55
"author": "MUI Team",
66
"description": "Internal package to track number of downloads of our design system libraries",

‎packages/mui-docs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/docs",
3-
"version": "5.15.14",
3+
"version": "6.0.0-alpha.0",
44
"private": false,
55
"author": "MUI Team",
66
"description": "MUI Docs - Documentation building blocks.",

0 commit comments

Comments
 (0)