diff --git a/docs/.link-check-errors.txt b/docs/.link-check-errors.txt index 24f1ff82c9158b..0b8d083f4a0077 100644 --- a/docs/.link-check-errors.txt +++ b/docs/.link-check-errors.txt @@ -1,5 +1,2 @@ Broken links found by `pnpm docs:link-check` that exist: -- https://mui.com/material-ui/customization/theme-components/#creating-new-component-variants -- https://mui.com/material-ui/customization/theme-components/#overrides-based-on-props -- https://mui.com/material-ui/react-grid2/#whats-changed diff --git a/docs/data/material/customization/creating-themed-components/creating-themed-components.md b/docs/data/material/customization/creating-themed-components/creating-themed-components.md index 15cf2415c18c14..1b9d7984ab7dca 100644 --- a/docs/data/material/customization/creating-themed-components/creating-themed-components.md +++ b/docs/data/material/customization/creating-themed-components/creating-themed-components.md @@ -22,7 +22,7 @@ This guide will walk you through how to build this statistics component, which a ### 1. Create the component slots -Slots let you customize each individual element of the component by targeting its respective name in the [theme's styleOverrides](/material-ui/customization/theme-components/#theme-style-overrides) and [theme's variants](/material-ui/customization/theme-components/#creating-new-component-variants). +Slots let you customize each individual element of the component by targeting its respective name in the [theme's styleOverrides](/material-ui/customization/theme-components/#theme-style-overrides) and [theme's variants](/material-ui/customization/theme-components/#variants). This statistics component is composed of three slots: diff --git a/docs/data/material/migration/migration-grid-v2/migration-grid-v2.md b/docs/data/material/migration/migration-grid-v2/migration-grid-v2.md index e3cf7f67d5629c..41ce6e24d68ce0 100644 --- a/docs/data/material/migration/migration-grid-v2/migration-grid-v2.md +++ b/docs/data/material/migration/migration-grid-v2/migration-grid-v2.md @@ -80,7 +80,7 @@ The Grid v2 is marked as stable in Material UI v6, so the `Unstable_` prefix is ``` Alongside the stabilization, the API has been improved. -You can see the changes and further details on how to migrate in the [Material UI v6 upgrade guide](/material-ui/migration/upgrade-to-v6/). +You can see the changes and further details on how to migrate in the [Material UI v6 upgrade guide](/material-ui/migration/upgrade-to-v6/#grid2). Finally, the original Grid component is deprecated and will be removed in the future, so we highly encourage you to migrate to Grid v2. diff --git a/docs/data/material/migration/migration-v4/v5-component-changes.md b/docs/data/material/migration/migration-v4/v5-component-changes.md index f2f179a7b0d820..8fa8f2b793e237 100644 --- a/docs/data/material/migration/migration-v4/v5-component-changes.md +++ b/docs/data/material/migration/migration-v4/v5-component-changes.md @@ -744,7 +744,7 @@ The props `alignItems`, `alignContent`, and `justifyContent`—along with their These props are now considered part of MUI System, not the `Grid` component itself. -If you still wish to add overrides for them, you can use the [callback as a value in `styleOverrides`](/material-ui/customization/theme-components/#overrides-based-on-props). +If you still wish to add overrides for them, you can use the [callback as a value in `styleOverrides`](https://v5.mui.com/material-ui/customization/theme-components/#overrides-based-on-props). ```diff const theme = createTheme({ @@ -775,7 +775,7 @@ If you need negative margins on all sides, we recommend using the new Grid v2 in + import Grid from '@mui/material/Grid2'; ``` -To learn more about the Grid v2, check out the [demos](/material-ui/react-grid2/#whats-changed) and the [Grid migration guide](/material-ui/migration/migration-grid-v2/). +To learn more about the Grid v2, check out the [demos](/material-ui/react-grid2/) and the [Grid migration guide](/material-ui/migration/migration-grid-v2/). :::info Grid v2 was introduced in Material UI v5.9.1 and features negative margins on all sides by default. @@ -1862,7 +1862,7 @@ The following classes and style overrides keys were removed: These props are now considered part of MUISystem rather than the `Typography` component itself. -If you still wish to add overrides for them, you can use the [callback as a value in `styleOverrides`](/material-ui/customization/theme-components/#overrides-based-on-props). +If you still wish to add overrides for them, you can use the [callback as a value in `styleOverrides`](https://v5.mui.com/material-ui/customization/theme-components/#overrides-based-on-props). For example: diff --git a/docs/data/system/styled/styled.md b/docs/data/system/styled/styled.md index 0802a73874e16d..cac8b41080267f 100644 --- a/docs/data/system/styled/styled.md +++ b/docs/data/system/styled/styled.md @@ -24,7 +24,7 @@ The utility can be used as a replacement for emotion's or styled-components' sty It aims to solve the same problem, but also provides the following benefits: 1. It uses a default `theme` if no theme is available in React context. -2. It supports the theme's [`styleOverrides`](/material-ui/customization/theme-components/#theme-style-overrides) and [`variants`](/material-ui/customization/theme-components/#creating-new-component-variants) to be applied, based on the `name` applied in the options (can be skipped). +2. It supports the theme's [`styleOverrides`](/material-ui/customization/theme-components/#theme-style-overrides) and [`variants`](/material-ui/customization/theme-components/#variants) to be applied, based on the `name` applied in the options (can be skipped). 3. It adds support for the [the `sx` prop](/system/getting-started/the-sx-prop/) (can be skipped). 4. It adds by default the `shouldForwardProp` option (that can be overridden), taking into account: `ownerState`, `theme`, `sx`, and `as`. diff --git a/docs/pages/blog/mui-core-v5.md b/docs/pages/blog/mui-core-v5.md index aeefa12a542fd4..f6faa28cb793a0 100644 --- a/docs/pages/blog/mui-core-v5.md +++ b/docs/pages/blog/mui-core-v5.md @@ -236,7 +236,7 @@ declare module '@mui/material/Button' {

CodeSandbox

-**Second**, you can add [custom variants](/material-ui/customization/theme-components/#creating-new-component-variants) to the theme, overriding the CSS for specific component prop combinations. +**Second**, you can add [custom variants](https://v5.mui.com/material-ui/customization/theme-components/#creating-new-component-variants) to the theme, overriding the CSS for specific component prop combinations. ```jsx import { createTheme, Button } from '@mui/material'; diff --git a/package.json b/package.json index f58ae05bcfc2d7..5e54a64893fad5 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "@mui/joy": "workspace:*", "@mui/material": "workspace:^", "@mui/utils": "workspace:^", - "@next/eslint-plugin-next": "^14.2.5", + "@next/eslint-plugin-next": "^14.2.6", "@octokit/rest": "^21.0.2", "@pigment-css/react": "0.0.20", "@playwright/test": "1.46.1", diff --git a/packages/mui-material/src/Accordion/Accordion.d.ts b/packages/mui-material/src/Accordion/Accordion.d.ts index c1f207ffa6df15..c76e67a4e19eb9 100644 --- a/packages/mui-material/src/Accordion/Accordion.d.ts +++ b/packages/mui-material/src/Accordion/Accordion.d.ts @@ -19,7 +19,7 @@ export interface AccordionSlots { * @default Collapse */ transition?: React.JSXElementConstructor< - TransitionProps & { children?: React.ReactElement } + TransitionProps & { children?: React.ReactElement } >; } @@ -92,7 +92,7 @@ export type AccordionTypeMap< * [Follow this guide](/material-ui/transitions/#transitioncomponent-prop) to learn more about the requirements for this component. */ TransitionComponent?: React.JSXElementConstructor< - TransitionProps & { children?: React.ReactElement } + TransitionProps & { children?: React.ReactElement } >; /** * Props applied to the transition element. diff --git a/packages/mui-material/src/Backdrop/Backdrop.d.ts b/packages/mui-material/src/Backdrop/Backdrop.d.ts index 699948790dbf10..1be692237cef65 100644 --- a/packages/mui-material/src/Backdrop/Backdrop.d.ts +++ b/packages/mui-material/src/Backdrop/Backdrop.d.ts @@ -19,7 +19,7 @@ export interface BackdropSlots { * @default Fade */ transition?: React.JSXElementConstructor< - TransitionProps & { children: React.ReactElement } + TransitionProps & { children: React.ReactElement } >; } export interface BackdropComponentsPropsOverrides {} @@ -100,7 +100,7 @@ export interface BackdropOwnProps */ TransitionComponent?: React.JSXElementConstructor< TransitionProps & { - children: React.ReactElement; + children: React.ReactElement; } >; } diff --git a/packages/mui-material/src/Dialog/Dialog.d.ts b/packages/mui-material/src/Dialog/Dialog.d.ts index a5a25d168219d5..e8b4c70b12bf09 100644 --- a/packages/mui-material/src/Dialog/Dialog.d.ts +++ b/packages/mui-material/src/Dialog/Dialog.d.ts @@ -88,7 +88,7 @@ export interface DialogProps extends StandardProps { * @default Fade */ TransitionComponent?: React.JSXElementConstructor< - TransitionProps & { children: React.ReactElement } + TransitionProps & { children: React.ReactElement } >; /** * The duration for the transition, in milliseconds. diff --git a/packages/mui-material/src/Fade/Fade.d.ts b/packages/mui-material/src/Fade/Fade.d.ts index dc29c55e69696d..a0c2fd024261f1 100644 --- a/packages/mui-material/src/Fade/Fade.d.ts +++ b/packages/mui-material/src/Fade/Fade.d.ts @@ -11,7 +11,7 @@ export interface FadeProps extends Omit { /** * A single child content element. */ - children: React.ReactElement; + children: React.ReactElement; /** * The transition timing function. * You may specify a single easing or a object containing enter and exit values. diff --git a/packages/mui-material/src/FormControlLabel/FormControlLabel.d.ts b/packages/mui-material/src/FormControlLabel/FormControlLabel.d.ts index a473eb3bdc78fb..9a0b2e1d0caf5c 100644 --- a/packages/mui-material/src/FormControlLabel/FormControlLabel.d.ts +++ b/packages/mui-material/src/FormControlLabel/FormControlLabel.d.ts @@ -48,7 +48,7 @@ export interface FormControlLabelProps /** * A control element. For instance, it can be a `Radio`, a `Switch` or a `Checkbox`. */ - control: React.ReactElement; + control: React.ReactElement; /** * If `true`, the control is disabled. */ diff --git a/packages/mui-material/src/Grow/Grow.d.ts b/packages/mui-material/src/Grow/Grow.d.ts index 3cc87d5fa00c6e..c01ca0614f9f1a 100644 --- a/packages/mui-material/src/Grow/Grow.d.ts +++ b/packages/mui-material/src/Grow/Grow.d.ts @@ -11,7 +11,7 @@ export interface GrowProps extends Omit { /** * A single child content element. */ - children: React.ReactElement; + children: React.ReactElement; /** * The transition timing function. * You may specify a single easing or a object containing enter and exit values. diff --git a/packages/mui-material/src/NativeSelect/NativeSelect.d.ts b/packages/mui-material/src/NativeSelect/NativeSelect.d.ts index cedb084f32f51b..28ec68143d6468 100644 --- a/packages/mui-material/src/NativeSelect/NativeSelect.d.ts +++ b/packages/mui-material/src/NativeSelect/NativeSelect.d.ts @@ -26,7 +26,7 @@ export interface NativeSelectProps * An `Input` element; does not have to be a material-ui specific `Input`. * @default */ - input?: React.ReactElement; + input?: React.ReactElement; /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select#attributes) applied to the `select` element. */ diff --git a/packages/mui-material/src/Popover/Popover.d.ts b/packages/mui-material/src/Popover/Popover.d.ts index 63bdaa417ee012..3ff8f128b72a38 100644 --- a/packages/mui-material/src/Popover/Popover.d.ts +++ b/packages/mui-material/src/Popover/Popover.d.ts @@ -146,7 +146,7 @@ export interface PopoverProps * @default Grow */ TransitionComponent?: React.JSXElementConstructor< - TransitionProps & { children: React.ReactElement } + TransitionProps & { children: React.ReactElement } >; /** * Set to 'auto' to automatically calculate transition time based on height. diff --git a/packages/mui-material/src/Select/Select.d.ts b/packages/mui-material/src/Select/Select.d.ts index 1510954da84ce7..84bf9cfed790ab 100644 --- a/packages/mui-material/src/Select/Select.d.ts +++ b/packages/mui-material/src/Select/Select.d.ts @@ -63,7 +63,7 @@ export interface BaseSelectProps /** * An `Input` element; does not have to be a material-ui specific `Input`. */ - input?: React.ReactElement; + input?: React.ReactElement; /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. * When `native` is `true`, the attributes are applied on the `select` element. diff --git a/packages/mui-material/src/Slide/Slide.d.ts b/packages/mui-material/src/Slide/Slide.d.ts index e0472114a2ae86..58cf5747ff7413 100644 --- a/packages/mui-material/src/Slide/Slide.d.ts +++ b/packages/mui-material/src/Slide/Slide.d.ts @@ -11,7 +11,7 @@ export interface SlideProps extends TransitionProps { /** * A single child content element. */ - children: React.ReactElement; + children: React.ReactElement; /** * An HTML element, or a function that returns one. * It's used to set the container the Slide is transitioning from. diff --git a/packages/mui-material/src/Snackbar/Snackbar.d.ts b/packages/mui-material/src/Snackbar/Snackbar.d.ts index 3128d00d125cc8..07f9bf3a5754c0 100644 --- a/packages/mui-material/src/Snackbar/Snackbar.d.ts +++ b/packages/mui-material/src/Snackbar/Snackbar.d.ts @@ -37,7 +37,7 @@ export interface SnackbarProps extends StandardProps; + children?: React.ReactElement; /** * Override or extend the styles applied to the component. */ @@ -98,7 +98,7 @@ export interface SnackbarProps extends StandardProps } + TransitionProps & { children: React.ReactElement } >; /** * The duration for the transition, in milliseconds. diff --git a/packages/mui-material/src/SpeedDial/SpeedDial.d.ts b/packages/mui-material/src/SpeedDial/SpeedDial.d.ts index b163ce53477207..50f895905d2dac 100644 --- a/packages/mui-material/src/SpeedDial/SpeedDial.d.ts +++ b/packages/mui-material/src/SpeedDial/SpeedDial.d.ts @@ -17,7 +17,7 @@ export interface SpeedDialSlots { * @default {} */ transition?: React.JSXElementConstructor< - TransitionProps & { children: React.ReactElement } + TransitionProps & { children: React.ReactElement } >; } diff --git a/packages/mui-material/src/StepContent/StepContent.d.ts b/packages/mui-material/src/StepContent/StepContent.d.ts index 3d46e210338b64..eeb4e3e6cbf814 100644 --- a/packages/mui-material/src/StepContent/StepContent.d.ts +++ b/packages/mui-material/src/StepContent/StepContent.d.ts @@ -24,7 +24,7 @@ export interface StepContentProps extends StandardProps } + TransitionProps & { children: React.ReactElement } >; /** * Adjust the duration of the content expand transition. diff --git a/packages/mui-material/src/Stepper/Stepper.d.ts b/packages/mui-material/src/Stepper/Stepper.d.ts index 68b5afe796b4bb..f69a73fdee860a 100644 --- a/packages/mui-material/src/Stepper/Stepper.d.ts +++ b/packages/mui-material/src/Stepper/Stepper.d.ts @@ -32,7 +32,7 @@ export interface StepperOwnProps extends Pick */ - connector?: React.ReactElement | null; + connector?: React.ReactElement | null; /** * If set the `Stepper` will not assist in controlling steps for linear flow. * @default false diff --git a/packages/mui-material/src/Tooltip/Tooltip.d.ts b/packages/mui-material/src/Tooltip/Tooltip.d.ts index 8c55ac9ed79fa2..926417e83e8c3b 100644 --- a/packages/mui-material/src/Tooltip/Tooltip.d.ts +++ b/packages/mui-material/src/Tooltip/Tooltip.d.ts @@ -16,7 +16,7 @@ export interface TooltipProps extends StandardProps; + children: React.ReactElement; /** * Override or extend the styles applied to the component. */ @@ -204,7 +204,7 @@ export interface TooltipProps extends StandardProps } + TransitionProps & { children: React.ReactElement } >; /** * Props applied to the transition element. diff --git a/packages/mui-material/src/Zoom/Zoom.d.ts b/packages/mui-material/src/Zoom/Zoom.d.ts index 82a1714a29f446..0d6d8a2703a787 100644 --- a/packages/mui-material/src/Zoom/Zoom.d.ts +++ b/packages/mui-material/src/Zoom/Zoom.d.ts @@ -11,7 +11,7 @@ export interface ZoomProps extends TransitionProps { /** * A single child content element. */ - children: React.ReactElement; + children: React.ReactElement; /** * The transition timing function. * You may specify a single easing or a object containing enter and exit values. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0d25c440756aea..33e63b812075c4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -105,8 +105,8 @@ importers: specifier: workspace:^ version: link:packages/mui-utils/build '@next/eslint-plugin-next': - specifier: ^14.2.5 - version: 14.2.5 + specifier: ^14.2.6 + version: 14.2.6 '@octokit/rest': specifier: ^21.0.2 version: 21.0.2 @@ -4394,8 +4394,8 @@ packages: '@next/env@14.2.6': resolution: {integrity: sha512-bs5DFKV+08EjWrl8EB+KKqev1ZTNONH1vFCaHh911aaB362NnP32UDTbE9VQhyiAgbFqJsfDkSxFERNDDb3j0g==} - '@next/eslint-plugin-next@14.2.5': - resolution: {integrity: sha512-LY3btOpPh+OTIpviNojDpUdIbHW9j0JBYBjsIp8IxtDFfYFyORvw3yNq6N231FVqQA7n7lwaf7xHbVJlA1ED7g==} + '@next/eslint-plugin-next@14.2.6': + resolution: {integrity: sha512-d3+p4AjIYmhqzYHhhmkRYYN6ZU35TwZAKX08xKRfnHkz72KhWL2kxMFsDptpZs5e8bBGdepn7vn1+9DaF8iX+A==} '@next/swc-darwin-arm64@14.2.5': resolution: {integrity: sha512-/9zVxJ+K9lrzSGli1///ujyRfon/ZneeZ+v4ptpiPoOU+GKZnm8Wj8ELWU1Pm7GHltYRBklmXMTUqM/DqQ99FQ==} @@ -15016,7 +15016,7 @@ snapshots: '@next/env@14.2.6': {} - '@next/eslint-plugin-next@14.2.5': + '@next/eslint-plugin-next@14.2.6': dependencies: glob: 10.3.10 diff --git a/scripts/releaseChangelog.mjs b/scripts/releaseChangelog.mjs index fe8be8dac86a76..edc1655b5fc5b5 100644 --- a/scripts/releaseChangelog.mjs +++ b/scripts/releaseChangelog.mjs @@ -206,7 +206,7 @@ yargs(process.argv.slice(2)) }) .option('release', { // #default-branch-switch - default: 'next', + default: 'master', describe: 'Ref which we want to release', type: 'string', })