Skip to content

Commit 1d88653

Browse files
Merge branch 'master' into describeConformance-ownerState
2 parents 7f9ef65 + 5cb317b commit 1d88653

File tree

7 files changed

+97
-50
lines changed

7 files changed

+97
-50
lines changed

docs/data/material/migration/upgrade-to-v6/migrating-to-pigment-css.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ First, install the Material UI wrapper package for Pigment CSS:
3131
<codeblock storageKey="package-manager">
3232

3333
```bash npm
34-
npm install @mui/material-pigment-css
34+
npm install @mui/material-pigment-css @pigment-css/react
3535
```
3636

3737
```bash pnpm
38-
pnpm add @mui/material-pigment-css
38+
pnpm add @mui/material-pigment-css @pigment-css/react
3939
```
4040

4141
```bash yarn
42-
yarn add @mui/material-pigment-css
42+
yarn add @mui/material-pigment-css @pigment-css/react
4343
```
4444

4545
</codeblock>

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
"chai": "^4.5.0",
136136
"cross-fetch": "^4.0.0",
137137
"gm": "^1.25.0",
138-
"marked": "^14.1.4",
138+
"marked": "^15.0.2",
139139
"playwright": "^1.48.2",
140140
"prettier": "^3.3.3",
141141
"tailwindcss": "^3.4.15",

examples/material-ui-pigment-css-nextjs-ts/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"dependencies": {
1212
"@mui/material": "latest",
1313
"@mui/material-pigment-css": "latest",
14+
"@pigment-css/react": "latest",
1415
"next": "latest",
1516
"react": "latest",
1617
"react-dom": "latest"

examples/material-ui-pigment-css-vite-ts/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"dependencies": {
1313
"@mui/material": "latest",
1414
"@mui/material-pigment-css": "latest",
15+
"@pigment-css/react": "latest",
1516
"react": "latest",
1617
"react-dom": "latest"
1718
},

packages/markdown/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"dependencies": {
2323
"@babel/runtime": "^7.26.0",
2424
"lodash": "^4.17.21",
25-
"marked": "^14.1.4",
25+
"marked": "^15.0.2",
2626
"prismjs": "^1.29.0"
2727
},
2828
"devDependencies": {

packages/mui-material-pigment-css/package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,10 @@
4040
},
4141
"dependencies": {
4242
"@babel/runtime": "^7.26.0",
43-
"@mui/system": "workspace:*",
44-
"@pigment-css/react": "0.0.27"
43+
"@mui/system": "workspace:*"
44+
},
45+
"peerDependencies": {
46+
"@pigment-css/react": "^0.0.27"
4547
},
4648
"sideEffects": false,
4749
"publishConfig": {

pnpm-lock.yaml

Lines changed: 86 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)