Skip to content

Commit

Permalink
Merge branch 'mui:master' into fix--44324
Browse files Browse the repository at this point in the history
  • Loading branch information
navedqb authored Nov 11, 2024
2 parents d44d345 + f59b477 commit f1180a7
Show file tree
Hide file tree
Showing 8 changed files with 195 additions and 232 deletions.
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"lz-string": "^1.5.0",
"markdown-to-jsx": "^7.5.0",
"material-ui-popup-state": "^5.3.1",
"next": "^14.2.16",
"next": "^14.2.17",
"notistack": "3.0.1",
"nprogress": "^0.2.0",
"postcss": "^8.4.47",
Expand Down Expand Up @@ -135,7 +135,7 @@
"chai": "^4.5.0",
"cross-fetch": "^4.0.0",
"gm": "^1.25.0",
"marked": "^14.1.3",
"marked": "^14.1.4",
"playwright": "^1.48.2",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.14",
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@vitest/browser": "^2.1.4",
"@vitest/coverage-v8": "^2.1.2",
"@vitest/coverage-v8": "^2.1.4",
"babel-loader": "^9.2.1",
"babel-plugin-istanbul": "^7.0.0",
"babel-plugin-module-resolver": "^5.0.2",
Expand All @@ -147,7 +147,7 @@
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"chalk": "^5.3.0",
"compression-webpack-plugin": "^11.1.0",
"concurrently": "^9.0.1",
"concurrently": "^9.1.0",
"cpy-cli": "^5.0.0",
"cross-env": "^7.0.3",
"danger": "^12.3.3",
Expand Down Expand Up @@ -180,7 +180,7 @@
"lodash": "^4.17.21",
"markdownlint-cli2": "^0.14.0",
"mocha": "^10.8.2",
"nx": "^20.0.8",
"nx": "^20.0.12",
"nyc": "^17.1.0",
"piscina": "^4.7.0",
"postcss-styled-syntax": "^0.6.4",
Expand All @@ -194,7 +194,7 @@
"terser-webpack-plugin": "^5.3.10",
"tsx": "^4.19.2",
"typescript": "^5.6.3",
"vitest": "^2.1.2",
"vitest": "^2.1.4",
"vitest-fail-on-console": "^0.7.1",
"webpack": "^5.96.1",
"webpack-bundle-analyzer": "^4.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/feedback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@
"claudia": "^5.14.1"
},
"optionalDependencies": {
"aws-sdk": "^2.1691.0"
"aws-sdk": "^2.1692.0"
}
}
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dependencies": {
"@babel/runtime": "^7.26.0",
"lodash": "^4.17.21",
"marked": "^14.1.3",
"marked": "^14.1.4",
"prismjs": "^1.29.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@types/node": "^20.17.6",
"@types/prop-types": "^15.7.13",
"@types/react": "^18.3.12",
"next": "^14.2.16",
"next": "^14.2.17",
"react": "^18.3.1"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"chai": "^4.5.0",
"fast-glob": "^3.3.2",
"lodash": "^4.17.21",
"next": "^14.2.16",
"next": "^14.2.17",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"sinon": "^19.0.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@emotion/react": "^11.13.3",
"@emotion/server": "^11.11.0",
"@types/react": "^18.3.12",
"next": "^14.2.16",
"next": "^14.2.17",
"react": "^18.3.1"
},
"peerDependencies": {
Expand Down
Loading

0 comments on commit f1180a7

Please sign in to comment.