Skip to content

Commit

Permalink
Merge branch 'master' into link-toolpad-from-core-readme
Browse files Browse the repository at this point in the history
Signed-off-by: Prakhar Gupta <92228082+prakhargupta1@users.noreply.github.com>
  • Loading branch information
prakhargupta1 authored Oct 16, 2024
2 parents daded26 + 010de45 commit 3d6fe73
Show file tree
Hide file tree
Showing 37 changed files with 442 additions and 403 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.1
orbs:
aws-cli: circleci/aws-cli@5.1.0
aws-cli: circleci/aws-cli@5.1.1
aws-s3: circleci/aws-s3@4.0

parameters:
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
# [Versions](https://mui.com/versions/)

## v6.1.4

<!-- generated comparing v6.1.3..master -->

_Oct 15, 2024_

A big thanks to the 9 contributors who made this release possible.

### `@mui/material@6.1.4`

- [Checkbox] Fix disableRipple regression (#44099) @siriwatknp
- [IconButton] Fix disableRipple behavior when disableRipple is set in MuiButtonBase theme (#43714) @sai6855
- Make the palette always return new light and dark object (#44059) @siriwatknp
- Simplify createPalette (#44075) @oliviertassinari

### Docs

- Improve Toolpad Core docs (#43796) @bharatkashyap
- Tweak Joy UI section in README (#44103) @aarongarciah
- Fix 404 link to Next.js @oliviertassinari
- [toolpad core] In the sidebar, move 'new' label to the components (#44070) @prakhargupta1
- Fix small typo on Grid2 page (#44062) @zanivan
- Clarify suggestions to use `@mui/styles` in v5 migration docs (#44049) @samuelsycamore

### Core

- [code-infra] Link to production app for bundle size (#44076) @oliviertassinari
- [code-infra] Disable cron job for React 17 tests (#44065) @Janpot
- Remove [website] from changelog (#44069) @oliviertassinari
- Apply #44052 to the latest release as well @oliviertassinari
- Fix proptypes generation when multiple components per file (#44058) @Janpot
- Remove <-- from changelog (#44052) @oliviertassinari
- [examples] Avoid git diff when playing with examples @oliviertassinari
- [test] Remove dead code (#44056) @Janpot

All contributors of this release in alphabetical order: @aarongarciah, @bharatkashyap, @Janpot, @oliviertassinari, @prakhargupta1, @sai6855, @samuelsycamore, @siriwatknp, @zanivan

## v6.1.3

<!-- generated comparing v6.1.2..master -->
Expand Down
6 changes: 3 additions & 3 deletions apps/pigment-css-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
},
"devDependencies": {
"@pigment-css/nextjs-plugin": "0.0.24",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"eslint": "^8.57.1",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"nx": {
"targets": {
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@babel/preset-typescript": "^7.25.7",
"@pigment-css/vite-plugin": "0.0.24",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"@types/webfontloader": "^1.6.38",
"@vitejs/plugin-react": "^4.3.2",
"postcss": "^8.4.47",
Expand Down
2 changes: 1 addition & 1 deletion benchmark/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@styled-system/css": "^5.1.5",
"benchmark": "^2.1.4",
"docs": "workspace:^",
"express": "^4.21.0",
"express": "^4.21.1",
"fs-extra": "^11.2.0",
"jss": "^10.10.0",
"playwright": "^1.47.2",
Expand Down
26 changes: 13 additions & 13 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,17 @@
"@mui/system": "workspace:^",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:^",
"@mui/x-charts": "7.19.0",
"@mui/x-data-grid": "7.19.0",
"@mui/x-data-grid-generator": "7.19.0",
"@mui/x-data-grid-premium": "7.19.0",
"@mui/x-data-grid-pro": "7.19.0",
"@mui/x-date-pickers": "7.19.0",
"@mui/x-date-pickers-pro": "7.19.0",
"@mui/x-license": "7.18.0",
"@mui/x-tree-view": "7.19.0",
"@mui/x-charts": "7.20.0",
"@mui/x-data-grid": "7.20.0",
"@mui/x-data-grid-generator": "7.20.0",
"@mui/x-data-grid-premium": "7.20.0",
"@mui/x-data-grid-pro": "7.20.0",
"@mui/x-date-pickers": "7.20.0",
"@mui/x-date-pickers-pro": "7.20.0",
"@mui/x-license": "7.20.0",
"@mui/x-tree-view": "7.20.0",
"@popperjs/core": "^2.11.8",
"@react-spring/web": "^9.7.4",
"@react-spring/web": "^9.7.5",
"@toolpad/core": "^0.7.0",
"autoprefixer": "^10.4.20",
"autosuggest-highlight": "^3.3.4",
Expand Down 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.14",
"next": "^14.2.15",
"notistack": "3.0.1",
"nprogress": "^0.2.0",
"postcss": "^8.4.47",
Expand Down Expand Up @@ -124,10 +124,10 @@
"@types/css-mediaquery": "^0.1.4",
"@types/gtag.js": "^0.0.20",
"@types/json2mq": "^0.2.2",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/prop-types": "^15.7.13",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"@types/react-swipeable-views": "^0.13.5",
"@types/react-transition-group": "^4.4.11",
"@types/react-window": "^1.8.8",
Expand Down
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/monorepo",
"version": "6.1.3",
"version": "6.1.4",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
Expand Down Expand Up @@ -103,10 +103,10 @@
"@netlify/functions": "^2.8.2",
"@slack/bolt": "^3.22.0",
"execa": "^9.4.0",
"google-auth-library": "^9.14.1"
"google-auth-library": "^9.14.2"
},
"devDependencies": {
"@argos-ci/core": "^2.8.1",
"@argos-ci/core": "^2.9.0",
"@babel/cli": "^7.25.7",
"@babel/core": "^7.25.8",
"@babel/node": "^7.25.7",
Expand All @@ -131,8 +131,8 @@
"@types/babel__core": "^7.20.5",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.10",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.10",
"@types/mocha": "^10.0.9",
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/yargs": "^17.0.33",
"@typescript-eslint/eslint-plugin": "^7.18.0",
Expand Down Expand Up @@ -192,15 +192,15 @@
"stylelint-config-standard": "^34.0.0",
"terser-webpack-plugin": "^5.3.10",
"tsx": "^4.19.1",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"webpack": "^5.95.0",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"yargs": "^17.7.2"
},
"packageManager": "pnpm@9.12.0",
"packageManager": "pnpm@9.12.1",
"engines": {
"pnpm": "9.12.0"
"pnpm": "9.12.1"
},
"resolutions": {
"@babel/core": "^7.25.8",
Expand All @@ -214,9 +214,9 @@
"@definitelytyped/header-parser": "^0.2.12",
"@definitelytyped/typescript-versions": "^0.1.4",
"@definitelytyped/utils": "^0.1.7",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/react-dom": "18.3.0",
"@types/react-dom": "18.3.1",
"cross-fetch": "^4.0.0",
"@pigment-css/react": "0.0.24",
"@pigment-css/unplugin": "0.0.24",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/babel-plugin-minify-errors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-babel-plugin-minify-errors",
"version": "1.0.10",
"version": "1.0.11",
"author": "MUI Team",
"description": "This is an internal package not meant for general use.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/docs-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"rimraf": "^6.0.1",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions packages-internal/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-scripts",
"version": "1.0.23",
"version": "1.0.24",
"author": "MUI Team",
"description": "Utilities supporting MUI libraries build and docs generation. This is an internal package not meant for general use.",
"main": "build/index.js",
Expand Down Expand Up @@ -33,7 +33,7 @@
"@mui/internal-docs-utils": "workspace:^",
"doctrine": "^3.0.0",
"lodash": "^4.17.21",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"uuid": "^9.0.1"
},
"devDependencies": {
Expand All @@ -42,7 +42,7 @@
"@types/chai": "^4.3.20",
"@types/doctrine": "^0.0.9",
"@types/lodash": "^4.17.10",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/react": "^18.3.11",
"@types/uuid": "^9.0.8",
"chai": "^4.5.0",
Expand Down
6 changes: 3 additions & 3 deletions packages-internal/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-test-utils",
"version": "1.0.16",
"version": "1.0.17",
"author": "MUI Team",
"description": "Utilities for MUI tests. This is an internal package not meant for general use.",
"main": "./build/index.js",
Expand Down Expand Up @@ -58,9 +58,9 @@
"@types/format-util": "^1.0.4",
"@types/prop-types": "^15.7.13",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@types/react-dom": "^18.3.1",
"@types/sinon": "^17.0.3",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
},
"peerDependencies": {
"react": "^18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/api-docs-builder-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
},
"devDependencies": {
"@types/chai": "^4.3.20",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.10",
"@types/mocha": "^10.0.9",
"@types/node": "^20.16.11",
"@types/sinon": "^17.0.3",
"chai": "^4.5.0",
"sinon": "^18.0.1",
"typescript": "^5.6.2"
"typescript": "^5.6.3"
}
}
6 changes: 3 additions & 3 deletions packages/api-docs-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"react-docgen": "^5.4.3",
"recast": "^0.23.9",
"remark": "^15.0.1",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"unist-util-visit": "^5.0.0"
},
"devDependencies": {
Expand All @@ -31,8 +31,8 @@
"@types/chai": "^4.3.20",
"@types/doctrine": "^0.0.9",
"@types/mdast": "4.0.4",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.10",
"@types/mocha": "^10.0.9",
"@types/node": "^20.16.11",
"@types/react-docgen": "workspace:*",
"@types/sinon": "^17.0.3",
"chai": "^4.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-markdown",
"version": "1.0.16",
"version": "1.0.17",
"author": "MUI Team",
"description": "MUI markdown parser. This is an internal package not meant for general use.",
"main": "./index.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/base",
"version": "5.0.0-beta.58",
"version": "5.0.0-beta.59",
"private": false,
"author": "MUI Team",
"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.",
Expand Down Expand Up @@ -56,7 +56,7 @@
"@types/chai": "^4.3.20",
"@types/prop-types": "^15.7.13",
"@types/react": "18.3.11",
"@types/react-dom": "18.3.0",
"@types/react-dom": "18.3.1",
"@types/sinon": "^17.0.3",
"chai": "^4.5.0",
"fast-glob": "^3.3.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/codemod",
"version": "6.1.2",
"version": "6.1.4",
"bin": "./codemod.js",
"private": false,
"author": "MUI Team",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-core-downloads-tracker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/core-downloads-tracker",
"version": "6.1.3",
"version": "6.1.4",
"private": false,
"author": "MUI Team",
"description": "Internal package to track number of downloads of our design system libraries",
Expand Down
6 changes: 3 additions & 3 deletions packages/mui-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/docs",
"version": "6.1.3",
"version": "6.1.4",
"private": false,
"author": "MUI Team",
"description": "MUI Docs - Documentation building blocks.",
Expand Down Expand Up @@ -45,10 +45,10 @@
"@mui/icons-material": "workspace:*",
"@mui/material": "workspace:*",
"@types/gtag.js": "^0.0.20",
"@types/node": "^20.16.10",
"@types/node": "^20.16.11",
"@types/prop-types": "^15.7.13",
"@types/react": "^18.3.11",
"next": "^14.2.14",
"next": "^14.2.15",
"react": "^18.3.1"
},
"peerDependencies": {
Expand Down
4 changes: 0 additions & 4 deletions packages/mui-docs/src/HighlightedCode/HighlightedCode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ const Pre = styled('pre')(({ theme }) => ({
margin: 0,
color: 'hsl(60deg 30% 96.08%)', // fallback color until Prism's theme is loaded
WebkitOverflowScrolling: 'touch', // iOS momentum scrolling.
maxWidth: 'calc(100vw - 32px)',
[theme.breakpoints.up('md')]: {
maxWidth: 'calc(100vw - 32px - 16px)',
},
'& code': {
// Avoid layout jump after hydration (style injected by Prism)
...theme.typography.caption,
Expand Down
4 changes: 0 additions & 4 deletions packages/mui-docs/src/MarkdownElement/MarkdownElement.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ const Root = styled('div')(
overflow: 'auto',
WebkitOverflowScrolling: 'touch',
fontSize: lightTheme.typography.pxToRem(13),
maxWidth: 'calc(100vw - 32px)',
maxHeight: '400px',
[lightTheme.breakpoints.up('md')]: {
maxWidth: 'calc(100vw - 32px - 16px)',
},
},
'& code': {
...lightTheme.typography.body2,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-icons-material/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/icons-material",
"version": "6.1.3",
"version": "6.1.4",
"private": false,
"author": "MUI Team",
"description": "Material Design icons distributed as SVG React components.",
Expand Down
Loading

0 comments on commit 3d6fe73

Please sign in to comment.