Skip to content

Commit a4620d5

Browse files
Merge branch 'master' into fix-typo-blog-v6
2 parents 976246f + aedf366 commit a4620d5

File tree

33 files changed

+194
-137
lines changed

33 files changed

+194
-137
lines changed

CHANGELOG.md

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

3+
## v6.0.1
4+
5+
<!-- generated comparing v6.0.0..master -->
6+
7+
_Aug 29, 2024_
8+
9+
A big thanks to the 12 contributors who made this release possible. It contains bug fixes and documentation improvements.
10+
11+
12+
13+
- Attach default light color scheme when enabling CSS theme variables (#43493) @siriwatknp
14+
- [Skeleton] Apply the wave animation to the correct element (#43474) @mnajdova
15+
16+
### Docs
17+
18+
- [material-ui][Dialog] Update confirmation dialog description (#43488) @Michael-Hutchinson
19+
- Add Material UI v6 is out! to the notifications (#43448) @oliviertassinari
20+
- [material-ui] Dark scroll bars in templates (#43483) @aarongarciah
21+
- [material-ui] Add TemplateFrame to templates (#43406) @zanivan
22+
- [table] Make the data grid blend in (#43489) @oliviertassinari
23+
24+
### Core
25+
26+
- [blog] Update Toolpad Studio marketing page links in the blogs (#43407) @prakhargupta1
27+
- [blog] Add missing social card to the blog post (#43465) @siriwatknp
28+
- [code-infra] Fix typing issues with `@mui-internal/api-docs-builder` (#43498) @Janpot
29+
- [code-infra] Fix nextjs build cache (#43467) @JCQuintas
30+
- Remove `'use client'` from index files and useAutocomplete reexport (#41956) @DiegoAndai
31+
- Replace relative links to absolute ones in JSDocs (#43472) @alexfauquette
32+
- Upgrade babel runtime (#43243) @Janpot
33+
- [docs-infra] Skip shadow DOM regression test (#43500) @aarongarciah
34+
- [docs-infra] Fix use of process.env.DEPLOY_ENV (#43490) @oliviertassinari
35+
- [docs-infra] Add comment about removing optimizeFonts Next.js config (#43469) @aarongarciah
36+
- [examples] Use `latest` on all Material UI dependencies (#43494) @mnajdova
37+
- [infra] fix workflow path (#43464) @michelengelen
38+
39+
All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @DiegoAndai, @Janpot, @JCQuintas, @Michael-Hutchinson, @michelengelen, @mnajdova, @oliviertassinari, @prakhargupta1, @siriwatknp, @zanivan
40+
341
## 6.0.0
442

543
<!-- generated comparing v6.0.0-rc.0..master -->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"react-dom": "^18.3.1"
2424
},
2525
"devDependencies": {
26-
"@pigment-css/nextjs-plugin": "0.0.20",
26+
"@pigment-css/nextjs-plugin": "0.0.21",
2727
"@types/node": "^20.5.7",
2828
"@types/react": "^18.3.4",
2929
"@types/react-dom": "^18.3.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@babel/preset-react": "^7.24.7",
2727
"@babel/preset-typescript": "^7.24.7",
28-
"@pigment-css/vite-plugin": "0.0.20",
28+
"@pigment-css/vite-plugin": "0.0.21",
2929
"@types/react": "^18.3.4",
3030
"@types/react-dom": "^18.3.0",
3131
"@vitejs/plugin-react": "^4.3.1",

docs/data/material/customization/shadow-dom/ShadowDOMDemo.js renamed to docs/data/material/customization/shadow-dom/ShadowDOMDemoNoSnap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22

3-
export default function ShadowDOMDemo() {
3+
export default function ShadowDOMDemoNoSnap() {
44
return (
55
<iframe
66
title="codesandbox"

docs/data/material/customization/shadow-dom/shadow-dom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ const theme = createTheme({
6868

6969
In the example below you can see that the component outside of the shadow DOM is affected by global styles, while the component inside of the shadow DOM is not:
7070

71-
{{"demo": "ShadowDOMDemo.js", "hideToolbar": true, "bg": true}}
71+
{{"demo": "ShadowDOMDemoNoSnap.js", "hideToolbar": true, "bg": true}}

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/monorepo",
3-
"version": "6.0.0",
3+
"version": "6.0.1",
44
"private": true,
55
"scripts": {
66
"preinstall": "npx only-allow pnpm",
@@ -119,7 +119,7 @@
119119
"@mui/utils": "workspace:^",
120120
"@next/eslint-plugin-next": "^14.2.6",
121121
"@octokit/rest": "^21.0.2",
122-
"@pigment-css/react": "0.0.20",
122+
"@pigment-css/react": "0.0.21",
123123
"@playwright/test": "1.46.1",
124124
"@types/babel__core": "^7.20.5",
125125
"@types/fs-extra": "^11.0.4",
@@ -213,10 +213,10 @@
213213
"@types/react": "^18.3.4",
214214
"@types/react-dom": "18.3.0",
215215
"cross-fetch": "^4.0.0",
216-
"@pigment-css/react": "0.0.20",
217-
"@pigment-css/unplugin": "0.0.20",
218-
"@pigment-css/nextjs-plugin": "0.0.20",
219-
"@pigment-css/vite-plugin": "0.0.20"
216+
"@pigment-css/react": "0.0.21",
217+
"@pigment-css/unplugin": "0.0.21",
218+
"@pigment-css/nextjs-plugin": "0.0.21",
219+
"@pigment-css/vite-plugin": "0.0.21"
220220
},
221221
"nyc": {
222222
"include": [

packages-internal/docs-utils/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-docs-utils",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"author": "MUI Team",
55
"description": "Utilities for MUI docs. This is an internal package not meant for general use.",
66
"main": "./build/index.js",

packages-internal/test-utils/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@mui/internal-test-utils",
3-
"version": "1.0.10",
3+
"version": "1.0.11",
44
"author": "MUI Team",
55
"description": "Utilities for MUI tests. This is an internal package not meant for general use.",
66
"main": "./build/index.js",
@@ -50,7 +50,7 @@
5050
"mocha": "^10.7.3",
5151
"playwright": "^1.46.1",
5252
"prop-types": "^15.8.1",
53-
"sinon": "^16.1.3"
53+
"sinon": "^18.0.0"
5454
},
5555
"devDependencies": {
5656
"@types/chai": "^4.3.17",

packages/api-docs-builder-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@types/node": "^18.19.46",
2121
"@types/sinon": "^17.0.3",
2222
"chai": "^4.5.0",
23-
"sinon": "^16.1.3",
23+
"sinon": "^18.0.0",
2424
"typescript": "^5.5.4"
2525
}
2626
}

packages/api-docs-builder/ApiBuilders/ComponentApiBuilder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import traverse from '@babel/traverse';
66
import * as _ from 'lodash';
77
import kebabCase from 'lodash/kebabCase';
88
import remark from 'remark';
9-
import remarkVisit from 'unist-util-visit';
9+
import { visit as remarkVisit } from 'unist-util-visit';
1010
import type { Link } from 'mdast';
1111
import { defaultHandlers, parse as docgenParse } from 'react-docgen';
1212
import { renderMarkdown } from '@mui/internal-markdown';

0 commit comments

Comments
 (0)