From 6b0c329208258a132aea89a086fc8e307daad7a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rodolfo=20Freitas?= Date: Mon, 2 Sep 2024 17:07:46 +0200 Subject: [PATCH 01/22] [website] Update Premium price and remove any mention to cap (#43466) --- .../material-ui-sync/material-ui-sync.md | 37 +-- docs/src/components/pricing/PricingFAQ.tsx | 11 - docs/src/components/pricing/PricingTable.tsx | 232 +++++++++++------- .../pricing/PricingWhatToExpect.tsx | 8 +- 4 files changed, 169 insertions(+), 119 deletions(-) diff --git a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md index d1945703e4749f..97b08cfaa3611b 100644 --- a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md +++ b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md @@ -251,27 +251,28 @@ const theme = createTheme({ styleOverrides: { root: { '&.MuiSwitch-sizeMedium:has(.MuiSwitch-colorPrimary)': { - '&:has(.Mui-checked):not(:has(.Mui-disabled)):not(:has(.Mui-focusVisible))': { - width: '40px', - height: '21px', - padding: '0', - '& .MuiSwitch-switchBase': { - transform: 'translateX(19px) translateY(2px)', + '&:has(.Mui-checked):not(:has(.Mui-disabled)):not(:has(.Mui-focusVisible))': + { + width: '40px', + height: '21px', padding: '0', - '& .MuiSwitch-thumb': { - width: '17px', - height: '17px', - background: '#FAFAFA', - }, - '& + .MuiSwitch-track': { - width: '38px', - height: '21px', - background: 'var(--mui-palette-success-light)', - borderRadius: 'var(--mui-shape-borderRadiusRound)', - opacity: '1', + '& .MuiSwitch-switchBase': { + transform: 'translateX(19px) translateY(2px)', + padding: '0', + '& .MuiSwitch-thumb': { + width: '17px', + height: '17px', + background: '#FAFAFA', + }, + '& + .MuiSwitch-track': { + width: '38px', + height: '21px', + background: 'var(--mui-palette-success-light)', + borderRadius: 'var(--mui-shape-borderRadiusRound)', + opacity: '1', + }, }, }, - }, }, }, }, diff --git a/docs/src/components/pricing/PricingFAQ.tsx b/docs/src/components/pricing/PricingFAQ.tsx index ccff1240d3f2c2..0a84733be3679c 100644 --- a/docs/src/components/pricing/PricingFAQ.tsx +++ b/docs/src/components/pricing/PricingFAQ.tsx @@ -82,17 +82,6 @@ const faqData = [ ), }, - { - summary: 'Why are you calling it "early access"?', - detail: ( - - We think you'll love the features we've built so far, but we're planning to release more. We - opened it up as soon as we had something useful so that you can start getting value from it - right away, and we'll be adding new features and components based on our own ideas, and on - suggestions from early access customers. - - ), - }, { summary: 'Do developers have to be named?', detail: ( diff --git a/docs/src/components/pricing/PricingTable.tsx b/docs/src/components/pricing/PricingTable.tsx index 4f4a68a3ce34d8..17268e6d19e938 100644 --- a/docs/src/components/pricing/PricingTable.tsx +++ b/docs/src/components/pricing/PricingTable.tsx @@ -10,7 +10,6 @@ import Tooltip from '@mui/material/Tooltip'; import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined'; import { useRouter } from 'next/router'; import KeyboardArrowRightRounded from '@mui/icons-material/KeyboardArrowRightRounded'; -import OpenInNewRoundedIcon from '@mui/icons-material/OpenInNewRounded'; import LaunchRounded from '@mui/icons-material/LaunchRounded'; import UnfoldMoreRounded from '@mui/icons-material/UnfoldMoreRounded'; import { Link } from '@mui/docs/Link'; @@ -94,7 +93,7 @@ export function PlanPrice(props: PlanPriceProps) { const { licenseModel } = useLicenseModel(); const annual = licenseModel === 'annual'; - const planPriceMinHeight = 64; + const planPriceMinHeight = 24; if (plan === 'community') { return ( @@ -103,7 +102,7 @@ export function PlanPrice(props: PlanPriceProps) { $0 @@ -165,30 +164,12 @@ export function PlanPrice(props: PlanPriceProps) { {priceExplanation} )} - - - No extra fees for orders with over 10 devs  - - - - by Aug 30 - - - - - . - ); } // else Premium - - const originalPriceMultiplicator = monthlyDisplay ? 1 : 12; - const premiumOriginalValue = annual - ? 49 * originalPriceMultiplicator - : 49 * 3 * originalPriceMultiplicator; - const premiumMonthlyValue = annual ? 37 : 37 * 3; + const premiumMonthlyValue = annual ? 49 : 49 * 3; const premiumAnnualValue = premiumMonthlyValue * 12; const premiumDisplayedValue = monthlyDisplay ? premiumMonthlyValue : premiumAnnualValue; @@ -200,34 +181,6 @@ export function PlanPrice(props: PlanPriceProps) { - ({ - borderRadius: 0.5, - alignSelf: 'flex-end', - textDecoration: 'line-through', - py: 0.5, - px: 1, - mb: 0.5, - fontWeight: 'medium', - bgcolor: 'error.50', - color: 'error.500', - border: '1px solid', - borderColor: 'error.100', - ...theme.applyDarkStyles({ - color: 'error.300', - bgcolor: 'error.900', - borderColor: 'error.800', - }), - }), - ]} - > - {formatCurrency(premiumOriginalValue)} - {formatCurrency(premiumDisplayedValue)} @@ -252,18 +205,6 @@ export function PlanPrice(props: PlanPriceProps) { {priceExplanation} )} - - šŸ¦ Early Bird: 25% off if ordered   - - - - by Aug 30 - {' '} - - - - . - ); @@ -635,8 +576,8 @@ const rowHeaders: Record = { 'charts/pie': , 'charts/sparkline': , 'charts/gauge': , - 'charts/treemap': , 'charts/heatmap': , + 'charts/treemap': , 'charts/radar': , 'charts/funnel': , 'charts/sankey': , @@ -647,7 +588,7 @@ const rowHeaders: Record = { // charts - features 'charts/legend': , 'charts/tooltip': , - 'charts/mouse-zoom': , + 'charts/zoom-and-pan': , 'charts/export': , // charts - datagrid 'charts/cell-with-charts': ( @@ -655,7 +596,35 @@ const rowHeaders: Record = { ), 'charts/filter-interaction': , 'charts/selection-interaction': , - 'tree-view/tree-view': , + // Treeview - components + 'tree-view/simple-tree-view': ( + + ), + 'tree-view/rich-tree-view': ( + + ), + + // Treeview - advanced features + 'tree-view/selection': ( + + ), + 'tree-view/multi-selection': ( + + ), + 'tree-view/inline-editing': ( + + ), + 'tree-view/drag-to-reorder': ( + + ), + 'tree-view/virtualization': , + 'mui-x-production': , 'mui-x-development': , 'mui-x-development-perpetual': ( @@ -809,8 +778,8 @@ const communityData: Record = { 'charts/pie': yes, 'charts/sparkline': yes, 'charts/gauge': yes, - 'charts/treemap': pending, 'charts/heatmap': no, + 'charts/treemap': pending, 'charts/radar': pending, 'charts/funnel': no, 'charts/sankey': no, @@ -821,14 +790,20 @@ const communityData: Record = { // charts - features 'charts/legend': yes, 'charts/tooltip': yes, - 'charts/mouse-zoom': no, + 'charts/zoom-and-pan': no, 'charts/export': no, // charts - datagrid 'charts/cell-with-charts': yes, 'charts/filter-interaction': no, 'charts/selection-interaction': no, // Tree View - 'tree-view/tree-view': yes, + 'tree-view/simple-tree-view': yes, + 'tree-view/rich-tree-view': yes, + 'tree-view/selection': yes, + 'tree-view/multi-selection': yes, + 'tree-view/inline-editing': yes, + 'tree-view/drag-to-reorder': no, + 'tree-view/virtualization': no, // general 'mui-x-production': yes, 'mui-x-updates': yes, @@ -906,8 +881,9 @@ const proData: Record = { 'charts/pie': yes, 'charts/sparkline': yes, 'charts/gauge': yes, + 'charts/heatmap': yes, 'charts/treemap': pending, - 'charts/heatmap': pending, + 'charts/radar': pending, 'charts/funnel': pending, 'charts/sankey': pending, @@ -918,14 +894,20 @@ const proData: Record = { // charts - features 'charts/legend': yes, 'charts/tooltip': yes, - 'charts/mouse-zoom': pending, + 'charts/zoom-and-pan': yes, 'charts/export': pending, // charts - datagrid 'charts/cell-with-charts': yes, 'charts/filter-interaction': pending, 'charts/selection-interaction': no, // Tree View - 'tree-view/tree-view': yes, + 'tree-view/simple-tree-view': yes, + 'tree-view/rich-tree-view': yes, + 'tree-view/selection': yes, + 'tree-view/multi-selection': yes, + 'tree-view/inline-editing': yes, + 'tree-view/drag-to-reorder': yes, + 'tree-view/virtualization': pending, // general 'mui-x-production': yes, 'mui-x-development': , @@ -939,12 +921,7 @@ const proData: Record = { 'response-time': no, 'pre-screening': no, 'issue-escalation': no, - 'security-questionnaire': ( - - ), + 'security-questionnaire': , }; const premiumData: Record = { @@ -1008,8 +985,8 @@ const premiumData: Record = { 'charts/pie': yes, 'charts/sparkline': yes, 'charts/gauge': yes, + 'charts/heatmap': yes, 'charts/treemap': pending, - 'charts/heatmap': pending, 'charts/radar': pending, 'charts/funnel': pending, 'charts/sankey': pending, @@ -1020,14 +997,20 @@ const premiumData: Record = { // charts - features 'charts/legend': yes, 'charts/tooltip': yes, - 'charts/mouse-zoom': pending, + 'charts/zoom-and-pan': yes, 'charts/export': pending, // charts - datagrid 'charts/cell-with-charts': yes, 'charts/filter-interaction': pending, 'charts/selection-interaction': pending, // Tree View - 'tree-view/tree-view': yes, + 'tree-view/simple-tree-view': yes, + 'tree-view/rich-tree-view': yes, + 'tree-view/selection': yes, + 'tree-view/multi-selection': yes, + 'tree-view/inline-editing': yes, + 'tree-view/drag-to-reorder': yes, + 'tree-view/virtualization': pending, // general 'mui-x-production': yes, 'mui-x-development': , @@ -1273,11 +1256,13 @@ export default function PricingTable({ const router = useRouter(); const [dataGridCollapsed, setDataGridCollapsed] = React.useState(false); const [chartsCollapsed, setChartsCollapsed] = React.useState(false); + const [treeViewCollapsed, setTreeViewCollapsed] = React.useState(false); React.useEffect(() => { if (router.query['expand-path'] === 'all') { setDataGridCollapsed(true); setChartsCollapsed(true); + setTreeViewCollapsed(true); } }, [router.query]); @@ -1311,6 +1296,12 @@ export default function PricingTable({ sx={{ color: 'grey.600', opacity: chartsCollapsed ? 0 : 1 }} /> ); + const treeViewUnfoldMore = ( + + ); const renderRow = (key: string) => renderMasterRow(key, gridSx, plans); const renderNestedRow = (key: string) => renderMasterRow(key, nestedGridSx, plans); @@ -1584,12 +1575,12 @@ export default function PricingTable({ {divider} {renderNestedRow('charts/gauge')} {divider} + {renderNestedRow('charts/heatmap')} + {divider} {renderNestedRow('charts/treemap')} {divider} {renderNestedRow('charts/radar')} {divider} - {renderNestedRow('charts/heatmap')} - {divider} {renderNestedRow('charts/funnel')} {divider} {renderNestedRow('charts/sankey')} @@ -1607,7 +1598,7 @@ export default function PricingTable({ {divider} {renderNestedRow('charts/tooltip')} {divider} - {renderNestedRow('charts/mouse-zoom')} + {renderNestedRow('charts/zoom-and-pan')} {divider} {renderNestedRow('charts/export')} {divider} @@ -1619,7 +1610,80 @@ export default function PricingTable({ {renderNestedRow('charts/selection-interaction')} {divider} - {renderRow('tree-view/tree-view')} + + + {treeViewUnfoldMore} + + {treeViewUnfoldMore} + + + {treeViewUnfoldMore} + + + + + Components + {renderNestedRow('tree-view/simple-tree-view')} + {divider} + {renderNestedRow('tree-view/rich-tree-view')} + {divider} + Advanced features + {renderNestedRow('tree-view/selection')} + {divider} + {renderNestedRow('tree-view/multi-selection')} + {divider} + {renderNestedRow('tree-view/inline-editing')} + {divider} + {renderNestedRow('tree-view/drag-to-reorder')} + {divider} + {renderNestedRow('tree-view/virtualization')} + {divider} + {divider} {renderRow('mui-x-production')} {divider} diff --git a/docs/src/components/pricing/PricingWhatToExpect.tsx b/docs/src/components/pricing/PricingWhatToExpect.tsx index fbb5668b3544c4..843e6c53eee259 100644 --- a/docs/src/components/pricing/PricingWhatToExpect.tsx +++ b/docs/src/components/pricing/PricingWhatToExpect.tsx @@ -180,12 +180,8 @@ export default function PricingWhatToExpect() { - The Pro plan is capped at 10 developers licensed; you do not need to pay for additional - licenses for more than 10 developers. -
-
- You can contact sales for a volume discount - when licensing over 25 developers under the Premium plan. + Have a team of 25 or more developers? Get in touch with our{' '} + sales team for a volume discount. From 45deab83c12504c53470f17487231cdeb93b880f Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 2 Sep 2024 17:44:27 +0200 Subject: [PATCH 02/22] [docs] Update version support range (#43565) --- SECURITY.md | 17 +++++++++-------- .../material/getting-started/support/support.md | 5 +++-- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 72e098f169ea14..33fe1f501efd73 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,14 +4,15 @@ The versions of the project that are currently supported with security updates. -| MaterialĀ UI version | Release | Supported | -| ------------------: | :--------- | :------------------- | -| ^5.0.0 | 2021-09-16 | āœ… Stable major | -| ^4.0.0 | 2019-06-23 | āœ… Long-term support | -| ^3.0.0 | 2018-08-27 | āŒ | -| ^2.0.0 | / | āŒ | -| ^1.0.0 | 2018-06-18 | āŒ | -| <=1.0.0 | 2014-10-05 | āŒ | +| MaterialĀ UI version | Release | Supported | +| ------------------: | :--------- | :----------------------------------- | +| ^6.0.0 | 2024-08-26 | :white_check_mark: Stable major | +| ^5.0.0 | 2021-09-16 | :white_check_mark: Long-term support | +| ^4.0.0 | 2019-06-23 | :x: | +| ^3.0.0 | 2018-08-27 | :x: | +| ^2.0.0 | / | :x: | +| ^1.0.0 | 2018-06-18 | :x: | +| <=1.0.0 | 2014-10-05 | :x: | ## Reporting a vulnerability diff --git a/docs/data/material/getting-started/support/support.md b/docs/data/material/getting-started/support/support.md index 69b342cd07b045..7798a2ff0bda5f 100644 --- a/docs/data/material/getting-started/support/support.md +++ b/docs/data/material/getting-started/support/support.md @@ -74,8 +74,9 @@ This includes issues introduced by external sources, like browser upgrades or ch | MaterialĀ UI version | Release | Supported | | ------------------: | :--------- | :------------------------------------------------------------------ | -| ^5.0.0 | 2021-09-16 | āœ… Stable major (Continuous support) | -| ^4.0.0 | 2019-06-23 | āš ļø Long-term support (Support for security issues and regressions). | +| ^6.0.0 | 2024-08-26 | āœ… Stable major (Continuous support) | +| ^5.0.0 | 2021-09-16 | āš ļø Long-term support (Support for security issues and regressions). | +| ^4.0.0 | 2019-06-23 | āŒ | | ^3.0.0 | 2018-08-27 | āŒ | | ^2.0.0 | / | āŒ | | ^1.0.0 | 2018-06-18 | āŒ | From 24bedf716f56b0558565a9d85e55772564893d13 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 2 Sep 2024 17:46:34 +0200 Subject: [PATCH 03/22] [docs-infra] Reduce description max-length (#43562) --- docs/pages/blog/material-ui-v6-is-out.md | 2 +- packages/markdown/prepareMarkdown.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/pages/blog/material-ui-v6-is-out.md b/docs/pages/blog/material-ui-v6-is-out.md index e2f1d304d3060a..ef423971a2fb19 100644 --- a/docs/pages/blog/material-ui-v6-is-out.md +++ b/docs/pages/blog/material-ui-v6-is-out.md @@ -1,6 +1,6 @@ --- title: MaterialĀ UI v6 is out now šŸŽ‰ -description: MaterialĀ UI v6 ships with support for CSS variables, container queries, and advanced color schemes, as well as improved runtime performance and a reduced bundle size. +description: MaterialĀ UI v6 is now stable. It comes with new features, improvements, and an experimental integration for static CSS extraction. date: 2024-08-26T00:00:00.000Z authors: [ diff --git a/packages/markdown/prepareMarkdown.js b/packages/markdown/prepareMarkdown.js index 79f8cf1f42a798..a57976e92f6ff6 100644 --- a/packages/markdown/prepareMarkdown.js +++ b/packages/markdown/prepareMarkdown.js @@ -91,7 +91,7 @@ function prepareMarkdown(config) { throw new Error(`docs-infra: Missing description in the page: ${location}\n`); } - if (description.length > 170) { + if (description.length > 160) { throw new Error( [ `docs-infra: The description "${description}" is too long (${description.length} characters).`, From 3e1a79b2836ce0b18220d4b64dc21dfcd6ccac00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:22:34 +0530 Subject: [PATCH 04/22] Bump @types/eslint to ^8.56.12 (#43553) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/eslint-plugin-material-ui/package.json | 2 +- pnpm-lock.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/eslint-plugin-material-ui/package.json b/packages/eslint-plugin-material-ui/package.json index 71f04be1475365..019d13816cd062 100644 --- a/packages/eslint-plugin-material-ui/package.json +++ b/packages/eslint-plugin-material-ui/package.json @@ -8,7 +8,7 @@ "emoji-regex": "^10.3.0" }, "devDependencies": { - "@types/eslint": "^8.56.11", + "@types/eslint": "^8.56.12", "@typescript-eslint/parser": "^7.18.0", "eslint": "^8.57.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48e4ecd4510e7e..176f2189b0c629 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1221,8 +1221,8 @@ importers: version: 10.3.0 devDependencies: '@types/eslint': - specifier: ^8.56.11 - version: 8.56.11 + specifier: ^8.56.12 + version: 8.56.12 '@typescript-eslint/parser': specifier: ^7.18.0 version: 7.18.0(eslint@8.57.0)(typescript@5.5.4) @@ -5398,8 +5398,8 @@ packages: '@types/eslint-scope@3.7.4': resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==} - '@types/eslint@8.56.11': - resolution: {integrity: sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==} + '@types/eslint@8.56.12': + resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==} '@types/estree@1.0.5': resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==} @@ -16436,10 +16436,10 @@ snapshots: '@types/eslint-scope@3.7.4': dependencies: - '@types/eslint': 8.56.11 + '@types/eslint': 8.56.12 '@types/estree': 1.0.5 - '@types/eslint@8.56.11': + '@types/eslint@8.56.12': dependencies: '@types/estree': 1.0.5 '@types/json-schema': 7.0.12 From e91db22c1dd6c6adb9be8450475a8f70b4068e4a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:47:40 +0530 Subject: [PATCH 05/22] Bump @types/node to ^18.19.48 (#43554) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docs/package.json | 2 +- package.json | 4 +- packages-internal/scripts/package.json | 2 +- packages/api-docs-builder-core/package.json | 2 +- packages/api-docs-builder/package.json | 2 +- packages/mui-docs/package.json | 2 +- packages/mui-utils/package.json | 2 +- packages/rsc-builder/package.json | 2 +- pnpm-lock.yaml | 152 ++++++++++---------- 9 files changed, 85 insertions(+), 85 deletions(-) diff --git a/docs/package.json b/docs/package.json index 27958b9ab396f3..eb8e8a7918d155 100644 --- a/docs/package.json +++ b/docs/package.json @@ -124,7 +124,7 @@ "@types/css-mediaquery": "^0.1.4", "@types/gtag.js": "^0.0.20", "@types/json2mq": "^0.2.2", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/prop-types": "^15.7.12", "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", diff --git a/package.json b/package.json index ac34da4ebb628d..1e8860019df6bd 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@types/fs-extra": "^11.0.4", "@types/lodash": "^4.17.7", "@types/mocha": "^10.0.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/react": "^18.3.4", "@types/yargs": "^17.0.33", "@typescript-eslint/eslint-plugin": "^7.18.0", @@ -209,7 +209,7 @@ "@definitelytyped/header-parser": "^0.2.12", "@definitelytyped/typescript-versions": "^0.1.4", "@definitelytyped/utils": "^0.1.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/react": "^18.3.4", "@types/react-dom": "18.3.0", "cross-fetch": "^4.0.0", diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json index 834b9378c92d58..c253360cc1c3be 100644 --- a/packages-internal/scripts/package.json +++ b/packages-internal/scripts/package.json @@ -42,7 +42,7 @@ "@types/chai": "^4.3.19", "@types/doctrine": "^0.0.9", "@types/lodash": "^4.17.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/react": "^18.3.4", "@types/uuid": "^9.0.8", "chai": "^4.5.0", diff --git a/packages/api-docs-builder-core/package.json b/packages/api-docs-builder-core/package.json index ee6956916feb23..1520175fca2021 100644 --- a/packages/api-docs-builder-core/package.json +++ b/packages/api-docs-builder-core/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@types/chai": "^4.3.19", "@types/mocha": "^10.0.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/sinon": "^17.0.3", "chai": "^4.5.0", "sinon": "^18.0.0", diff --git a/packages/api-docs-builder/package.json b/packages/api-docs-builder/package.json index a5dccd1da2357c..3362af431a0be2 100644 --- a/packages/api-docs-builder/package.json +++ b/packages/api-docs-builder/package.json @@ -32,7 +32,7 @@ "@types/doctrine": "^0.0.9", "@types/mdast": "4.0.4", "@types/mocha": "^10.0.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/react-docgen": "workspace:*", "@types/sinon": "^17.0.3", "chai": "^4.5.0", diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 08981b0b999b3f..777d7abaebaa8a 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -45,7 +45,7 @@ "@mui/icons-material": "workspace:*", "@mui/material": "workspace:*", "@types/gtag.js": "^0.0.20", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/prop-types": "^15.7.12", "@types/react": "^18.3.4", "next": "^14.2.6", diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json index ddffcbc73a069d..0a77ab17f44e30 100644 --- a/packages/mui-utils/package.json +++ b/packages/mui-utils/package.json @@ -51,7 +51,7 @@ "@mui/types": "workspace:^", "@types/chai": "^4.3.19", "@types/mocha": "^10.0.7", - "@types/node": "^18.19.46", + "@types/node": "^18.19.48", "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", "@types/react-is": "^18.3.0", diff --git a/packages/rsc-builder/package.json b/packages/rsc-builder/package.json index 31a9c1ec023d62..931d6fd81e5c1c 100644 --- a/packages/rsc-builder/package.json +++ b/packages/rsc-builder/package.json @@ -9,6 +9,6 @@ }, "devDependencies": { "@types/mocha": "^10.0.7", - "@types/node": "^18.19.46" + "@types/node": "^18.19.48" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 176f2189b0c629..483f7e8ef359d4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ overrides: '@definitelytyped/header-parser': ^0.2.12 '@definitelytyped/typescript-versions': ^0.1.4 '@definitelytyped/utils': ^0.1.7 - '@types/node': ^18.19.46 + '@types/node': ^18.19.48 '@types/react': ^18.3.4 '@types/react-dom': 18.3.0 cross-fetch: ^4.0.0 @@ -129,8 +129,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/react': specifier: ^18.3.4 version: 18.3.4 @@ -373,8 +373,8 @@ importers: specifier: 0.0.21 version: 0.0.21(@types/react@18.3.4)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/react': specifier: ^18.3.4 version: 18.3.4 @@ -435,7 +435,7 @@ importers: version: 7.24.7(@babel/core@7.25.2) '@pigment-css/vite-plugin': specifier: 0.0.21 - version: 0.0.21(@types/react@18.3.4)(react@18.3.1)(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2)) + version: 0.0.21(@types/react@18.3.4)(react@18.3.1)(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2)) '@types/react': specifier: ^18.3.4 version: 18.3.4 @@ -444,7 +444,7 @@ importers: version: 18.3.0 '@vitejs/plugin-react': specifier: ^4.3.1 - version: 4.3.1(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2)) + version: 4.3.1(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2)) postcss: specifier: ^8.4.41 version: 8.4.41 @@ -453,10 +453,10 @@ importers: version: 1.0.1 vite: specifier: 5.4.2 - version: 5.4.2(@types/node@18.19.46)(terser@5.29.2) + version: 5.4.2(@types/node@18.19.48)(terser@5.29.2) vite-plugin-pages: specifier: ^0.32.3 - version: 0.32.3(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2)) + version: 0.32.3(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2)) benchmark: dependencies: @@ -651,7 +651,7 @@ importers: version: 9.7.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@toolpad/core': specifier: ^0.5.2 - version: 0.5.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2) + version: 0.5.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.48)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2) autoprefixer: specifier: ^10.4.20 version: 10.4.20(postcss@8.4.41) @@ -855,8 +855,8 @@ importers: specifier: ^0.2.2 version: 0.2.2 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -977,8 +977,8 @@ importers: specifier: ^4.17.7 version: 4.17.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/react': specifier: ^18.3.4 version: 18.3.4 @@ -1162,8 +1162,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/react-docgen': specifier: workspace:* version: link:../react-docgen-types @@ -1199,8 +1199,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/sinon': specifier: ^17.0.3 version: 17.0.3 @@ -1452,8 +1452,8 @@ importers: specifier: ^0.0.20 version: 0.0.20 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -2177,8 +2177,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 '@types/react': specifier: ^18.3.4 version: 18.3.4 @@ -2230,8 +2230,8 @@ importers: specifier: ^10.0.7 version: 10.0.7 '@types/node': - specifier: ^18.19.46 - version: 18.19.46 + specifier: ^18.19.48 + version: 18.19.48 packages/waterfall: {} @@ -5488,8 +5488,8 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} - '@types/node@18.19.46': - resolution: {integrity: sha512-vnRgMS7W6cKa1/0G3/DTtQYpVrZ8c0Xm6UkLaVFrb9jtcVC3okokW09Ki1Qdrj9ISokszD69nY4WDLRlvHlhAA==} + '@types/node@18.19.48': + resolution: {integrity: sha512-7WevbG4ekUcRQSZzOwxWgi5dZmTak7FaxXDoW7xVxPBmKx1rTzfmRLkeCgJzcbBnOV2dkhAPc8cCeT6agocpjg==} '@types/normalize-package-data@2.4.1': resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -12280,7 +12280,7 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: - '@types/node': ^18.19.46 + '@types/node': ^18.19.48 less: '*' lightningcss: ^1.21.0 sass: '*' @@ -12312,7 +12312,7 @@ packages: hasBin: true peerDependencies: '@edge-runtime/vm': '*' - '@types/node': ^18.19.46 + '@types/node': ^18.19.48 '@vitest/browser': 2.0.5 '@vitest/ui': 2.0.5 happy-dom: '*' @@ -14268,7 +14268,7 @@ snapshots: '@fast-csv/format@4.3.5': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 lodash.escaperegexp: 4.1.2 lodash.isboolean: 3.0.3 lodash.isequal: 4.5.0 @@ -14277,7 +14277,7 @@ snapshots: '@fast-csv/parse@4.3.6': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 lodash.escaperegexp: 4.1.2 lodash.groupby: 4.6.0 lodash.isfunction: 3.0.9 @@ -14467,14 +14467,14 @@ snapshots: dependencies: '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.46 + '@types/node': 18.19.48 jest-mock: 29.7.0 '@jest/fake-timers@29.7.0': dependencies: '@jest/types': 29.6.3 '@sinonjs/fake-timers': 10.3.0 - '@types/node': 18.19.46 + '@types/node': 18.19.48 jest-message-util: 29.7.0 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -14487,7 +14487,7 @@ snapshots: dependencies: '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/yargs': 15.0.19 chalk: 4.1.2 @@ -14496,7 +14496,7 @@ snapshots: '@jest/schemas': 29.6.3 '@types/istanbul-lib-coverage': 2.0.6 '@types/istanbul-reports': 3.0.4 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/yargs': 17.0.33 chalk: 4.1.2 @@ -15558,7 +15558,7 @@ snapshots: - react - supports-color - '@pigment-css/vite-plugin@0.0.21(@types/react@18.3.4)(react@18.3.1)(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2))': + '@pigment-css/vite-plugin@0.0.21(@types/react@18.3.4)(react@18.3.1)(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2))': dependencies: '@babel/core': 7.25.2 '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) @@ -15566,7 +15566,7 @@ snapshots: '@wyw-in-js/shared': 0.5.4 '@wyw-in-js/transform': 0.5.4 babel-plugin-define-var: 0.1.0 - vite: 5.4.2(@types/node@18.19.46)(terser@5.29.2) + vite: 5.4.2(@types/node@18.19.48)(terser@5.29.2) transitivePeerDependencies: - '@types/react' - react @@ -16096,18 +16096,18 @@ snapshots: '@slack/logger@3.0.0': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@slack/logger@4.0.0': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@slack/oauth@2.6.3': dependencies: '@slack/logger': 3.0.0 '@slack/web-api': 6.12.1 '@types/jsonwebtoken': 8.5.9 - '@types/node': 18.19.46 + '@types/node': 18.19.48 jsonwebtoken: 9.0.0 lodash.isstring: 4.0.1 transitivePeerDependencies: @@ -16117,7 +16117,7 @@ snapshots: dependencies: '@slack/logger': 3.0.0 '@slack/web-api': 6.12.1 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/ws': 7.4.7 eventemitter3: 5.0.1 finity: 0.5.4 @@ -16134,7 +16134,7 @@ snapshots: '@slack/logger': 3.0.0 '@slack/types': 2.11.0 '@types/is-stream': 1.1.0 - '@types/node': 18.19.46 + '@types/node': 18.19.48 axios: 1.7.4(debug@4.3.6) eventemitter3: 3.1.2 form-data: 2.5.1 @@ -16283,14 +16283,14 @@ snapshots: '@theme-ui/css': 0.16.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1)) react: 18.3.1 - '@toolpad/core@0.5.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.46)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2)': + '@toolpad/core@0.5.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.48)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2)': dependencies: '@babel/runtime': 7.25.0 '@mui/icons-material': link:packages/mui-icons-material/build '@mui/lab': 5.0.0-alpha.173(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': link:packages/mui-material/build '@mui/utils': 6.0.0-rc.0(@types/react@18.3.4)(react@18.3.1) - '@toolpad/utils': 0.5.2(@types/node@18.19.46)(happy-dom@12.10.3)(jsdom@24.0.0)(react@18.3.1)(terser@5.29.2) + '@toolpad/utils': 0.5.2(@types/node@18.19.48)(happy-dom@12.10.3)(jsdom@24.0.0)(react@18.3.1)(terser@5.29.2) client-only: 0.0.1 invariant: 2.2.4 prop-types: 15.8.1 @@ -16317,14 +16317,14 @@ snapshots: - supports-color - terser - '@toolpad/utils@0.5.2(@types/node@18.19.46)(happy-dom@12.10.3)(jsdom@24.0.0)(react@18.3.1)(terser@5.29.2)': + '@toolpad/utils@0.5.2(@types/node@18.19.48)(happy-dom@12.10.3)(jsdom@24.0.0)(react@18.3.1)(terser@5.29.2)': dependencies: invariant: 2.2.4 prettier: 3.3.3 react: 18.3.1 react-is: 18.3.1 title: 3.5.3 - vitest: 2.0.5(@types/node@18.19.46)(happy-dom@12.10.3)(jsdom@24.0.0)(terser@5.29.2) + vitest: 2.0.5(@types/node@18.19.48)(happy-dom@12.10.3)(jsdom@24.0.0)(terser@5.29.2) yaml: 2.5.0 yaml-diff-patch: 2.0.0 transitivePeerDependencies: @@ -16390,7 +16390,7 @@ snapshots: '@types/body-parser@1.19.2': dependencies: '@types/connect': 3.4.35 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/chai-dom@1.11.3': dependencies: @@ -16400,7 +16400,7 @@ snapshots: '@types/connect@3.4.35': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/cookie@0.4.1': {} @@ -16448,7 +16448,7 @@ snapshots: '@types/express-serve-static-core@4.17.35': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -16465,7 +16465,7 @@ snapshots: '@types/fs-extra@11.0.4': dependencies: '@types/jsonfile': 6.1.1 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/gtag.js@0.0.20': {} @@ -16480,7 +16480,7 @@ snapshots: '@types/is-stream@1.1.0': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/istanbul-lib-coverage@2.0.6': {} @@ -16505,11 +16505,11 @@ snapshots: '@types/jsonfile@6.1.1': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/jsonwebtoken@8.5.9': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/lodash.mergewith@4.6.7': dependencies: @@ -16537,7 +16537,7 @@ snapshots: '@types/ms@0.7.34': {} - '@types/node@18.19.46': + '@types/node@18.19.48': dependencies: undici-types: 5.26.5 @@ -16593,13 +16593,13 @@ snapshots: '@types/send@0.17.1': dependencies: '@types/mime': 1.3.2 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/serve-static@1.15.2': dependencies: '@types/http-errors': 2.0.1 '@types/mime': 3.0.1 - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/sinon@17.0.3': dependencies: @@ -16629,7 +16629,7 @@ snapshots: '@types/ws@7.4.7': dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 '@types/yargs-parser@21.0.3': {} @@ -16724,14 +16724,14 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vitejs/plugin-react@4.3.1(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2))': + '@vitejs/plugin-react@4.3.1(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2))': dependencies: '@babel/core': 7.25.2 '@babel/plugin-transform-react-jsx-self': 7.24.6(@babel/core@7.25.2) '@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.25.2) '@types/babel__core': 7.20.5 react-refresh: 0.14.2 - vite: 5.4.2(@types/node@18.19.46)(terser@5.29.2) + vite: 5.4.2(@types/node@18.19.48)(terser@5.29.2) transitivePeerDependencies: - supports-color @@ -17738,7 +17738,7 @@ snapshots: chrome-launcher@0.15.2: dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 escape-string-regexp: 4.0.0 is-wsl: 2.2.0 lighthouse-logger: 1.4.2 @@ -17749,7 +17749,7 @@ snapshots: chromium-edge-launcher@1.0.0: dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 escape-string-regexp: 4.0.0 is-wsl: 2.2.0 lighthouse-logger: 1.4.2 @@ -18617,7 +18617,7 @@ snapshots: dependencies: '@types/cookie': 0.4.1 '@types/cors': 2.8.12 - '@types/node': 18.19.46 + '@types/node': 18.19.48 accepts: 1.3.8 base64id: 2.0.0 cookie: 0.4.2 @@ -20456,7 +20456,7 @@ snapshots: '@jest/environment': 29.7.0 '@jest/fake-timers': 29.7.0 '@jest/types': 29.6.3 - '@types/node': 18.19.46 + '@types/node': 18.19.48 jest-mock: 29.7.0 jest-util: 29.7.0 @@ -20477,13 +20477,13 @@ snapshots: jest-mock@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.46 + '@types/node': 18.19.48 jest-util: 29.7.0 jest-util@29.7.0: dependencies: '@jest/types': 29.6.3 - '@types/node': 18.19.46 + '@types/node': 18.19.48 chalk: 4.1.2 ci-info: 3.9.0 graceful-fs: 4.2.11 @@ -20500,13 +20500,13 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 merge-stream: 2.0.0 supports-color: 8.1.1 jest-worker@29.7.0: dependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 jest-util: 29.7.0 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -24735,13 +24735,13 @@ snapshots: unist-util-stringify-position: 2.0.3 vfile-message: 2.0.4 - vite-node@2.0.5(@types/node@18.19.46)(terser@5.29.2): + vite-node@2.0.5(@types/node@18.19.48)(terser@5.29.2): dependencies: cac: 6.7.14 debug: 4.3.6(supports-color@8.1.1) pathe: 1.1.2 tinyrainbow: 1.2.0 - vite: 5.4.2(@types/node@18.19.46)(terser@5.29.2) + vite: 5.4.2(@types/node@18.19.48)(terser@5.29.2) transitivePeerDependencies: - '@types/node' - less @@ -24753,7 +24753,7 @@ snapshots: - supports-color - terser - vite-plugin-pages@0.32.3(vite@5.4.2(@types/node@18.19.46)(terser@5.29.2)): + vite-plugin-pages@0.32.3(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2)): dependencies: '@types/debug': 4.1.12 debug: 4.3.6(supports-color@8.1.1) @@ -24763,22 +24763,22 @@ snapshots: json5: 2.2.3 local-pkg: 0.5.0 picocolors: 1.0.1 - vite: 5.4.2(@types/node@18.19.46)(terser@5.29.2) + vite: 5.4.2(@types/node@18.19.48)(terser@5.29.2) yaml: 2.5.0 transitivePeerDependencies: - supports-color - vite@5.4.2(@types/node@18.19.46)(terser@5.29.2): + vite@5.4.2(@types/node@18.19.48)(terser@5.29.2): dependencies: esbuild: 0.21.5 postcss: 8.4.41 rollup: 4.21.1 optionalDependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 fsevents: 2.3.3 terser: 5.29.2 - vitest@2.0.5(@types/node@18.19.46)(happy-dom@12.10.3)(jsdom@24.0.0)(terser@5.29.2): + vitest@2.0.5(@types/node@18.19.48)(happy-dom@12.10.3)(jsdom@24.0.0)(terser@5.29.2): dependencies: '@ampproject/remapping': 2.3.0 '@vitest/expect': 2.0.5 @@ -24796,11 +24796,11 @@ snapshots: tinybench: 2.8.0 tinypool: 1.0.0 tinyrainbow: 1.2.0 - vite: 5.4.2(@types/node@18.19.46)(terser@5.29.2) - vite-node: 2.0.5(@types/node@18.19.46)(terser@5.29.2) + vite: 5.4.2(@types/node@18.19.48)(terser@5.29.2) + vite-node: 2.0.5(@types/node@18.19.48)(terser@5.29.2) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 18.19.46 + '@types/node': 18.19.48 happy-dom: 12.10.3 jsdom: 24.0.0 transitivePeerDependencies: From b7c3ad322bb5ac584a40a5a6fec50f56fc4545d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:51:24 +0530 Subject: [PATCH 06/22] Bump github/codeql-action action to v3.26.6 (#43557) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/codeql.yml | 4 ++-- .github/workflows/scorecards.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index e06182cf34fee0..f8e99c9fc48504 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5 + uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 with: languages: typescript config-file: ./.github/codeql/codeql-config.yml @@ -30,4 +30,4 @@ jobs: # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs # queries: security-extended,security-and-quality - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5 + uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index 5b0ec7d0442702..2e114a690604ac 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -43,6 +43,6 @@ jobs: # Upload the results to GitHub's code scanning dashboard. - name: Upload to code-scanning - uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5 + uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6 with: sarif_file: results.sarif From 338bf0f7f2df651a2ed2b6f8141431f79eb52757 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 22:54:16 +0530 Subject: [PATCH 07/22] Bump react-number-format to ^5.4.1 (#43561) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docs/package.json | 2 +- pnpm-lock.yaml | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/package.json b/docs/package.json index eb8e8a7918d155..8ab7d06196c576 100644 --- a/docs/package.json +++ b/docs/package.json @@ -96,7 +96,7 @@ "react-imask": "^7.6.1", "react-intersection-observer": "^9.13.0", "react-is": "^18.3.1", - "react-number-format": "^5.4.0", + "react-number-format": "^5.4.1", "react-router-dom": "^6.26.1", "react-runner": "^1.0.5", "react-simple-code-editor": "^0.14.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 483f7e8ef359d4..38b881e15db700 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -776,8 +776,8 @@ importers: specifier: ^18.3.1 version: 18.3.1 react-number-format: - specifier: ^5.4.0 - version: 5.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.4.1 + version: 5.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-router-dom: specifier: ^6.26.1 version: 6.26.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -10777,8 +10777,8 @@ packages: peerDependencies: react: 18.2.0 - react-number-format@5.4.0: - resolution: {integrity: sha512-NWdICrqLhI7rAS8yUeLVd6Wr4cN7UjJ9IBTS0f/a9i7UB4x4Ti70kGnksBtZ7o4Z7YRbvCMMR/jQmkoOBa/4fg==} + react-number-format@5.4.1: + resolution: {integrity: sha512-NICOjo/70dcAiwVmH6zMWoZrTQDlBrEXV/f7S0t/ewlpzp4z00pasg5G1yBX6NHLafwOF3QZ+VvK/XApwSKxdA==} peerDependencies: react: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 react-dom: ^0.14 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 @@ -23007,9 +23007,8 @@ snapshots: - supports-color - utf-8-validate - react-number-format@5.4.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + react-number-format@5.4.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: - prop-types: 15.8.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) From 027225c2bb58828097800c9552d856ee445900b8 Mon Sep 17 00:00:00 2001 From: Siriwat K Date: Tue, 3 Sep 2024 02:50:00 +0700 Subject: [PATCH 08/22] [typescript] Fix missing `Theme` generic (#43523) --- packages/mui-material/src/Popover/Popover.spec.tsx | 9 +++++++++ packages/mui-material/src/utils/types.ts | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/mui-material/src/Popover/Popover.spec.tsx b/packages/mui-material/src/Popover/Popover.spec.tsx index e771e801c80d83..823d9bb661f5df 100644 --- a/packages/mui-material/src/Popover/Popover.spec.tsx +++ b/packages/mui-material/src/Popover/Popover.spec.tsx @@ -16,3 +16,12 @@ function Test() { ); } + + ({ backgroundColor: theme.palette.primary.main }), + }, + }} +/>; diff --git a/packages/mui-material/src/utils/types.ts b/packages/mui-material/src/utils/types.ts index 01d4a1be52612c..caa6f2b606339b 100644 --- a/packages/mui-material/src/utils/types.ts +++ b/packages/mui-material/src/utils/types.ts @@ -1,5 +1,6 @@ import { SxProps } from '@mui/system'; import { SlotComponentProps } from '@mui/utils'; +import { Theme } from '../styles'; export type { EventHandlers, @@ -10,7 +11,7 @@ export type { export type SlotCommonProps = { component?: React.ElementType; - sx?: SxProps; + sx?: SxProps; }; export type SlotProps< From e57669d10c83abb95ddf76a12f931415c4246290 Mon Sep 17 00:00:00 2001 From: Siriwat K Date: Tue, 3 Sep 2024 02:56:16 +0700 Subject: [PATCH 09/22] [codemod] Skip `ListItemButton` import for unrelated files (#43532) --- .../list-item-button-prop/list-item-button-prop.js | 7 +++++-- .../list-item-button-prop.test.js | 11 +++++++++++ .../test-cases/not-related.actual.js | 3 +++ .../test-cases/not-related.expected.js | 3 +++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.actual.js create mode 100644 packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.expected.js diff --git a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.js b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.js index 0fb4f0cc53fa73..22dd7082c0e611 100644 --- a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.js +++ b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.js @@ -54,6 +54,7 @@ export default function transformer(file, api, options) { const openTaggedNotHavingButtonProp = new Set(); const openTaggedHavingButtonProp = new Set(); + let addedListItemButton = false; // Rename components that have ListItem button to ListItemButton findComponentJSX(j, { root, componentName: 'ListItem' }, (elementPath) => { const index = elementPath.node.openingElement.attributes.findIndex( @@ -62,6 +63,7 @@ export default function transformer(file, api, options) { // The ListItem has a button prop if (index !== -1) { openTaggedHavingButtonProp.add(elementPath.node.openingElement.name.name); + addedListItemButton = true; elementPath.node.openingElement.name.name = `ListItemButton`; elementPath.node.openingElement.attributes.splice(index, 1); } else { @@ -110,12 +112,13 @@ export default function transformer(file, api, options) { return false; }) .remove(); - // If ListItemButton does not already exist, add it at the end + + // If ListItemButton import does not already exist, add it at the end const imports = root .find(j.ImportDeclaration) .filter((path) => path.node.source.value === '@mui/material/ListItemButton'); - if (imports.length === 0) { + if (addedListItemButton && imports.length === 0) { const lastImport = root.find(j.ImportDeclaration).at(-1); // Insert the import for 'ListItemButton' after the last import declaration diff --git a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.test.js b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.test.js index 723ae584e04f5d..4e6ccd771a9b8f 100644 --- a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.test.js +++ b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/list-item-button-prop.test.js @@ -61,5 +61,16 @@ describe('@mui/codemod', () => { expect(actual).to.not.equal(expected); }); }); + + it('should skip files that do not import ListItem from @mui/material', () => { + const actual = transform( + { source: read('./test-cases/not-related.actual.js') }, + { jscodeshift }, + {}, + ); + + const expected = read('./test-cases/not-related.expected.js'); + expect(actual).to.equal(expected, 'The transformed version should be correct'); + }); }); }); diff --git a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.actual.js b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.actual.js new file mode 100644 index 00000000000000..1d1e968dea9700 --- /dev/null +++ b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.actual.js @@ -0,0 +1,3 @@ +import ListItem from '@component/ListItem'; + +// The codemod should skip this file because it does not import ListItem from `@mui/material`. diff --git a/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.expected.js b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.expected.js new file mode 100644 index 00000000000000..1d1e968dea9700 --- /dev/null +++ b/packages/mui-codemod/src/v6.0.0/list-item-button-prop/test-cases/not-related.expected.js @@ -0,0 +1,3 @@ +import ListItem from '@component/ListItem'; + +// The codemod should skip this file because it does not import ListItem from `@mui/material`. From 4da19cb888e1b4cc6e2ed0930a8709bf6ba98cc4 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 2 Sep 2024 22:41:48 +0200 Subject: [PATCH 10/22] [website] Match pricing label with page Apply: https://github.com/mui/material-ui/pull/42328#discussion_r1612486486 --- docs/src/components/pricing/PricingTable.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/components/pricing/PricingTable.tsx b/docs/src/components/pricing/PricingTable.tsx index 17268e6d19e938..2e8340d360bb0d 100644 --- a/docs/src/components/pricing/PricingTable.tsx +++ b/docs/src/components/pricing/PricingTable.tsx @@ -449,7 +449,7 @@ const rowHeaders: Record = { ), 'data-grid/column-reorder': ( - + ), 'data-grid/column-pinning': ( From 9063a9d507d6947e2e4a096c81f356d17b1379f2 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Mon, 2 Sep 2024 22:46:18 +0200 Subject: [PATCH 11/22] [docs][figma] Clarity state or Figma Plugin component export (#43543) Signed-off-by: Olivier Tassinari Co-authored-by: Victor Zanivan Monteiro --- .../material-ui-sync/material-ui-sync.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md index 97b08cfaa3611b..f276b65d589d93 100644 --- a/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md +++ b/docs/data/material/design-resources/material-ui-sync/material-ui-sync.md @@ -56,13 +56,12 @@ After you've added your custom tokens, click on **Regenerate theme** to include ## Customizing components -The Sync plugin can also generate theme styles for customized components, enabling you to completely change their look and feel and create your custom design system from within Figma. - -:::info -This feature is currently limited to the Button, Switch, and Typography components. -Support for more components is coming soon. +:::warning +This feature is experimental and limited to the **Button**, **Switch**, and **Typography** components. ::: +The Sync plugin can also generate theme styles for customized components, enabling you to completely change their look and feel and create your custom design system from within Figma. + As an example, here's how to customize the checked state, medium size, and primary color of a Switch component to replicate the iOS look and feel: A specific variant of the Switch component selected in the Design Kit. From 38839fb7d950a3134cb63840fc4b208019a60bc0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:54:10 +0530 Subject: [PATCH 12/22] Bump next to v14.2.7 (#43558) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- docs/package.json | 2 +- packages/mui-docs/package.json | 2 +- packages/mui-joy/package.json | 2 +- packages/mui-material-nextjs/package.json | 2 +- pnpm-lock.yaml | 141 +--------------------- 5 files changed, 9 insertions(+), 140 deletions(-) diff --git a/docs/package.json b/docs/package.json index 8ab7d06196c576..84169eae804583 100644 --- a/docs/package.json +++ b/docs/package.json @@ -83,7 +83,7 @@ "lz-string": "^1.5.0", "markdown-to-jsx": "^7.4.7", "material-ui-popup-state": "^5.1.2", - "next": "^14.2.6", + "next": "^14.2.7", "notistack": "3.0.1", "nprogress": "^0.2.0", "postcss": "^8.4.41", diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 777d7abaebaa8a..8bfb14e12ea363 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -48,7 +48,7 @@ "@types/node": "^18.19.48", "@types/prop-types": "^15.7.12", "@types/react": "^18.3.4", - "next": "^14.2.6", + "next": "^14.2.7", "react": "^18.3.1" }, "peerDependencies": { diff --git a/packages/mui-joy/package.json b/packages/mui-joy/package.json index b5b85f8aedccc8..1d02f121833fb4 100644 --- a/packages/mui-joy/package.json +++ b/packages/mui-joy/package.json @@ -58,7 +58,7 @@ "chai": "^4.5.0", "fast-glob": "^3.3.2", "lodash": "^4.17.21", - "next": "^14.2.6", + "next": "^14.2.7", "react": "^18.3.1", "react-dom": "^18.3.1", "sinon": "^18.0.0" diff --git a/packages/mui-material-nextjs/package.json b/packages/mui-material-nextjs/package.json index 375e28ab8ecdd0..3238c58ac0379b 100644 --- a/packages/mui-material-nextjs/package.json +++ b/packages/mui-material-nextjs/package.json @@ -43,7 +43,7 @@ "@emotion/react": "^11.13.3", "@emotion/server": "^11.11.0", "@types/react": "^18.3.4", - "next": "14.2.6", + "next": "14.2.7", "react": "^18.3.1" }, "peerDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 38b881e15db700..0df8dbd113fc76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -737,7 +737,7 @@ importers: specifier: ^5.1.2 version: 5.1.2(@mui/material@packages+mui-material+build)(react@18.3.1) next: - specifier: ^14.2.6 + specifier: ^14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) notistack: specifier: 3.0.1 @@ -1461,7 +1461,7 @@ importers: specifier: ^18.3.4 version: 18.3.4 next: - specifier: ^14.2.6 + specifier: ^14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 @@ -1635,7 +1635,7 @@ importers: specifier: ^4.17.21 version: 4.17.21 next: - specifier: ^14.2.6 + specifier: ^14.2.7 version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 @@ -1842,8 +1842,8 @@ importers: specifier: ^18.3.4 version: 18.3.4 next: - specifier: 14.2.6 - version: 14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 14.2.7 + version: 14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: specifier: ^18.3.1 version: 18.3.1 @@ -4374,117 +4374,60 @@ packages: resolution: {integrity: sha512-2KYkyluThg1AKfd0JWI7FzpS4A/fzVVGYIf6AM4ydWyNj8eI/86GQVLeRgDoH7CNOxt243R5tutWlmHpVq0/Ew==} engines: {node: '>=18.0.0'} - '@next/env@14.2.6': - resolution: {integrity: sha512-bs5DFKV+08EjWrl8EB+KKqev1ZTNONH1vFCaHh911aaB362NnP32UDTbE9VQhyiAgbFqJsfDkSxFERNDDb3j0g==} - '@next/env@14.2.7': resolution: {integrity: sha512-OTx9y6I3xE/eih+qtthppwLytmpJVPM5PPoJxChFsbjIEFXIayG0h/xLzefHGJviAa3Q5+Fd+9uYojKkHDKxoQ==} '@next/eslint-plugin-next@14.2.7': resolution: {integrity: sha512-+7xh142AdhZGjY9/L0iFo7mqRBMJHe+q+uOL+hto1Lfo9DeWCGcR6no4StlFbVSVcA6fQLKEX6y6qhMsSKbgNQ==} - '@next/swc-darwin-arm64@14.2.6': - resolution: {integrity: sha512-BtJZb+hYXGaVJJivpnDoi3JFVn80SHKCiiRUW3kk1SY6UCUy5dWFFSbh+tGi5lHAughzeduMyxbLt3pspvXNSg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [darwin] - '@next/swc-darwin-arm64@14.2.7': resolution: {integrity: sha512-UhZGcOyI9LE/tZL3h9rs/2wMZaaJKwnpAyegUVDGZqwsla6hMfeSj9ssBWQS9yA4UXun3pPhrFLVnw5KXZs3vw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@next/swc-darwin-x64@14.2.6': - resolution: {integrity: sha512-ZHRbGpH6KHarzm6qEeXKSElSXh8dS2DtDPjQt3IMwY8QVk7GbdDYjvV4NgSnDA9huGpGgnyy3tH8i5yHCqVkiQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [darwin] - '@next/swc-darwin-x64@14.2.7': resolution: {integrity: sha512-ys2cUgZYRc+CbyDeLAaAdZgS7N1Kpyy+wo0b/gAj+SeOeaj0Lw/q+G1hp+DuDiDAVyxLBCJXEY/AkhDmtihUTA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@next/swc-linux-arm64-gnu@14.2.6': - resolution: {integrity: sha512-O4HqUEe3ZvKshXHcDUXn1OybN4cSZg7ZdwHJMGCXSUEVUqGTJVsOh17smqilIjooP/sIJksgl+1kcf2IWMZWHg==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@next/swc-linux-arm64-gnu@14.2.7': resolution: {integrity: sha512-2xoWtE13sUJ3qrC1lwE/HjbDPm+kBQYFkkiVECJWctRASAHQ+NwjMzgrfqqMYHfMxFb5Wws3w9PqzZJqKFdWcQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@next/swc-linux-arm64-musl@14.2.6': - resolution: {integrity: sha512-xUcdhr2hfalG8RDDGSFxQ75yOG894UlmFS4K2M0jLrUhauRBGOtUOxoDVwiIIuZQwZ3Y5hDsazNjdYGB0cQ9yQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [linux] - '@next/swc-linux-arm64-musl@14.2.7': resolution: {integrity: sha512-+zJ1gJdl35BSAGpkCbfyiY6iRTaPrt3KTl4SF/B1NyELkqqnrNX6cp4IjjjxKpd64/7enI0kf6b9O1Uf3cL0pw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@next/swc-linux-x64-gnu@14.2.6': - resolution: {integrity: sha512-InosKxw8UMcA/wEib5n2QttwHSKHZHNSbGcMepBM0CTcNwpxWzX32KETmwbhKod3zrS8n1vJ+DuJKbL9ZAB0Ag==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@next/swc-linux-x64-gnu@14.2.7': resolution: {integrity: sha512-m6EBqrskeMUzykBrv0fDX/28lWIBGhMzOYaStp0ihkjzIYJiKUOzVYD1gULHc8XDf5EMSqoH/0/TRAgXqpQwmw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@next/swc-linux-x64-musl@14.2.6': - resolution: {integrity: sha512-d4QXfJmt5pGJ7cG8qwxKSBnO5AXuKAFYxV7qyDRHnUNvY/dgDh+oX292gATpB2AAHgjdHd5ks1wXxIEj6muLUQ==} - engines: {node: '>= 10'} - cpu: [x64] - os: [linux] - '@next/swc-linux-x64-musl@14.2.7': resolution: {integrity: sha512-gUu0viOMvMlzFRz1r1eQ7Ql4OE+hPOmA7smfZAhn8vC4+0swMZaZxa9CSIozTYavi+bJNDZ3tgiSdMjmMzRJlQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@next/swc-win32-arm64-msvc@14.2.6': - resolution: {integrity: sha512-AlgIhk4/G+PzOG1qdF1b05uKTMsuRatFlFzAi5G8RZ9h67CVSSuZSbqGHbJDlcV1tZPxq/d4G0q6qcHDKWf4aQ==} - engines: {node: '>= 10'} - cpu: [arm64] - os: [win32] - '@next/swc-win32-arm64-msvc@14.2.7': resolution: {integrity: sha512-PGbONHIVIuzWlYmLvuFKcj+8jXnLbx4WrlESYlVnEzDsa3+Q2hI1YHoXaSmbq0k4ZwZ7J6sWNV4UZfx1OeOlbQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@next/swc-win32-ia32-msvc@14.2.6': - resolution: {integrity: sha512-hNukAxq7hu4o5/UjPp5jqoBEtrpCbOmnUqZSKNJG8GrUVzfq0ucdhQFVrHcLRMvQcwqqDh1a5AJN9ORnNDpgBQ==} - engines: {node: '>= 10'} - cpu: [ia32] - os: [win32] - '@next/swc-win32-ia32-msvc@14.2.7': resolution: {integrity: sha512-BiSY5umlx9ed5RQDoHcdbuKTUkuFORDqzYKPHlLeS+STUWQKWziVOn3Ic41LuTBvqE0TRJPKpio9GSIblNR+0w==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@next/swc-win32-x64-msvc@14.2.6': - resolution: {integrity: sha512-NANtw+ead1rSDK1jxmzq3TYkl03UNK2KHqUYf1nIhNci6NkeqBD4s1njSzYGIlSHxCK+wSaL8RXZm4v+NF/pMw==} - engines: {node: '>= 10'} - cpu: [x64] - os: [win32] - '@next/swc-win32-x64-msvc@14.2.7': resolution: {integrity: sha512-pxsI23gKWRt/SPHFkDEsP+w+Nd7gK37Hpv0ngc5HpWy2e7cKx9zR/+Q2ptAUqICNTecAaGWvmhway7pj/JLEWA==} engines: {node: '>= 10'} @@ -9697,24 +9640,6 @@ packages: nested-error-stacks@2.1.1: resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==} - next@14.2.6: - resolution: {integrity: sha512-57Su7RqXs5CBKKKOagt8gPhMM3CpjgbeQhrtei2KLAA1vTNm7jfKS+uDARkSW8ZETUflDCBIsUKGSyQdRs4U4g==} - engines: {node: '>=18.17.0'} - hasBin: true - peerDependencies: - '@opentelemetry/api': ^1.1.0 - '@playwright/test': ^1.41.2 - react: ^18.2.0 - react-dom: ^18.2.0 - sass: ^1.3.0 - peerDependenciesMeta: - '@opentelemetry/api': - optional: true - '@playwright/test': - optional: true - sass: - optional: true - next@14.2.7: resolution: {integrity: sha512-4Qy2aK0LwH4eQiSvQWyKuC7JXE13bIopEQesWE0c/P3uuNRnZCQanI0vsrMLmUQJLAto+A+/8+sve2hd+BQuOQ==} engines: {node: '>=18.17.0'} @@ -15014,65 +14939,36 @@ snapshots: '@netlify/node-cookies': 0.1.0 urlpattern-polyfill: 8.0.2 - '@next/env@14.2.6': {} - '@next/env@14.2.7': {} '@next/eslint-plugin-next@14.2.7': dependencies: glob: 10.3.10 - '@next/swc-darwin-arm64@14.2.6': - optional: true - '@next/swc-darwin-arm64@14.2.7': optional: true - '@next/swc-darwin-x64@14.2.6': - optional: true - '@next/swc-darwin-x64@14.2.7': optional: true - '@next/swc-linux-arm64-gnu@14.2.6': - optional: true - '@next/swc-linux-arm64-gnu@14.2.7': optional: true - '@next/swc-linux-arm64-musl@14.2.6': - optional: true - '@next/swc-linux-arm64-musl@14.2.7': optional: true - '@next/swc-linux-x64-gnu@14.2.6': - optional: true - '@next/swc-linux-x64-gnu@14.2.7': optional: true - '@next/swc-linux-x64-musl@14.2.6': - optional: true - '@next/swc-linux-x64-musl@14.2.7': optional: true - '@next/swc-win32-arm64-msvc@14.2.6': - optional: true - '@next/swc-win32-arm64-msvc@14.2.7': optional: true - '@next/swc-win32-ia32-msvc@14.2.6': - optional: true - '@next/swc-win32-ia32-msvc@14.2.7': optional: true - '@next/swc-win32-x64-msvc@14.2.6': - optional: true - '@next/swc-win32-x64-msvc@14.2.7': optional: true @@ -21774,33 +21670,6 @@ snapshots: nested-error-stacks@2.1.1: {} - next@14.2.6(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): - dependencies: - '@next/env': 14.2.6 - '@swc/helpers': 0.5.5 - busboy: 1.6.0 - caniuse-lite: 1.0.30001649 - graceful-fs: 4.2.11 - postcss: 8.4.31 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - styled-jsx: 5.1.1(@babel/core@7.25.2)(babel-plugin-macros@3.1.0)(react@18.3.1) - optionalDependencies: - '@next/swc-darwin-arm64': 14.2.6 - '@next/swc-darwin-x64': 14.2.6 - '@next/swc-linux-arm64-gnu': 14.2.6 - '@next/swc-linux-arm64-musl': 14.2.6 - '@next/swc-linux-x64-gnu': 14.2.6 - '@next/swc-linux-x64-musl': 14.2.6 - '@next/swc-win32-arm64-msvc': 14.2.6 - '@next/swc-win32-ia32-msvc': 14.2.6 - '@next/swc-win32-x64-msvc': 14.2.6 - '@opentelemetry/api': 1.8.0 - '@playwright/test': 1.46.1 - transitivePeerDependencies: - - '@babel/core' - - babel-plugin-macros - next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@next/env': 14.2.7 From 92a4aff75b2a67e545d576fe90d7181c89bdd7dc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 10:55:12 +0530 Subject: [PATCH 13/22] Bump nx to ^19.6.4 (#43559) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 118 ++++++++++++++++++++++++------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/package.json b/package.json index 1e8860019df6bd..85610b7b37bd63 100644 --- a/package.json +++ b/package.json @@ -173,7 +173,7 @@ "lodash": "^4.17.21", "markdownlint-cli2": "^0.13.0", "mocha": "^10.7.3", - "nx": "^19.6.3", + "nx": "^19.6.4", "nyc": "^17.0.0", "piscina": "^4.6.1", "postcss-styled-syntax": "^0.6.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0df8dbd113fc76..2a4d14975e420a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -273,8 +273,8 @@ importers: specifier: ^10.7.3 version: 10.7.3 nx: - specifier: ^19.6.3 - version: 19.6.3 + specifier: ^19.6.4 + version: 19.6.4 nyc: specifier: ^17.0.0 version: 17.0.0 @@ -4510,8 +4510,8 @@ packages: '@nrwl/devkit@17.2.8': resolution: {integrity: sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==} - '@nrwl/tao@19.6.3': - resolution: {integrity: sha512-j4vPU87yBhTrdyPFSNhlUkN29w4BQ+M14khT8PFGe+Y26gHMxNRNXNFUCwtVARYAc6IwxS8Uvlwy7AwXG2ETPA==} + '@nrwl/tao@19.6.4': + resolution: {integrity: sha512-1J8cD+MFzsmboiGe03VlQZ8gt64k/TaYYPZivnnhOJolPPs75nz1JyJX55uWcKKRy/b7FZNKWIu/6Wp9JDhJrQ==} hasBin: true '@nx/devkit@17.2.8': @@ -4519,62 +4519,62 @@ packages: peerDependencies: nx: '>= 16 <= 18' - '@nx/nx-darwin-arm64@19.6.3': - resolution: {integrity: sha512-P7WlX5YDZOABAlyfpR6eObigQTNuUuy3iJVUuGwp1Nuo3VPMPkpK1GMWKWLwOR9+2jGnF5MzuqWHk7CdF33uqQ==} + '@nx/nx-darwin-arm64@19.6.4': + resolution: {integrity: sha512-kRn2FLvhwJA/TJrNlsCSqqQTrguNZLmiRsiXhvjkfUMbUKwyQfVMgJlvkZ+KoqraUSG+Qyb0FmrGur1I/Mld0Q==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@nx/nx-darwin-x64@19.6.3': - resolution: {integrity: sha512-HF28dPc7h0EmEGYJWJUPA3cBvjXyHbSbGQP5oP885gos9zcyVBjQ2kdJEUZDNMHB9KlZraeXbmV1umFkikjn6A==} + '@nx/nx-darwin-x64@19.6.4': + resolution: {integrity: sha512-3uABBUhxVk+SdRwpUu30iuBlgRWm3tA/G9seG+wt7oN2R+fOu8zzRCYa+Blvoh1Ef+D9743Ir4rDc9Mhzl2B2g==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@nx/nx-freebsd-x64@19.6.3': - resolution: {integrity: sha512-y52dWxQ/x2ccyPqA4Vou4CnTqZX4gr/wV9myJX56G1CyEpWasmcqmPFeOKQd6dj7llGM/KJ/4Gz29RYxcWffcA==} + '@nx/nx-freebsd-x64@19.6.4': + resolution: {integrity: sha512-OG83MiEk5L54/vAldmwZJBKEvZaM+DEIDqn2yZLTToBRj5Z9jwKJX3jKP60xbHiaT/hzsb1xPlwhOHJnYd80EQ==} engines: {node: '>= 10'} cpu: [x64] os: [freebsd] - '@nx/nx-linux-arm-gnueabihf@19.6.3': - resolution: {integrity: sha512-RneCg1tglLbP4cmGnGUs4FgZVT0aOA9wA53tO4IbyxLnlRXNY9OE452YLgqv3H7sLtNjsey2Lkq1seBHtr3p/Q==} + '@nx/nx-linux-arm-gnueabihf@19.6.4': + resolution: {integrity: sha512-hQ9x4qSKUh9mIVDuD270ULrBnmYfDTjXq7LnIwECw1AuP4LkKzKxULhsbqVnFQ/k3xxyFkwyGTIu2mfDcw16Gw==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@nx/nx-linux-arm64-gnu@19.6.3': - resolution: {integrity: sha512-Y+vgqaxrPQUEtCzxK25QY4ahO90l0eWgVrvCALexGmq0lW41JrVpfTTsbH/BAPLsx+u8A/GPAQAgrmg7d5lSxw==} + '@nx/nx-linux-arm64-gnu@19.6.4': + resolution: {integrity: sha512-OFKpAHiaVg3YGFIMBmi/JshciP9buwtOPiHDXcQdzQgE22jyYzKEiFxfcpG0nCT8PlMYAbHPAda15WfWkfVGVQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@nx/nx-linux-arm64-musl@19.6.3': - resolution: {integrity: sha512-o/99DBgafbjiJ4e9KFxaldvtlZta/FdzEiQQW+SQQ0JGSYlLCZZ8tIT6t3edV7cmG+gQLNMwolJzgpY53O9wjA==} + '@nx/nx-linux-arm64-musl@19.6.4': + resolution: {integrity: sha512-ZIR9u+mN0A7SmNd6vDxmPV1QVTgYPTdfBSM5TEnKl3q2fHw2Nkui81QBxA4d7VopJoJUz/pRHiUV+dlgEEZ6nA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@nx/nx-linux-x64-gnu@19.6.3': - resolution: {integrity: sha512-ppp0NBOhwJ39U1vR7h8jhFSfiur6CZPSUYjXsV44BlaNGc1wHZ+7FDXhzOTokgTNWHavYgYOJuVan5LtTLKJkA==} + '@nx/nx-linux-x64-gnu@19.6.4': + resolution: {integrity: sha512-AUMPvLs9KeCUuWD5DdlpbP3VfVsiD0IlptS2b3ul336rsQ7LwwdvE7jTVO5CixFOsiRZxP72fKJhaEargMn5Aw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@nx/nx-linux-x64-musl@19.6.3': - resolution: {integrity: sha512-H7xgsT5OTtVYCXjXBLZu28v+rIInhbUggrgVJ2iQJFGBT2A2qmvGmDJdcDz8+K90ku1f4VuWmm8i+TEyDEcBuQ==} + '@nx/nx-linux-x64-musl@19.6.4': + resolution: {integrity: sha512-PU7AaBlrgnJnDxTiV/PNCu0pHUCzaogm6uNcbzCyFJLGn7DoQK9rkqUMPJjb3CnJkAj9XrrhuZwmOdbrhvHAvA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@nx/nx-win32-arm64-msvc@19.6.3': - resolution: {integrity: sha512-o9O6lSmx67zUnqOtlDC4YpC++fiUkixgIsQEG8J/2jdNgAATqOtERcqCNra/uke/Q94Vht2tVXjXF3uj92APhw==} + '@nx/nx-win32-arm64-msvc@19.6.4': + resolution: {integrity: sha512-6CCmGWwH/J2k+Uxeci48w4QVhtcQ3hRZ5Z2jh26HI8YzH4wqZyA7QPgLBE6sNCPVLoGW5cBgTsfnyEdr+xarQA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@nx/nx-win32-x64-msvc@19.6.3': - resolution: {integrity: sha512-6NQhc7jYQ/sqPt5fDy8C+br73kTd5jhb8ZkPtEy2Amr1aA1K9SAxZAYfyvxLHS2z1nBEelNFgXe6HBmDX92FkA==} + '@nx/nx-win32-x64-msvc@19.6.4': + resolution: {integrity: sha512-jTNrlaFaKtbL2mYOcfPAiljtpF5CI7vbHIqYqBFYLUQXOwW9lOHlO+SeQnft6JYZs0FIr1IdHaCfdOw/hpnCiQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] @@ -9815,8 +9815,8 @@ packages: nwsapi@2.2.7: resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} - nx@19.6.3: - resolution: {integrity: sha512-JbgrEKaIBvTfhw3mG3GeyyzJHBAMfuQkMNrxxIto1fn94gxdjXdMfqUnAzrW6xRAt5OEEU+rf7v2OA3vEXYc3A==} + nx@19.6.4: + resolution: {integrity: sha512-yudYlBd3cMchRd8c0ZNan1SfT19AYK2zYOp77XVqVVwgqb6rJVxz6StFGFluUQ7Q7uSpkeT/8PsjwPVLt85EoQ==} hasBin: true peerDependencies: '@swc-node/register': ^1.8.0 @@ -14452,7 +14452,7 @@ snapshots: '@npmcli/arborist': 7.5.4 '@npmcli/package-json': 5.2.0 '@npmcli/run-script': 8.1.0 - '@nx/devkit': 17.2.8(nx@19.6.3) + '@nx/devkit': 17.2.8(nx@19.6.4) '@octokit/plugin-enterprise-rest': 6.0.1 '@octokit/rest': 19.0.11(encoding@0.1.13) aproba: 2.0.0 @@ -14491,7 +14491,7 @@ snapshots: npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-registry-fetch: 17.1.0 - nx: 19.6.3 + nx: 19.6.4 p-map: 4.0.0 p-map-series: 2.1.0 p-queue: 6.6.2 @@ -15116,60 +15116,60 @@ snapshots: - bluebird - supports-color - '@nrwl/devkit@17.2.8(nx@19.6.3)': + '@nrwl/devkit@17.2.8(nx@19.6.4)': dependencies: - '@nx/devkit': 17.2.8(nx@19.6.3) + '@nx/devkit': 17.2.8(nx@19.6.4) transitivePeerDependencies: - nx - '@nrwl/tao@19.6.3': + '@nrwl/tao@19.6.4': dependencies: - nx: 19.6.3 + nx: 19.6.4 tslib: 2.6.2 transitivePeerDependencies: - '@swc-node/register' - '@swc/core' - debug - '@nx/devkit@17.2.8(nx@19.6.3)': + '@nx/devkit@17.2.8(nx@19.6.4)': dependencies: - '@nrwl/devkit': 17.2.8(nx@19.6.3) + '@nrwl/devkit': 17.2.8(nx@19.6.4) ejs: 3.1.8 enquirer: 2.3.6 ignore: 5.3.1 - nx: 19.6.3 + nx: 19.6.4 semver: 7.5.3 tmp: 0.2.3 tslib: 2.6.2 - '@nx/nx-darwin-arm64@19.6.3': + '@nx/nx-darwin-arm64@19.6.4': optional: true - '@nx/nx-darwin-x64@19.6.3': + '@nx/nx-darwin-x64@19.6.4': optional: true - '@nx/nx-freebsd-x64@19.6.3': + '@nx/nx-freebsd-x64@19.6.4': optional: true - '@nx/nx-linux-arm-gnueabihf@19.6.3': + '@nx/nx-linux-arm-gnueabihf@19.6.4': optional: true - '@nx/nx-linux-arm64-gnu@19.6.3': + '@nx/nx-linux-arm64-gnu@19.6.4': optional: true - '@nx/nx-linux-arm64-musl@19.6.3': + '@nx/nx-linux-arm64-musl@19.6.4': optional: true - '@nx/nx-linux-x64-gnu@19.6.3': + '@nx/nx-linux-x64-gnu@19.6.4': optional: true - '@nx/nx-linux-x64-musl@19.6.3': + '@nx/nx-linux-x64-musl@19.6.4': optional: true - '@nx/nx-win32-arm64-msvc@19.6.3': + '@nx/nx-win32-arm64-msvc@19.6.4': optional: true - '@nx/nx-win32-x64-msvc@19.6.3': + '@nx/nx-win32-x64-msvc@19.6.4': optional: true '@octokit/auth-token@2.5.0': @@ -20830,7 +20830,7 @@ snapshots: '@npmcli/arborist': 7.5.4 '@npmcli/package-json': 5.2.0 '@npmcli/run-script': 8.1.0 - '@nx/devkit': 17.2.8(nx@19.6.3) + '@nx/devkit': 17.2.8(nx@19.6.4) '@octokit/plugin-enterprise-rest': 6.0.1 '@octokit/rest': 19.0.11(encoding@0.1.13) aproba: 2.0.0 @@ -20875,7 +20875,7 @@ snapshots: npm-package-arg: 11.0.2 npm-packlist: 8.0.2 npm-registry-fetch: 17.1.0 - nx: 19.6.3 + nx: 19.6.4 p-map: 4.0.0 p-map-series: 2.1.0 p-pipe: 3.1.0 @@ -21876,10 +21876,10 @@ snapshots: nwsapi@2.2.7: {} - nx@19.6.3: + nx@19.6.4: dependencies: '@napi-rs/wasm-runtime': 0.2.4 - '@nrwl/tao': 19.6.3 + '@nrwl/tao': 19.6.4 '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.7 @@ -21914,16 +21914,16 @@ snapshots: yargs: 17.7.2 yargs-parser: 21.1.1 optionalDependencies: - '@nx/nx-darwin-arm64': 19.6.3 - '@nx/nx-darwin-x64': 19.6.3 - '@nx/nx-freebsd-x64': 19.6.3 - '@nx/nx-linux-arm-gnueabihf': 19.6.3 - '@nx/nx-linux-arm64-gnu': 19.6.3 - '@nx/nx-linux-arm64-musl': 19.6.3 - '@nx/nx-linux-x64-gnu': 19.6.3 - '@nx/nx-linux-x64-musl': 19.6.3 - '@nx/nx-win32-arm64-msvc': 19.6.3 - '@nx/nx-win32-x64-msvc': 19.6.3 + '@nx/nx-darwin-arm64': 19.6.4 + '@nx/nx-darwin-x64': 19.6.4 + '@nx/nx-freebsd-x64': 19.6.4 + '@nx/nx-linux-arm-gnueabihf': 19.6.4 + '@nx/nx-linux-arm64-gnu': 19.6.4 + '@nx/nx-linux-arm64-musl': 19.6.4 + '@nx/nx-linux-x64-gnu': 19.6.4 + '@nx/nx-linux-x64-musl': 19.6.4 + '@nx/nx-win32-arm64-msvc': 19.6.4 + '@nx/nx-win32-x64-msvc': 19.6.4 transitivePeerDependencies: - debug From a889d9b41901d6cc408888b014673a265e1b115d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 11:02:30 +0530 Subject: [PATCH 14/22] Bump postcss to ^8.4.44 (#43560) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- apps/pigment-css-vite-app/package.json | 2 +- docs/package.json | 2 +- packages/mui-codemod/package.json | 2 +- pnpm-lock.yaml | 90 +++++++++++++------------- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json index 10563dc07f9ae8..92702773bbdf21 100644 --- a/apps/pigment-css-vite-app/package.json +++ b/apps/pigment-css-vite-app/package.json @@ -29,7 +29,7 @@ "@types/react": "^18.3.4", "@types/react-dom": "^18.3.0", "@vitejs/plugin-react": "^4.3.1", - "postcss": "^8.4.41", + "postcss": "^8.4.44", "postcss-combine-media-query": "^1.0.1", "vite": "5.4.2", "vite-plugin-pages": "^0.32.3" diff --git a/docs/package.json b/docs/package.json index 84169eae804583..f25eede42e2087 100644 --- a/docs/package.json +++ b/docs/package.json @@ -86,7 +86,7 @@ "next": "^14.2.7", "notistack": "3.0.1", "nprogress": "^0.2.0", - "postcss": "^8.4.41", + "postcss": "^8.4.44", "postcss-import": "^16.1.0", "prop-types": "^15.8.1", "react": "^18.3.1", diff --git a/packages/mui-codemod/package.json b/packages/mui-codemod/package.json index 02d10664013fd9..de716d93c7fa59 100644 --- a/packages/mui-codemod/package.json +++ b/packages/mui-codemod/package.json @@ -35,7 +35,7 @@ "@babel/traverse": "^7.25.3", "jscodeshift": "^0.16.1", "jscodeshift-add-imports": "^1.0.11", - "postcss": "^8.4.41", + "postcss": "^8.4.44", "postcss-cli": "^11.0.0", "yargs": "^17.7.2" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a4d14975e420a..bcd7e396642acd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -283,7 +283,7 @@ importers: version: 4.6.1 postcss-styled-syntax: specifier: ^0.6.4 - version: 0.6.4(postcss@8.4.41) + version: 0.6.4(postcss@8.4.44) prettier: specifier: ^3.3.3 version: 3.3.3 @@ -446,8 +446,8 @@ importers: specifier: ^4.3.1 version: 4.3.1(vite@5.4.2(@types/node@18.19.48)(terser@5.29.2)) postcss: - specifier: ^8.4.41 - version: 8.4.41 + specifier: ^8.4.44 + version: 8.4.44 postcss-combine-media-query: specifier: ^1.0.1 version: 1.0.1 @@ -654,7 +654,7 @@ importers: version: 0.5.2(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/node@18.19.48)(@types/react@18.3.4)(happy-dom@12.10.3)(jsdom@24.0.0)(next@14.2.7(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.46.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)(terser@5.29.2) autoprefixer: specifier: ^10.4.20 - version: 10.4.20(postcss@8.4.41) + version: 10.4.20(postcss@8.4.44) autosuggest-highlight: specifier: ^3.3.4 version: 3.3.4 @@ -746,11 +746,11 @@ importers: specifier: ^0.2.0 version: 0.2.0 postcss: - specifier: ^8.4.41 - version: 8.4.41 + specifier: ^8.4.44 + version: 8.4.44 postcss-import: specifier: ^16.1.0 - version: 16.1.0(postcss@8.4.41) + version: 16.1.0(postcss@8.4.44) prop-types: specifier: ^15.8.1 version: 15.8.1 @@ -1386,11 +1386,11 @@ importers: specifier: ^1.0.11 version: 1.0.11(jscodeshift@0.16.1(@babel/preset-env@7.25.3(@babel/core@7.25.2))) postcss: - specifier: ^8.4.41 - version: 8.4.41 + specifier: ^8.4.44 + version: 8.4.44 postcss-cli: specifier: ^11.0.0 - version: 11.0.0(jiti@1.21.0)(postcss@8.4.41)(tsx@4.17.0) + version: 11.0.0(jiti@1.21.0)(postcss@8.4.44)(tsx@4.17.0) yargs: specifier: ^17.7.2 version: 17.7.2 @@ -10395,8 +10395,8 @@ packages: resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} engines: {node: ^10 || ^12 || >=14} - postcss@8.4.41: - resolution: {integrity: sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==} + postcss@8.4.44: + resolution: {integrity: sha512-Aweb9unOEpQ3ezu4Q00DPvvM2ZTUitJdNKeP/+uQgr1IBIqu574IaZoURId7BKtWMREwzKa9OgzPzezWGPWFQw==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -17152,14 +17152,14 @@ snapshots: asynckit@0.4.0: {} - autoprefixer@10.4.20(postcss@8.4.41): + autoprefixer@10.4.20(postcss@8.4.44): dependencies: browserslist: 4.23.3 caniuse-lite: 1.0.30001649 fraction.js: 4.3.7 normalize-range: 0.1.2 picocolors: 1.0.1 - postcss: 8.4.41 + postcss: 8.4.44 postcss-value-parser: 4.2.0 autosuggest-highlight@3.3.4: @@ -22418,7 +22418,7 @@ snapshots: possible-typed-array-names@1.0.0: {} - postcss-cli@11.0.0(jiti@1.21.0)(postcss@8.4.41)(tsx@4.17.0): + postcss-cli@11.0.0(jiti@1.21.0)(postcss@8.4.44)(tsx@4.17.0): dependencies: chokidar: 3.6.0 dependency-graph: 0.11.0 @@ -22426,9 +22426,9 @@ snapshots: get-stdin: 9.0.0 globby: 14.0.2 picocolors: 1.0.1 - postcss: 8.4.41 - postcss-load-config: 5.1.0(jiti@1.21.0)(postcss@8.4.41)(tsx@4.17.0) - postcss-reporter: 7.1.0(postcss@8.4.41) + postcss: 8.4.44 + postcss-load-config: 5.1.0(jiti@1.21.0)(postcss@8.4.44)(tsx@4.17.0) + postcss-reporter: 7.1.0(postcss@8.4.44) pretty-hrtime: 1.0.3 read-cache: 1.0.0 slash: 5.1.0 @@ -22441,66 +22441,66 @@ snapshots: dependencies: postcss: 7.0.39 - postcss-import@15.1.0(postcss@8.4.41): + postcss-import@15.1.0(postcss@8.4.44): dependencies: - postcss: 8.4.41 + postcss: 8.4.44 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 - postcss-import@16.1.0(postcss@8.4.41): + postcss-import@16.1.0(postcss@8.4.44): dependencies: - postcss: 8.4.41 + postcss: 8.4.44 postcss-value-parser: 4.2.0 read-cache: 1.0.0 resolve: 1.22.8 - postcss-js@4.0.1(postcss@8.4.41): + postcss-js@4.0.1(postcss@8.4.44): dependencies: camelcase-css: 2.0.1 - postcss: 8.4.41 + postcss: 8.4.44 - postcss-load-config@4.0.1(postcss@8.4.41): + postcss-load-config@4.0.1(postcss@8.4.44): dependencies: lilconfig: 2.1.0 yaml: 2.5.0 optionalDependencies: - postcss: 8.4.41 + postcss: 8.4.44 - postcss-load-config@5.1.0(jiti@1.21.0)(postcss@8.4.41)(tsx@4.17.0): + postcss-load-config@5.1.0(jiti@1.21.0)(postcss@8.4.44)(tsx@4.17.0): dependencies: lilconfig: 3.1.1 yaml: 2.5.0 optionalDependencies: jiti: 1.21.0 - postcss: 8.4.41 + postcss: 8.4.44 tsx: 4.17.0 - postcss-nested@6.0.1(postcss@8.4.41): + postcss-nested@6.0.1(postcss@8.4.44): dependencies: - postcss: 8.4.41 + postcss: 8.4.44 postcss-selector-parser: 6.0.13 - postcss-reporter@7.1.0(postcss@8.4.41): + postcss-reporter@7.1.0(postcss@8.4.44): dependencies: picocolors: 1.0.1 - postcss: 8.4.41 + postcss: 8.4.44 thenby: 1.3.4 postcss-resolve-nested-selector@0.1.1: {} - postcss-safe-parser@6.0.0(postcss@8.4.41): + postcss-safe-parser@6.0.0(postcss@8.4.44): dependencies: - postcss: 8.4.41 + postcss: 8.4.44 postcss-selector-parser@6.0.13: dependencies: cssesc: 3.0.0 util-deprecate: 1.0.2 - postcss-styled-syntax@0.6.4(postcss@8.4.41): + postcss-styled-syntax@0.6.4(postcss@8.4.44): dependencies: - postcss: 8.4.41 + postcss: 8.4.44 typescript: 5.5.4 postcss-value-parser@4.2.0: {} @@ -22522,7 +22522,7 @@ snapshots: picocolors: 1.0.1 source-map-js: 1.2.0 - postcss@8.4.41: + postcss@8.4.44: dependencies: nanoid: 3.3.7 picocolors: 1.0.1 @@ -23972,9 +23972,9 @@ snapshots: micromatch: 4.0.7 normalize-path: 3.0.0 picocolors: 1.0.1 - postcss: 8.4.41 + postcss: 8.4.44 postcss-resolve-nested-selector: 0.1.1 - postcss-safe-parser: 6.0.0(postcss@8.4.41) + postcss-safe-parser: 6.0.0(postcss@8.4.44) postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 resolve-from: 5.0.0 @@ -24091,11 +24091,11 @@ snapshots: normalize-path: 3.0.0 object-hash: 3.0.0 picocolors: 1.0.1 - postcss: 8.4.41 - postcss-import: 15.1.0(postcss@8.4.41) - postcss-js: 4.0.1(postcss@8.4.41) - postcss-load-config: 4.0.1(postcss@8.4.41) - postcss-nested: 6.0.1(postcss@8.4.41) + postcss: 8.4.44 + postcss-import: 15.1.0(postcss@8.4.44) + postcss-js: 4.0.1(postcss@8.4.44) + postcss-load-config: 4.0.1(postcss@8.4.44) + postcss-nested: 6.0.1(postcss@8.4.44) postcss-selector-parser: 6.0.13 resolve: 1.22.8 sucrase: 3.34.0 @@ -24639,7 +24639,7 @@ snapshots: vite@5.4.2(@types/node@18.19.48)(terser@5.29.2): dependencies: esbuild: 0.21.5 - postcss: 8.4.41 + postcss: 8.4.44 rollup: 4.21.1 optionalDependencies: '@types/node': 18.19.48 From f1d5fff12b6aab4c765f80c9996e7d45e6a75049 Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Tue, 3 Sep 2024 09:59:52 +0200 Subject: [PATCH 15/22] [code-infra] Add missing @babel/runtime dependency to @mui/material-pigment-css (#43473) Signed-off-by: Jan Potoms <2109932+Janpot@users.noreply.github.com> --- babel.config.js | 2 +- packages/mui-material-pigment-css/package.json | 1 + pnpm-lock.yaml | 3 +++ scripts/build.mjs | 12 ++++++++++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/babel.config.js b/babel.config.js index 45a7c55167cee9..c6910c0afa717e 100644 --- a/babel.config.js +++ b/babel.config.js @@ -93,7 +93,7 @@ module.exports = function getBabelConfig(api) { { useESModules, // any package needs to declare 7.25.0 as a runtime dependency. default is ^7.0.0 - version: '^7.25.0', + version: process.env.MUI_BABEL_RUNTIME_VERSION || '^7.25.0', }, ], [ diff --git a/packages/mui-material-pigment-css/package.json b/packages/mui-material-pigment-css/package.json index 49bdd34694303f..1aa26042cec276 100644 --- a/packages/mui-material-pigment-css/package.json +++ b/packages/mui-material-pigment-css/package.json @@ -39,6 +39,7 @@ "typescript:module-augmentation": "node scripts/testModuleAugmentation.js" }, "dependencies": { + "@babel/runtime": "^7.25.0", "@mui/system": "workspace:*", "@pigment-css/react": "0.0.21" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bcd7e396642acd..261cbc0ceac5c1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1851,6 +1851,9 @@ importers: packages/mui-material-pigment-css: dependencies: + '@babel/runtime': + specifier: ^7.25.0 + version: 7.25.0 '@mui/system': specifier: workspace:* version: link:../mui-system/build diff --git a/scripts/build.mjs b/scripts/build.mjs index 47c7b66ab13378..27054ee0ac17fe 100644 --- a/scripts/build.mjs +++ b/scripts/build.mjs @@ -3,6 +3,7 @@ import glob from 'fast-glob'; import path from 'path'; import { promisify } from 'util'; import yargs from 'yargs'; +import * as fs from 'fs/promises'; import { getVersionEnvVariables, getWorkspaceRoot } from './utils.mjs'; const exec = promisify(childProcess.exec); @@ -25,10 +26,21 @@ async function run(argv) { ); } + const packageJsonPath = path.resolve('./package.json'); + const packageJson = JSON.parse(await fs.readFile(packageJsonPath, { encoding: 'utf8' })); + + const babelRuntimeVersion = packageJson.dependencies['@babel/runtime']; + if (!babelRuntimeVersion) { + throw new Error( + 'package.json needs to have a dependency on `@babel/runtime` when building with `@babel/plugin-transform-runtime`.', + ); + } + const env = { NODE_ENV: 'production', BABEL_ENV: bundle, MUI_BUILD_VERBOSE: verbose, + MUI_BABEL_RUNTIME_VERSION: babelRuntimeVersion, ...(await getVersionEnvVariables()), }; From 7a60e40126566c29b2e4eaa5775bfffafa449f12 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Tue, 3 Sep 2024 11:26:43 +0200 Subject: [PATCH 16/22] [system] Fix composeClasses v6 behavior change (#43537) --- .../src/composeClasses/composeClasses.test.ts | 12 ++++++------ .../mui-utils/src/composeClasses/composeClasses.ts | 6 ++++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/packages/mui-utils/src/composeClasses/composeClasses.test.ts b/packages/mui-utils/src/composeClasses/composeClasses.test.ts index e6e351073ff3c8..310c217bf8414a 100644 --- a/packages/mui-utils/src/composeClasses/composeClasses.test.ts +++ b/packages/mui-utils/src/composeClasses/composeClasses.test.ts @@ -13,8 +13,8 @@ describe('composeClasses', () => { undefined, ), ).to.deep.equal({ - root: 'MuiTest-root MuiTest-standard ', - slot: 'MuiTest-slot ', + root: 'MuiTest-root MuiTest-standard', + slot: 'MuiTest-slot', }); }); @@ -32,8 +32,8 @@ describe('composeClasses', () => { }, ), ).to.deep.equal({ - root: 'MuiTest-root MuiTest-standard standardOverride ', - slot: 'MuiTest-slot slotOverride ', + root: 'MuiTest-root MuiTest-standard standardOverride', + slot: 'MuiTest-slot slotOverride', }); }); @@ -51,8 +51,8 @@ describe('composeClasses', () => { }, ), ).to.deep.equal({ - root: 'MuiTest-root MuiTest-standard standardOverride ', - slot: 'MuiTest-slot slotOverride ', + root: 'MuiTest-root MuiTest-standard standardOverride', + slot: 'MuiTest-slot slotOverride', }); }); }); diff --git a/packages/mui-utils/src/composeClasses/composeClasses.ts b/packages/mui-utils/src/composeClasses/composeClasses.ts index 2b8e91af5fb540..5b03c682a575f2 100644 --- a/packages/mui-utils/src/composeClasses/composeClasses.ts +++ b/packages/mui-utils/src/composeClasses/composeClasses.ts @@ -13,14 +13,16 @@ export default function composeClasses( for (const slotName in slots) { const slot = slots[slotName]; let buffer = ''; + let start = true; for (let i = 0; i < slot.length; i += 1) { const value = slot[i]; if (value) { - buffer += getUtilityClass(value) + ' '; + buffer += (start === true ? '' : ' ') + getUtilityClass(value); + start = false; if (classes && classes[value]) { - buffer += classes[value] + ' '; + buffer += ' ' + classes[value]; } } } From bb620d85a89651ca4350e8861bbb35776d583726 Mon Sep 17 00:00:00 2001 From: Brijesh Bittu Date: Tue, 3 Sep 2024 15:53:33 +0530 Subject: [PATCH 17/22] v6.0.2 (#43580) --- CHANGELOG.md | 49 +++++++++++++++++++ package.json | 2 +- packages-internal/scripts/package.json | 2 +- packages-internal/test-utils/package.json | 2 +- packages/markdown/package.json | 2 +- packages/mui-codemod/package.json | 2 +- .../mui-core-downloads-tracker/package.json | 2 +- packages/mui-docs/package.json | 2 +- packages/mui-envinfo/package.json | 2 +- packages/mui-icons-material/package.json | 2 +- packages/mui-lab/package.json | 2 +- packages/mui-material-nextjs/package.json | 2 +- .../mui-material-pigment-css/package.json | 2 +- packages/mui-material/package.json | 2 +- packages/mui-private-theming/package.json | 2 +- packages/mui-styled-engine-sc/package.json | 2 +- packages/mui-styled-engine/package.json | 2 +- packages/mui-styles/package.json | 2 +- packages/mui-system/package.json | 2 +- packages/mui-utils/package.json | 2 +- 20 files changed, 68 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b30b9b90746b1..c82275eefbbd4e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,54 @@ # [Versions](https://mui.com/versions/) +## 6.0.2 + + + +_Sep 3, 2024_ + +A big thanks to the 11 contributors who made this release possible. + +### `@mui/material@6.0.2` + +- ​Fix `createTheme` with just color schemes (#43518) @siriwatknp +- ​[Menu,Popover] Fix Backdrop props descriptions (#43503) @Michael-Hutchinson +- ​[MenuList] Do not react to an event with modifier key pressed (#43505) @MateuszGroth + +### `@mui/system@6.0.2` + +- ​[InitColorSchemeScript] Use `let/const` instead of `var` (#43468) @ishon19 +- ​Fix composeClasses v6 behavior change (#43537) @oliviertassinari + +### `@mui/codemod@6.0.2` + +- ​Skip `ListItemButton` import for unrelated files (#43532) @siriwatknp + +### Docs + +- ​[figma] Clarity state or Figma Plugin component export (#43543) @oliviertassinari +- ​[material-ui] Fix template shadow tokens (#43514) @zanivan +- ​Update version support range (#43565) @oliviertassinari +- ​Polish MaterialĀ UI Sync plugin code format @oliviertassinari + +### Core + +- ​[blog] Update MaterialĀ UI v6 blog post link to reflect correct section title (#43535) @Michael-Hutchinson +- ​[blog] Makes the v5 name change clearer @oliviertassinari +- ​[blog] Fix typo in MaterialĀ UI v6 blog post (#43502) @iamandrewluca +- ​[code-infra] Add missing @babel/runtime dependency to @mui/material-pigment-css (#43473) @Janpot +- ​[code-infra] Remove permissions in publish-canaries.yml (#43491) @oliviertassinari +- ​[core] Fix CodeQL scan (#43547) @oliviertassinari +- ​[core] Fix CHANGELOG `@mui/material@6.0.1` version (#43516) @DiegoAndai +- ​[docs-infra] Reduce description max-length (#43562) @oliviertassinari +- ​[docs-infra] Crash on invalid callout type (#43546) @oliviertassinari +- ​[docs-infra] Fix GitHub source link redirection (#43534) @oliviertassinari +- ​[infra] Fixed workflow file path (#43528) @michelengelen +- ​[typescript] Fix missing `Theme` generic (#43523) @siriwatknp +- ​[website] Match pricing label with page @oliviertassinari +- ​[website] Update Premium price and remove any mention to cap (#43466) @joserodolfofreitas + +All contributors of this release in alphabetical order: @DiegoAndai, @iamandrewluca, @ishon19, @Janpot, @joserodolfofreitas, @MateuszGroth, @Michael-Hutchinson, @michelengelen, @oliviertassinari, @siriwatknp, @zanivan + ## v6.0.1 diff --git a/package.json b/package.json index 85610b7b37bd63..9e9d3cb28c11cc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mui/monorepo", - "version": "6.0.1", + "version": "6.0.2", "private": true, "scripts": { "preinstall": "npx only-allow pnpm", diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json index c253360cc1c3be..cc86caffdd447a 100644 --- a/packages-internal/scripts/package.json +++ b/packages-internal/scripts/package.json @@ -1,6 +1,6 @@ { "name": "@mui/internal-scripts", - "version": "1.0.18", + "version": "1.0.19", "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", diff --git a/packages-internal/test-utils/package.json b/packages-internal/test-utils/package.json index 89b956beb2a9e5..9bb2b23a0802f1 100644 --- a/packages-internal/test-utils/package.json +++ b/packages-internal/test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@mui/internal-test-utils", - "version": "1.0.11", + "version": "1.0.12", "author": "MUI Team", "description": "Utilities for MUI tests. This is an internal package not meant for general use.", "main": "./build/index.js", diff --git a/packages/markdown/package.json b/packages/markdown/package.json index fc72e973132ee7..eec5bccf119cf5 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -1,6 +1,6 @@ { "name": "@mui/internal-markdown", - "version": "1.0.11", + "version": "1.0.12", "author": "MUI Team", "description": "MUI markdown parser. This is an internal package not meant for general use.", "main": "./index.js", diff --git a/packages/mui-codemod/package.json b/packages/mui-codemod/package.json index de716d93c7fa59..c5716147bc9353 100644 --- a/packages/mui-codemod/package.json +++ b/packages/mui-codemod/package.json @@ -1,6 +1,6 @@ { "name": "@mui/codemod", - "version": "6.0.1", + "version": "6.0.2", "bin": "./codemod.js", "private": false, "author": "MUI Team", diff --git a/packages/mui-core-downloads-tracker/package.json b/packages/mui-core-downloads-tracker/package.json index d3f6ac2eee4f53..6b5c86862d1296 100644 --- a/packages/mui-core-downloads-tracker/package.json +++ b/packages/mui-core-downloads-tracker/package.json @@ -1,6 +1,6 @@ { "name": "@mui/core-downloads-tracker", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Internal package to track number of downloads of our design system libraries", diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json index 8bfb14e12ea363..11945e0fb8d2ac 100644 --- a/packages/mui-docs/package.json +++ b/packages/mui-docs/package.json @@ -1,6 +1,6 @@ { "name": "@mui/docs", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "MUI Docs - Documentation building blocks.", diff --git a/packages/mui-envinfo/package.json b/packages/mui-envinfo/package.json index 8e57457ea15689..eed6f3ecd54dde 100644 --- a/packages/mui-envinfo/package.json +++ b/packages/mui-envinfo/package.json @@ -1,6 +1,6 @@ { "name": "@mui/envinfo", - "version": "2.0.24", + "version": "2.0.25", "private": false, "author": "MUI Team", "description": "Logs infos about the environment relevant to @mui/*", diff --git a/packages/mui-icons-material/package.json b/packages/mui-icons-material/package.json index 79233dcb770e7c..c41265b5d3145c 100644 --- a/packages/mui-icons-material/package.json +++ b/packages/mui-icons-material/package.json @@ -1,6 +1,6 @@ { "name": "@mui/icons-material", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Material Design icons distributed as SVG React components.", diff --git a/packages/mui-lab/package.json b/packages/mui-lab/package.json index ea74a325f561e8..ee8cfed15c0059 100644 --- a/packages/mui-lab/package.json +++ b/packages/mui-lab/package.json @@ -1,6 +1,6 @@ { "name": "@mui/lab", - "version": "6.0.0-beta.8", + "version": "6.0.0-beta.9", "private": false, "author": "MUI Team", "description": "Laboratory for new MUI modules.", diff --git a/packages/mui-material-nextjs/package.json b/packages/mui-material-nextjs/package.json index 3238c58ac0379b..334e14d91f7775 100644 --- a/packages/mui-material-nextjs/package.json +++ b/packages/mui-material-nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@mui/material-nextjs", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Collection of utilities for integration between Material UI and Next.js.", diff --git a/packages/mui-material-pigment-css/package.json b/packages/mui-material-pigment-css/package.json index 1aa26042cec276..fe9bc4a8a03514 100644 --- a/packages/mui-material-pigment-css/package.json +++ b/packages/mui-material-pigment-css/package.json @@ -1,6 +1,6 @@ { "name": "@mui/material-pigment-css", - "version": "6.0.1", + "version": "6.0.2", "author": "MUI Team", "description": "A wrapper over Pigment CSS that provides the same styled and theming APIs as Material UI.", "main": "./src/index.ts", diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json index 84cb6aa9d3f709..e566ee645c0e38 100644 --- a/packages/mui-material/package.json +++ b/packages/mui-material/package.json @@ -1,6 +1,6 @@ { "name": "@mui/material", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Material UI is an open-source React component library that implements Google's Material Design. It's comprehensive and can be used in production out of the box.", diff --git a/packages/mui-private-theming/package.json b/packages/mui-private-theming/package.json index 60ddba436f51cc..baf4b6f7948b97 100644 --- a/packages/mui-private-theming/package.json +++ b/packages/mui-private-theming/package.json @@ -1,6 +1,6 @@ { "name": "@mui/private-theming", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Private - The React theme context to be shared between `@mui/styles` and `@mui/material`.", diff --git a/packages/mui-styled-engine-sc/package.json b/packages/mui-styled-engine-sc/package.json index 165e0065e03c15..0a1ba0f0b5bd0b 100644 --- a/packages/mui-styled-engine-sc/package.json +++ b/packages/mui-styled-engine-sc/package.json @@ -1,6 +1,6 @@ { "name": "@mui/styled-engine-sc", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "styled() API wrapper package for styled-components.", diff --git a/packages/mui-styled-engine/package.json b/packages/mui-styled-engine/package.json index cdf05b38a5b89a..514a360f88dd97 100644 --- a/packages/mui-styled-engine/package.json +++ b/packages/mui-styled-engine/package.json @@ -1,6 +1,6 @@ { "name": "@mui/styled-engine", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "styled() API wrapper package for emotion.", diff --git a/packages/mui-styles/package.json b/packages/mui-styles/package.json index 055217d89e534a..528151d537a367 100644 --- a/packages/mui-styles/package.json +++ b/packages/mui-styles/package.json @@ -1,6 +1,6 @@ { "name": "@mui/styles", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "MUI Styles - The legacy JSS-based styling solution of Material UI.", diff --git a/packages/mui-system/package.json b/packages/mui-system/package.json index ef4cde65072b65..a6b82cc07d9a12 100644 --- a/packages/mui-system/package.json +++ b/packages/mui-system/package.json @@ -1,6 +1,6 @@ { "name": "@mui/system", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "MUI System is a set of CSS utilities to help you build custom designs more efficiently. It makes it possible to rapidly lay out custom designs.", diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json index 0a77ab17f44e30..c78d4c4782dbdc 100644 --- a/packages/mui-utils/package.json +++ b/packages/mui-utils/package.json @@ -1,6 +1,6 @@ { "name": "@mui/utils", - "version": "6.0.1", + "version": "6.0.2", "private": false, "author": "MUI Team", "description": "Utility functions for React components.", From 715942dcdac5415938b44199c3aef2f69e832d4c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Sep 2024 15:51:27 +0300 Subject: [PATCH 18/22] [docs] Remove explicit `date-fns` dependency (#40823) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lukas --- docs/package.json | 2 -- .../components/productX/XDateRangeDemo.tsx | 30 +++++++++---------- docs/src/components/productX/XHero.tsx | 13 ++++---- .../components/showcase/ThemeDatePicker.tsx | 4 +-- pnpm-lock.yaml | 24 ++++----------- 5 files changed, 29 insertions(+), 44 deletions(-) diff --git a/docs/package.json b/docs/package.json index f25eede42e2087..d998afc2d8fee1 100644 --- a/docs/package.json +++ b/docs/package.json @@ -67,8 +67,6 @@ "core-js": "^2.6.11", "cross-env": "^7.0.3", "css-mediaquery": "^0.1.2", - "date-fns": "^2.30.0", - "date-fns-jalali": "^2.21.3-1", "dayjs": "^1.11.13", "feed": "^4.2.2", "fg-loadcss": "^3.1.0", diff --git a/docs/src/components/productX/XDateRangeDemo.tsx b/docs/src/components/productX/XDateRangeDemo.tsx index 8738087b6c6646..a1ccba8aa0ed72 100644 --- a/docs/src/components/productX/XDateRangeDemo.tsx +++ b/docs/src/components/productX/XDateRangeDemo.tsx @@ -7,25 +7,25 @@ import List from '@mui/material/List'; import ListItem from '@mui/material/ListItem'; import { StaticDateRangePicker } from '@mui/x-date-pickers-pro/StaticDateRangePicker'; import { PickersShortcutsItem, PickersShortcutsProps, DateRange } from '@mui/x-date-pickers-pro'; -import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns'; +import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { HighlightedCode } from '@mui/docs/HighlightedCode'; -import { startOfWeek, endOfWeek, subDays } from 'date-fns'; +import dayjs, { Dayjs } from 'dayjs'; import Frame from 'docs/src/components/action/Frame'; -const startDate = new Date(); -startDate.setDate(10); -const endDate = new Date(); -endDate.setDate(endDate.getDate() + 28); +const startDate = dayjs(); +startDate.date(10); +const endDate = dayjs(); +endDate.date(endDate.date() + 28); -function CustomRangeShortcuts(props: PickersShortcutsProps>) { +function CustomRangeShortcuts(props: PickersShortcutsProps>) { const { items, onChange, isValid, changeImportance = 'accept' } = props; if (items == null || items.length === 0) { return null; } - const resolvedItems = items.map((item: PickersShortcutsItem>) => { + const resolvedItems = items.map((item: PickersShortcutsItem>) => { const newValue = item.getValue({ isValid }); return { @@ -80,25 +80,25 @@ const code = ` `; export default function XDateRangeDemo() { - const today = new Date(); - const shortcutsItems: PickersShortcutsItem>[] = [ + const today = dayjs(); + const shortcutsItems: PickersShortcutsItem>[] = [ { label: 'This Week', getValue: () => { - return [startOfWeek(today), endOfWeek(today)]; + return [today.startOf('week'), today.endOf('week')]; }, }, { label: 'Last Week', getValue: () => { - const prevWeek = subDays(today, 7); - return [startOfWeek(prevWeek), endOfWeek(prevWeek)]; + const prevWeek = today.add(-7, 'days'); + return [prevWeek.startOf('week'), prevWeek.endOf('week')]; }, }, { label: 'Last 7 Days', getValue: () => { - return [subDays(today, 7), today]; + return [today.add(-7, 'days'), today]; }, }, { label: 'Reset', getValue: () => [null, null] }, @@ -164,7 +164,7 @@ export default function XDateRangeDemo() { }), ]} > - + - + + = 0.4'} - date-fns-jalali@2.21.3-1: - resolution: {integrity: sha512-Sgw1IdgCgyWDKCpq6uwAu24vPMOtvmcXXXuETr1jQO/aVj4h23XAltcP7hLbo+osqoiJnPmiydbI/q1W7TYAjA==} - engines: {node: '>=0.11'} - date-fns@2.30.0: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} @@ -14847,13 +14837,13 @@ snapshots: transitivePeerDependencies: - '@types/react' - '@mui/x-date-pickers-pro@7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/x-date-pickers-pro@7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/material': link:packages/mui-material/build '@mui/system': 5.16.5(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': 5.16.5(@types/react@18.3.4)(react@18.3.1) - '@mui/x-date-pickers': 7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/x-date-pickers': 7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-license': 7.13.0(@types/react@18.3.4)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 @@ -14864,12 +14854,11 @@ snapshots: '@emotion/react': 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) date-fns: 2.30.0 - date-fns-jalali: 2.21.3-1 dayjs: 1.11.13 transitivePeerDependencies: - '@types/react' - '@mui/x-date-pickers@7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/x-date-pickers@7.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1))(@mui/material@packages+mui-material+build)(@types/react@18.3.4)(date-fns@2.30.0)(dayjs@1.11.13)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/material': link:packages/mui-material/build @@ -14885,7 +14874,6 @@ snapshots: '@emotion/react': 11.13.3(@types/react@18.3.4)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) date-fns: 2.30.0 - date-fns-jalali: 2.21.3-1 dayjs: 1.11.13 transitivePeerDependencies: - '@types/react' @@ -18266,8 +18254,6 @@ snapshots: es-errors: 1.3.0 is-data-view: 1.0.1 - date-fns-jalali@2.21.3-1: {} - date-fns@2.30.0: dependencies: '@babel/runtime': 7.25.0 From b965951444b706cb14d739baaef602014ca2219b Mon Sep 17 00:00:00 2001 From: Victor Zanivan Monteiro Date: Tue, 3 Sep 2024 11:57:16 -0300 Subject: [PATCH 19/22] [website] Add disabled button styles to branding theme (#43577) --- .../website/branding-theme-test.tsx | 26 +++++++++++++ .../mui-docs/src/branding/brandingTheme.ts | 38 +++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/docs/pages/experiments/website/branding-theme-test.tsx b/docs/pages/experiments/website/branding-theme-test.tsx index 0b0eb57ce93291..6408551e549058 100644 --- a/docs/pages/experiments/website/branding-theme-test.tsx +++ b/docs/pages/experiments/website/branding-theme-test.tsx @@ -80,6 +80,32 @@ export default function BrandingThemeTest() { + + + + + + + + + + + + + + + +