>(params: {
+ props: Props;
+ name: string;
+}) {
+ return useSystemDefaultProps(params) as Props;
+}
diff --git a/packages/mui-material/src/DefaultPropsProvider/index.ts b/packages/mui-material/src/DefaultPropsProvider/index.ts
new file mode 100644
index 00000000000000..646b9a27128699
--- /dev/null
+++ b/packages/mui-material/src/DefaultPropsProvider/index.ts
@@ -0,0 +1 @@
+export { default, useDefaultProps } from './DefaultPropsProvider';
diff --git a/packages/mui-material/src/Dialog/Dialog.js b/packages/mui-material/src/Dialog/Dialog.js
index 0988a7c8818508..9ada355c5155aa 100644
--- a/packages/mui-material/src/Dialog/Dialog.js
+++ b/packages/mui-material/src/Dialog/Dialog.js
@@ -11,9 +11,9 @@ import Paper from '../Paper';
import dialogClasses, { getDialogUtilityClass } from './dialogClasses';
import DialogContext from './DialogContext';
import Backdrop from '../Backdrop';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
-const useThemeProps = createUseThemeProps('MuiDialog');
+import { useDefaultProps } from '../DefaultPropsProvider';
const DialogBackdrop = styled(Backdrop, {
name: 'MuiDialog',
@@ -203,7 +203,7 @@ const DialogPaper = styled(Paper, {
* Dialogs are overlaid modal paper based components with a backdrop.
*/
const Dialog = React.forwardRef(function Dialog(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiDialog' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiDialog' });
const theme = useTheme();
const defaultTransitionDuration = {
enter: theme.transitions.duration.enteringScreen,
diff --git a/packages/mui-material/src/DialogActions/DialogActions.js b/packages/mui-material/src/DialogActions/DialogActions.js
index b57f1dab955c8d..8e1b730bc4c096 100644
--- a/packages/mui-material/src/DialogActions/DialogActions.js
+++ b/packages/mui-material/src/DialogActions/DialogActions.js
@@ -3,11 +3,10 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getDialogActionsUtilityClass } from './dialogActionsClasses';
-const useThemeProps = createUseThemeProps('MuiDialogActions');
-
const useUtilityClasses = (ownerState) => {
const { classes, disableSpacing } = ownerState;
@@ -45,7 +44,7 @@ const DialogActionsRoot = styled('div', {
});
const DialogActions = React.forwardRef(function DialogActions(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiDialogActions',
});
diff --git a/packages/mui-material/src/DialogContent/DialogContent.js b/packages/mui-material/src/DialogContent/DialogContent.js
index 2a9d222ef44c2b..93c017300eb144 100644
--- a/packages/mui-material/src/DialogContent/DialogContent.js
+++ b/packages/mui-material/src/DialogContent/DialogContent.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getDialogContentUtilityClass } from './dialogContentClasses';
import dialogTitleClasses from '../DialogTitle/dialogTitleClasses';
-const useThemeProps = createUseThemeProps('MuiDialogContent');
-
const useUtilityClasses = (ownerState) => {
const { classes, dividers } = ownerState;
@@ -54,7 +53,7 @@ const DialogContentRoot = styled('div', {
}));
const DialogContent = React.forwardRef(function DialogContent(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiDialogContent',
});
diff --git a/packages/mui-material/src/DialogContentText/DialogContentText.js b/packages/mui-material/src/DialogContentText/DialogContentText.js
index ebb915bb144f50..359a7000387e1c 100644
--- a/packages/mui-material/src/DialogContentText/DialogContentText.js
+++ b/packages/mui-material/src/DialogContentText/DialogContentText.js
@@ -4,12 +4,11 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Typography from '../Typography';
import { getDialogContentTextUtilityClass } from './dialogContentTextClasses';
-const useThemeProps = createUseThemeProps('MuiDialogContentText');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -33,7 +32,7 @@ const DialogContentTextRoot = styled(Typography, {
})({});
const DialogContentText = React.forwardRef(function DialogContentText(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiDialogContentText' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiDialogContentText' });
const { children, className, ...ownerState } = props;
const classes = useUtilityClasses(ownerState);
diff --git a/packages/mui-material/src/DialogTitle/DialogTitle.js b/packages/mui-material/src/DialogTitle/DialogTitle.js
index 9c59a9e706d32c..0f2b12d85caacb 100644
--- a/packages/mui-material/src/DialogTitle/DialogTitle.js
+++ b/packages/mui-material/src/DialogTitle/DialogTitle.js
@@ -4,12 +4,11 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import Typography from '../Typography';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getDialogTitleUtilityClass } from './dialogTitleClasses';
import DialogContext from '../Dialog/DialogContext';
-const useThemeProps = createUseThemeProps('MuiDialogTitle');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -30,7 +29,7 @@ const DialogTitleRoot = styled(Typography, {
});
const DialogTitle = React.forwardRef(function DialogTitle(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiDialogTitle',
});
diff --git a/packages/mui-material/src/Divider/Divider.js b/packages/mui-material/src/Divider/Divider.js
index 986b39f01b61af..906b8c8c36f0d5 100644
--- a/packages/mui-material/src/Divider/Divider.js
+++ b/packages/mui-material/src/Divider/Divider.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getDividerUtilityClass } from './dividerClasses';
-const useThemeProps = createUseThemeProps('MuiDivider');
-
const useUtilityClasses = (ownerState) => {
const { absolute, children, classes, flexItem, light, orientation, textAlign, variant } =
ownerState;
@@ -216,7 +215,7 @@ const DividerWrapper = styled('span', {
}));
const Divider = React.forwardRef(function Divider(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiDivider' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiDivider' });
const {
absolute = false,
children,
diff --git a/packages/mui-material/src/Drawer/Drawer.js b/packages/mui-material/src/Drawer/Drawer.js
index 45f7b9bbb2af61..7973cbbea62aae 100644
--- a/packages/mui-material/src/Drawer/Drawer.js
+++ b/packages/mui-material/src/Drawer/Drawer.js
@@ -10,11 +10,10 @@ import Slide from '../Slide';
import Paper from '../Paper';
import capitalize from '../utils/capitalize';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getDrawerUtilityClass } from './drawerClasses';
-const useThemeProps = createUseThemeProps('MuiDrawer');
-
const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -180,7 +179,7 @@ export function getAnchor({ direction }, anchor) {
* when `variant="temporary"` is set.
*/
const Drawer = React.forwardRef(function Drawer(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiDrawer' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiDrawer' });
const theme = useTheme();
const isRtl = useRtl();
const defaultTransitionDuration = {
diff --git a/packages/mui-material/src/Fab/Fab.js b/packages/mui-material/src/Fab/Fab.js
index cdb560dd8c09d7..71da7157e83527 100644
--- a/packages/mui-material/src/Fab/Fab.js
+++ b/packages/mui-material/src/Fab/Fab.js
@@ -7,9 +7,9 @@ import ButtonBase from '../ButtonBase';
import capitalize from '../utils/capitalize';
import fabClasses, { getFabUtilityClass } from './fabClasses';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
-const useThemeProps = createUseThemeProps('MuiFab');
+import { useDefaultProps } from '../DefaultPropsProvider';
const useUtilityClasses = (ownerState) => {
const { color, variant, classes, size } = ownerState;
@@ -163,7 +163,7 @@ const FabRoot = styled(ButtonBase, {
);
const Fab = React.forwardRef(function Fab(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFab' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFab' });
const {
children,
className,
diff --git a/packages/mui-material/src/FilledInput/FilledInput.js b/packages/mui-material/src/FilledInput/FilledInput.js
index 92e49730039934..fb0a867204b7d6 100644
--- a/packages/mui-material/src/FilledInput/FilledInput.js
+++ b/packages/mui-material/src/FilledInput/FilledInput.js
@@ -6,7 +6,8 @@ import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import InputBase from '../InputBase';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import filledInputClasses, { getFilledInputUtilityClass } from './filledInputClasses';
import {
rootOverridesResolver as inputBaseRootOverridesResolver,
@@ -16,8 +17,6 @@ import {
} from '../InputBase/InputBase';
import { capitalize } from '../utils';
-const useThemeProps = createUseThemeProps('MuiFilledInput');
-
const useUtilityClasses = (ownerState) => {
const { classes, disableUnderline, startAdornment, endAdornment, size, hiddenLabel, multiline } =
ownerState;
@@ -270,7 +269,7 @@ const FilledInputInput = styled(InputBaseInput, {
}));
const FilledInput = React.forwardRef(function FilledInput(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFilledInput' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFilledInput' });
const {
disableUnderline = false,
diff --git a/packages/mui-material/src/FormControl/FormControl.js b/packages/mui-material/src/FormControl/FormControl.js
index e4b79ab62b9ecf..e9d5d01b773a4d 100644
--- a/packages/mui-material/src/FormControl/FormControl.js
+++ b/packages/mui-material/src/FormControl/FormControl.js
@@ -3,15 +3,14 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { isFilled, isAdornedStart } from '../InputBase/utils';
import capitalize from '../utils/capitalize';
import isMuiElement from '../utils/isMuiElement';
import FormControlContext from './FormControlContext';
import { getFormControlUtilityClasses } from './formControlClasses';
-const useThemeProps = createUseThemeProps('MuiFormControl');
-
const useUtilityClasses = (ownerState) => {
const { classes, margin, fullWidth } = ownerState;
const slots = {
@@ -90,7 +89,7 @@ const FormControlRoot = styled('div', {
* For instance, only one input can be focused at the same time, the state shouldn't be shared.
*/
const FormControl = React.forwardRef(function FormControl(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFormControl' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFormControl' });
const {
children,
className,
diff --git a/packages/mui-material/src/FormControlLabel/FormControlLabel.js b/packages/mui-material/src/FormControlLabel/FormControlLabel.js
index 5765933206a476..a277055f179a5c 100644
--- a/packages/mui-material/src/FormControlLabel/FormControlLabel.js
+++ b/packages/mui-material/src/FormControlLabel/FormControlLabel.js
@@ -5,7 +5,8 @@ import clsx from 'clsx';
import refType from '@mui/utils/refType';
import composeClasses from '@mui/utils/composeClasses';
import { useFormControl } from '../FormControl';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Stack from '../Stack';
import Typography from '../Typography';
import capitalize from '../utils/capitalize';
@@ -15,8 +16,6 @@ import formControlLabelClasses, {
import formControlState from '../FormControl/formControlState';
import useSlot from '../utils/useSlot';
-const useThemeProps = createUseThemeProps('MuiFormControlLabel');
-
const useUtilityClasses = (ownerState) => {
const { classes, disabled, labelPlacement, error, required } = ownerState;
const slots = {
@@ -108,7 +107,7 @@ const AsteriskComponent = styled('span', {
* Use this component if you want to display an extra label.
*/
const FormControlLabel = React.forwardRef(function FormControlLabel(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFormControlLabel' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFormControlLabel' });
const {
checked,
className,
diff --git a/packages/mui-material/src/FormGroup/FormGroup.js b/packages/mui-material/src/FormGroup/FormGroup.js
index 0912b1aabd7b08..d5849282e39f66 100644
--- a/packages/mui-material/src/FormGroup/FormGroup.js
+++ b/packages/mui-material/src/FormGroup/FormGroup.js
@@ -3,13 +3,12 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getFormGroupUtilityClass } from './formGroupClasses';
import useFormControl from '../FormControl/useFormControl';
import formControlState from '../FormControl/formControlState';
-const useThemeProps = createUseThemeProps('MuiFormGroup');
-
const useUtilityClasses = (ownerState) => {
const { classes, row, error } = ownerState;
@@ -48,7 +47,7 @@ const FormGroupRoot = styled('div', {
* For the `Radio`, you should be using the `RadioGroup` component instead of this one.
*/
const FormGroup = React.forwardRef(function FormGroup(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiFormGroup',
});
diff --git a/packages/mui-material/src/FormHelperText/FormHelperText.js b/packages/mui-material/src/FormHelperText/FormHelperText.js
index 2a3a5fc7cbe5bc..44a2ae9215e9fa 100644
--- a/packages/mui-material/src/FormHelperText/FormHelperText.js
+++ b/packages/mui-material/src/FormHelperText/FormHelperText.js
@@ -5,12 +5,11 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import formControlState from '../FormControl/formControlState';
import useFormControl from '../FormControl/useFormControl';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import formHelperTextClasses, { getFormHelperTextUtilityClasses } from './formHelperTextClasses';
-const useThemeProps = createUseThemeProps('MuiFormHelperText');
-
const useUtilityClasses = (ownerState) => {
const { classes, contained, size, disabled, error, filled, focused, required } = ownerState;
const slots = {
@@ -76,7 +75,7 @@ const FormHelperTextRoot = styled('p', {
}));
const FormHelperText = React.forwardRef(function FormHelperText(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFormHelperText' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFormHelperText' });
const {
children,
className,
diff --git a/packages/mui-material/src/FormLabel/FormLabel.js b/packages/mui-material/src/FormLabel/FormLabel.js
index efa75c022f23c8..b412549321dd2b 100644
--- a/packages/mui-material/src/FormLabel/FormLabel.js
+++ b/packages/mui-material/src/FormLabel/FormLabel.js
@@ -6,11 +6,10 @@ import composeClasses from '@mui/utils/composeClasses';
import formControlState from '../FormControl/formControlState';
import useFormControl from '../FormControl/useFormControl';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import formLabelClasses, { getFormLabelUtilityClasses } from './formLabelClasses';
-const useThemeProps = createUseThemeProps('MuiFormLabel');
-
const useUtilityClasses = (ownerState) => {
const { classes, color, focused, disabled, error, filled, required } = ownerState;
const slots = {
@@ -81,7 +80,7 @@ const AsteriskComponent = styled('span', {
}));
const FormLabel = React.forwardRef(function FormLabel(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiFormLabel' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiFormLabel' });
const {
children,
className,
diff --git a/packages/mui-material/src/Icon/Icon.js b/packages/mui-material/src/Icon/Icon.js
index e382b2f5b4ed17..8368b113b52972 100644
--- a/packages/mui-material/src/Icon/Icon.js
+++ b/packages/mui-material/src/Icon/Icon.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getIconUtilityClass } from './iconClasses';
-const useThemeProps = createUseThemeProps('MuiIcon');
-
const useUtilityClasses = (ownerState) => {
const { color, fontSize, classes } = ownerState;
@@ -114,7 +113,7 @@ const IconRoot = styled('span', {
}));
const Icon = React.forwardRef(function Icon(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiIcon' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiIcon' });
const {
baseClassName = 'material-icons',
className,
diff --git a/packages/mui-material/src/IconButton/IconButton.js b/packages/mui-material/src/IconButton/IconButton.js
index 6e4013edfcefcc..31ce68e22f2f82 100644
--- a/packages/mui-material/src/IconButton/IconButton.js
+++ b/packages/mui-material/src/IconButton/IconButton.js
@@ -5,13 +5,12 @@ import clsx from 'clsx';
import chainPropTypes from '@mui/utils/chainPropTypes';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ButtonBase from '../ButtonBase';
import capitalize from '../utils/capitalize';
import iconButtonClasses, { getIconButtonUtilityClass } from './iconButtonClasses';
-const useThemeProps = createUseThemeProps('MuiIconButton');
-
const useUtilityClasses = (ownerState) => {
const { classes, disabled, color, edge, size } = ownerState;
@@ -157,7 +156,7 @@ const IconButtonRoot = styled(ButtonBase, {
* regarding the available icon options.
*/
const IconButton = React.forwardRef(function IconButton(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiIconButton' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiIconButton' });
const {
edge = false,
children,
diff --git a/packages/mui-material/src/ImageList/ImageList.js b/packages/mui-material/src/ImageList/ImageList.js
index ee641bf92adb8a..3f92f867e84a12 100644
--- a/packages/mui-material/src/ImageList/ImageList.js
+++ b/packages/mui-material/src/ImageList/ImageList.js
@@ -4,12 +4,11 @@ import integerPropType from '@mui/utils/integerPropType';
import clsx from 'clsx';
import PropTypes from 'prop-types';
import * as React from 'react';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getImageListUtilityClass } from './imageListClasses';
import ImageListContext from './ImageListContext';
-const useThemeProps = createUseThemeProps('MuiImageList');
-
const useUtilityClasses = (ownerState) => {
const { classes, variant } = ownerState;
@@ -48,7 +47,7 @@ const ImageListRoot = styled('ul', {
});
const ImageList = React.forwardRef(function ImageList(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiImageList',
});
diff --git a/packages/mui-material/src/ImageListItem/ImageListItem.js b/packages/mui-material/src/ImageListItem/ImageListItem.js
index db5a43ced0b559..ecf89d2988d829 100644
--- a/packages/mui-material/src/ImageListItem/ImageListItem.js
+++ b/packages/mui-material/src/ImageListItem/ImageListItem.js
@@ -6,12 +6,11 @@ import PropTypes from 'prop-types';
import * as React from 'react';
import { isFragment } from 'react-is';
import ImageListContext from '../ImageList/ImageListContext';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import isMuiElement from '../utils/isMuiElement';
import imageListItemClasses, { getImageListItemUtilityClass } from './imageListItemClasses';
-const useThemeProps = createUseThemeProps('MuiImageListItem');
-
const useUtilityClasses = (ownerState) => {
const { classes, variant } = ownerState;
@@ -82,7 +81,7 @@ const ImageListItemRoot = styled('li', {
});
const ImageListItem = React.forwardRef(function ImageListItem(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiImageListItem',
});
diff --git a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js
index f5be968bc2a616..ec6cb966f1c046 100644
--- a/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js
+++ b/packages/mui-material/src/ImageListItemBar/ImageListItemBar.js
@@ -3,12 +3,11 @@ import composeClasses from '@mui/utils/composeClasses';
import clsx from 'clsx';
import PropTypes from 'prop-types';
import * as React from 'react';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import { getImageListItemBarUtilityClass } from './imageListItemBarClasses';
-const useThemeProps = createUseThemeProps('MuiImageListItemBar');
-
const useUtilityClasses = (ownerState) => {
const { classes, position, actionIcon, actionPosition } = ownerState;
@@ -172,7 +171,7 @@ const ImageListItemBarActionIcon = styled('div', {
});
const ImageListItemBar = React.forwardRef(function ImageListItemBar(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiImageListItemBar',
});
diff --git a/packages/mui-material/src/Input/Input.js b/packages/mui-material/src/Input/Input.js
index 698f5e8ef4da13..5e60d276a63817 100644
--- a/packages/mui-material/src/Input/Input.js
+++ b/packages/mui-material/src/Input/Input.js
@@ -6,7 +6,8 @@ import deepmerge from '@mui/utils/deepmerge';
import refType from '@mui/utils/refType';
import InputBase from '../InputBase';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import inputClasses, { getInputUtilityClass } from './inputClasses';
import {
rootOverridesResolver as inputBaseRootOverridesResolver,
@@ -15,8 +16,6 @@ import {
InputBaseInput,
} from '../InputBase/InputBase';
-const useThemeProps = createUseThemeProps('MuiInput');
-
const useUtilityClasses = (ownerState) => {
const { classes, disableUnderline } = ownerState;
@@ -133,7 +132,7 @@ const InputInput = styled(InputBaseInput, {
})({});
const Input = React.forwardRef(function Input(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiInput' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiInput' });
const {
disableUnderline = false,
components = {},
diff --git a/packages/mui-material/src/InputAdornment/InputAdornment.js b/packages/mui-material/src/InputAdornment/InputAdornment.js
index fb2e14349bb96c..58f8c75fbc7764 100644
--- a/packages/mui-material/src/InputAdornment/InputAdornment.js
+++ b/packages/mui-material/src/InputAdornment/InputAdornment.js
@@ -7,11 +7,10 @@ import capitalize from '../utils/capitalize';
import Typography from '../Typography';
import FormControlContext from '../FormControl/FormControlContext';
import useFormControl from '../FormControl/useFormControl';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import inputAdornmentClasses, { getInputAdornmentUtilityClass } from './inputAdornmentClasses';
-const useThemeProps = createUseThemeProps('MuiInputAdornment');
-
const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -88,7 +87,7 @@ const InputAdornmentRoot = styled('div', {
}));
const InputAdornment = React.forwardRef(function InputAdornment(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiInputAdornment' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiInputAdornment' });
const {
children,
className,
diff --git a/packages/mui-material/src/InputBase/InputBase.js b/packages/mui-material/src/InputBase/InputBase.js
index 0b032c6548acbb..f92d068cdc41ca 100644
--- a/packages/mui-material/src/InputBase/InputBase.js
+++ b/packages/mui-material/src/InputBase/InputBase.js
@@ -11,15 +11,14 @@ import composeClasses from '@mui/utils/composeClasses';
import formControlState from '../FormControl/formControlState';
import FormControlContext from '../FormControl/FormControlContext';
import useFormControl from '../FormControl/useFormControl';
-import { styled, createUseThemeProps, globalCss } from '../zero-styled';
+import { styled, globalCss } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import useForkRef from '../utils/useForkRef';
import useEnhancedEffect from '../utils/useEnhancedEffect';
import { isFilled } from './utils';
import inputBaseClasses, { getInputBaseUtilityClass } from './inputBaseClasses';
-const useThemeProps = createUseThemeProps('MuiInputBase');
-
export const rootOverridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -263,7 +262,7 @@ const InputGlobalStyles = globalCss({
* It contains a load of style reset and some state logic.
*/
const InputBase = React.forwardRef(function InputBase(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiInputBase' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiInputBase' });
const {
'aria-describedby': ariaDescribedby,
autoComplete,
diff --git a/packages/mui-material/src/InputLabel/InputLabel.js b/packages/mui-material/src/InputLabel/InputLabel.js
index 8e6665c0edbced..71db13aecba3f4 100644
--- a/packages/mui-material/src/InputLabel/InputLabel.js
+++ b/packages/mui-material/src/InputLabel/InputLabel.js
@@ -8,11 +8,10 @@ import useFormControl from '../FormControl/useFormControl';
import FormLabel, { formLabelClasses } from '../FormLabel';
import capitalize from '../utils/capitalize';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getInputLabelUtilityClasses } from './inputLabelClasses';
-const useThemeProps = createUseThemeProps('MuiInputLabel');
-
const useUtilityClasses = (ownerState) => {
const { classes, formControl, size, shrink, disableAnimation, variant, required } = ownerState;
const slots = {
@@ -172,7 +171,7 @@ const InputLabelRoot = styled(FormLabel, {
}));
const InputLabel = React.forwardRef(function InputLabel(inProps, ref) {
- const props = useThemeProps({ name: 'MuiInputLabel', props: inProps });
+ const props = useDefaultProps({ name: 'MuiInputLabel', props: inProps });
const {
disableAnimation = false,
margin,
diff --git a/packages/mui-material/src/LinearProgress/LinearProgress.js b/packages/mui-material/src/LinearProgress/LinearProgress.js
index ddc40f02efc5ed..bc4366a91fa801 100644
--- a/packages/mui-material/src/LinearProgress/LinearProgress.js
+++ b/packages/mui-material/src/LinearProgress/LinearProgress.js
@@ -5,12 +5,11 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { darken, lighten } from '@mui/system/colorManipulator';
import { useRtl } from '@mui/system/RtlProvider';
-import { keyframes, css, styled, createUseThemeProps } from '../zero-styled';
+import { keyframes, css, styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import { getLinearProgressUtilityClass } from './linearProgressClasses';
-const useThemeProps = createUseThemeProps('MuiLinearProgress');
-
const TRANSITION_DURATION = 4; // seconds
const indeterminate1Keyframe = keyframes`
0% {
@@ -372,7 +371,7 @@ const LinearProgressBar2 = styled('span', {
* attribute to `true` on that region until it has finished loading.
*/
const LinearProgress = React.forwardRef(function LinearProgress(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiLinearProgress' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiLinearProgress' });
const {
className,
color = 'primary',
diff --git a/packages/mui-material/src/Link/Link.js b/packages/mui-material/src/Link/Link.js
index 80cf5374e66af5..7ee5ec75e5940f 100644
--- a/packages/mui-material/src/Link/Link.js
+++ b/packages/mui-material/src/Link/Link.js
@@ -6,15 +6,14 @@ import { alpha } from '@mui/system/colorManipulator';
import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
import composeClasses from '@mui/utils/composeClasses';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import useIsFocusVisible from '../utils/useIsFocusVisible';
import useForkRef from '../utils/useForkRef';
import Typography from '../Typography';
import linkClasses, { getLinkUtilityClass } from './linkClasses';
import getTextDecoration, { colorTransformations } from './getTextDecoration';
-const useThemeProps = createUseThemeProps('MuiLink');
-
const useUtilityClasses = (ownerState) => {
const { classes, component, focusVisible, underline } = ownerState;
@@ -124,7 +123,7 @@ const LinkRoot = styled(Typography, {
});
const Link = React.forwardRef(function Link(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiLink',
});
diff --git a/packages/mui-material/src/List/List.js b/packages/mui-material/src/List/List.js
index d2eda963fdb226..7e09c8ae812060 100644
--- a/packages/mui-material/src/List/List.js
+++ b/packages/mui-material/src/List/List.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ListContext from './ListContext';
import { getListUtilityClass } from './listClasses';
-const useThemeProps = createUseThemeProps('MuiList');
-
const useUtilityClasses = (ownerState) => {
const { classes, disablePadding, dense, subheader } = ownerState;
@@ -55,7 +54,7 @@ const ListRoot = styled('ul', {
});
const List = React.forwardRef(function List(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiList' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiList' });
const {
children,
className,
diff --git a/packages/mui-material/src/ListItem/ListItem.js b/packages/mui-material/src/ListItem/ListItem.js
index 3597750670b2a3..187bcaf84db17d 100644
--- a/packages/mui-material/src/ListItem/ListItem.js
+++ b/packages/mui-material/src/ListItem/ListItem.js
@@ -7,7 +7,8 @@ import composeClasses from '@mui/utils/composeClasses';
import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
import chainPropTypes from '@mui/utils/chainPropTypes';
import { alpha } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ButtonBase from '../ButtonBase';
import isMuiElement from '../utils/isMuiElement';
import useEnhancedEffect from '../utils/useEnhancedEffect';
@@ -17,8 +18,6 @@ import listItemClasses, { getListItemUtilityClass } from './listItemClasses';
import { listItemButtonClasses } from '../ListItemButton';
import ListItemSecondaryAction from '../ListItemSecondaryAction';
-const useThemeProps = createUseThemeProps('MuiListItem');
-
export const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -205,7 +204,7 @@ const ListItemContainer = styled('li', {
* Uses an additional container component if `ListItemSecondaryAction` is the last child.
*/
const ListItem = React.forwardRef(function ListItem(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiListItem' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiListItem' });
const {
alignItems = 'center',
autoFocus = false,
diff --git a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js
index f7138878c93ac7..e6c360ed238e50 100644
--- a/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js
+++ b/packages/mui-material/src/ListItemAvatar/ListItemAvatar.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import ListContext from '../List/ListContext';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getListItemAvatarUtilityClass } from './listItemAvatarClasses';
-const useThemeProps = createUseThemeProps('MuiListItemAvatar');
-
const useUtilityClasses = (ownerState) => {
const { alignItems, classes } = ownerState;
@@ -46,7 +45,7 @@ const ListItemAvatarRoot = styled('div', {
* A simple wrapper to apply `List` styles to an `Avatar`.
*/
const ListItemAvatar = React.forwardRef(function ListItemAvatar(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiListItemAvatar',
});
diff --git a/packages/mui-material/src/ListItemButton/ListItemButton.js b/packages/mui-material/src/ListItemButton/ListItemButton.js
index 96bcca86416d8e..7c4f5e54573778 100644
--- a/packages/mui-material/src/ListItemButton/ListItemButton.js
+++ b/packages/mui-material/src/ListItemButton/ListItemButton.js
@@ -4,7 +4,8 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
import ButtonBase from '../ButtonBase';
import useEnhancedEffect from '../utils/useEnhancedEffect';
@@ -12,8 +13,6 @@ import useForkRef from '../utils/useForkRef';
import ListContext from '../List/ListContext';
import listItemButtonClasses, { getListItemButtonUtilityClass } from './listItemButtonClasses';
-const useThemeProps = createUseThemeProps('MuiListItemButton');
-
export const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -144,7 +143,7 @@ const ListItemButtonRoot = styled(ButtonBase, {
}));
const ListItemButton = React.forwardRef(function ListItemButton(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiListItemButton' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiListItemButton' });
const {
alignItems = 'center',
autoFocus = false,
diff --git a/packages/mui-material/src/ListItemIcon/ListItemIcon.js b/packages/mui-material/src/ListItemIcon/ListItemIcon.js
index d3d158aef7b68c..310259d5e5d81f 100644
--- a/packages/mui-material/src/ListItemIcon/ListItemIcon.js
+++ b/packages/mui-material/src/ListItemIcon/ListItemIcon.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getListItemIconUtilityClass } from './listItemIconClasses';
import ListContext from '../List/ListContext';
-const useThemeProps = createUseThemeProps('MuiListItemIcon');
-
const useUtilityClasses = (ownerState) => {
const { alignItems, classes } = ownerState;
@@ -48,7 +47,7 @@ const ListItemIconRoot = styled('div', {
* A simple wrapper to apply `List` styles to an `Icon` or `SvgIcon`.
*/
const ListItemIcon = React.forwardRef(function ListItemIcon(inProps, ref) {
- const props = useThemeProps({
+ const props = useDefaultProps({
props: inProps,
name: 'MuiListItemIcon',
});
diff --git a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js
index f91162f6bc3aae..b8269bbf09937a 100644
--- a/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js
+++ b/packages/mui-material/src/ListItemSecondaryAction/ListItemSecondaryAction.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ListContext from '../List/ListContext';
import { getListItemSecondaryActionClassesUtilityClass } from './listItemSecondaryActionClasses';
-const useThemeProps = createUseThemeProps('MuiListItemSecondaryAction');
-
const useUtilityClasses = (ownerState) => {
const { disableGutters, classes } = ownerState;
@@ -48,7 +47,7 @@ const ListItemSecondaryActionRoot = styled('div', {
* @deprecated Use the `secondaryAction` prop in the `ListItem` component instead. This component will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
*/
const ListItemSecondaryAction = React.forwardRef(function ListItemSecondaryAction(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiListItemSecondaryAction' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiListItemSecondaryAction' });
const { className, ...other } = props;
const context = React.useContext(ListContext);
const ownerState = { ...props, disableGutters: context.disableGutters };
diff --git a/packages/mui-material/src/ListItemText/ListItemText.js b/packages/mui-material/src/ListItemText/ListItemText.js
index 0352eecbe62bbf..aa7256d91194ea 100644
--- a/packages/mui-material/src/ListItemText/ListItemText.js
+++ b/packages/mui-material/src/ListItemText/ListItemText.js
@@ -5,11 +5,10 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import Typography from '../Typography';
import ListContext from '../List/ListContext';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import listItemTextClasses, { getListItemTextUtilityClass } from './listItemTextClasses';
-const useThemeProps = createUseThemeProps('MuiListItemText');
-
const useUtilityClasses = (ownerState) => {
const { classes, inset, primary, secondary, dense } = ownerState;
@@ -60,7 +59,7 @@ const ListItemTextRoot = styled('div', {
});
const ListItemText = React.forwardRef(function ListItemText(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiListItemText' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiListItemText' });
const {
children,
className,
diff --git a/packages/mui-material/src/ListSubheader/ListSubheader.js b/packages/mui-material/src/ListSubheader/ListSubheader.js
index 86d530050d3324..279c5e99f31da9 100644
--- a/packages/mui-material/src/ListSubheader/ListSubheader.js
+++ b/packages/mui-material/src/ListSubheader/ListSubheader.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import { getListSubheaderUtilityClass } from './listSubheaderClasses';
-const useThemeProps = createUseThemeProps('MuiListSubheader');
-
const useUtilityClasses = (ownerState) => {
const { classes, color, disableGutters, inset, disableSticky } = ownerState;
@@ -90,7 +89,7 @@ const ListSubheaderRoot = styled('li', {
}));
const ListSubheader = React.forwardRef(function ListSubheader(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiListSubheader' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiListSubheader' });
const {
className,
color = 'default',
diff --git a/packages/mui-material/src/Menu/Menu.js b/packages/mui-material/src/Menu/Menu.js
index 19269471b5d609..821f544ab16e83 100644
--- a/packages/mui-material/src/Menu/Menu.js
+++ b/packages/mui-material/src/Menu/Menu.js
@@ -10,11 +10,10 @@ import { useRtl } from '@mui/system/RtlProvider';
import MenuList from '../MenuList';
import Popover, { PopoverPaper } from '../Popover';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getMenuUtilityClass } from './menuClasses';
-const useThemeProps = createUseThemeProps('MuiMenu');
-
const RTL_ORIGIN = {
vertical: 'top',
horizontal: 'right',
@@ -67,7 +66,7 @@ const MenuMenuList = styled(MenuList, {
});
const Menu = React.forwardRef(function Menu(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiMenu' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiMenu' });
const {
autoFocus = true,
diff --git a/packages/mui-material/src/MenuItem/MenuItem.js b/packages/mui-material/src/MenuItem/MenuItem.js
index 7819d4e76e073d..eb39af185ff660 100644
--- a/packages/mui-material/src/MenuItem/MenuItem.js
+++ b/packages/mui-material/src/MenuItem/MenuItem.js
@@ -5,7 +5,8 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ListContext from '../List/ListContext';
import ButtonBase from '../ButtonBase';
import useEnhancedEffect from '../utils/useEnhancedEffect';
@@ -15,8 +16,6 @@ import { listItemIconClasses } from '../ListItemIcon';
import { listItemTextClasses } from '../ListItemText';
import menuItemClasses, { getMenuItemUtilityClass } from './menuItemClasses';
-const useThemeProps = createUseThemeProps('MuiMenuItem');
-
export const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -163,7 +162,7 @@ const MenuItemRoot = styled(ButtonBase, {
}));
const MenuItem = React.forwardRef(function MenuItem(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiMenuItem' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiMenuItem' });
const {
autoFocus = false,
component = 'li',
diff --git a/packages/mui-material/src/MobileStepper/MobileStepper.js b/packages/mui-material/src/MobileStepper/MobileStepper.js
index 4bda0efad9c004..302863de7e11f5 100644
--- a/packages/mui-material/src/MobileStepper/MobileStepper.js
+++ b/packages/mui-material/src/MobileStepper/MobileStepper.js
@@ -7,12 +7,11 @@ import composeClasses from '@mui/utils/composeClasses';
import Paper from '../Paper';
import capitalize from '../utils/capitalize';
import LinearProgress from '../LinearProgress';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import slotShouldForwardProp from '../styles/slotShouldForwardProp';
import { getMobileStepperUtilityClass } from './mobileStepperClasses';
-const useThemeProps = createUseThemeProps('MuiMobileStepper');
-
const useUtilityClasses = (ownerState) => {
const { classes, position } = ownerState;
@@ -128,7 +127,7 @@ const MobileStepperProgress = styled(LinearProgress, {
});
const MobileStepper = React.forwardRef(function MobileStepper(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiMobileStepper' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiMobileStepper' });
const {
activeStep = 0,
backButton,
diff --git a/packages/mui-material/src/Modal/Modal.js b/packages/mui-material/src/Modal/Modal.js
index 8e7f5f1d9d5166..c3868f0f0e3cdd 100644
--- a/packages/mui-material/src/Modal/Modal.js
+++ b/packages/mui-material/src/Modal/Modal.js
@@ -9,12 +9,11 @@ import { unstable_useModal as useModal } from '@mui/base/unstable_useModal';
import composeClasses from '@mui/utils/composeClasses';
import FocusTrap from '../Unstable_TrapFocus';
import Portal from '../Portal';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Backdrop from '../Backdrop';
import { getModalUtilityClass } from './modalClasses';
-const useThemeProps = createUseThemeProps('MuiModal');
-
const useUtilityClasses = (ownerState) => {
const { open, exited, classes } = ownerState;
@@ -75,7 +74,7 @@ const ModalBackdrop = styled(Backdrop, {
* This component shares many concepts with [react-overlays](https://react-bootstrap.github.io/react-overlays/#modals).
*/
const Modal = React.forwardRef(function Modal(inProps, ref) {
- const props = useThemeProps({ name: 'MuiModal', props: inProps });
+ const props = useDefaultProps({ name: 'MuiModal', props: inProps });
const {
BackdropComponent = ModalBackdrop,
BackdropProps,
diff --git a/packages/mui-material/src/OutlinedInput/OutlinedInput.js b/packages/mui-material/src/OutlinedInput/OutlinedInput.js
index 43a2aaa51e06da..d3812becdfc070 100644
--- a/packages/mui-material/src/OutlinedInput/OutlinedInput.js
+++ b/packages/mui-material/src/OutlinedInput/OutlinedInput.js
@@ -7,7 +7,8 @@ import NotchedOutline from './NotchedOutline';
import useFormControl from '../FormControl/useFormControl';
import formControlState from '../FormControl/formControlState';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import outlinedInputClasses, { getOutlinedInputUtilityClass } from './outlinedInputClasses';
import InputBase, {
rootOverridesResolver as inputBaseRootOverridesResolver,
@@ -16,8 +17,6 @@ import InputBase, {
InputBaseInput,
} from '../InputBase/InputBase';
-const useThemeProps = createUseThemeProps('MuiOutlinedInput');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -181,7 +180,7 @@ const OutlinedInputInput = styled(InputBaseInput, {
}));
const OutlinedInput = React.forwardRef(function OutlinedInput(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiOutlinedInput' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiOutlinedInput' });
const {
components = {},
fullWidth = false,
diff --git a/packages/mui-material/src/Pagination/Pagination.js b/packages/mui-material/src/Pagination/Pagination.js
index 3796474ceb2f9a..56e2610ee2b4e9 100644
--- a/packages/mui-material/src/Pagination/Pagination.js
+++ b/packages/mui-material/src/Pagination/Pagination.js
@@ -7,9 +7,9 @@ import integerPropType from '@mui/utils/integerPropType';
import { getPaginationUtilityClass } from './paginationClasses';
import usePagination from '../usePagination';
import PaginationItem from '../PaginationItem';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
-const useThemeProps = createUseThemeProps('MuiPagination');
+import { useDefaultProps } from '../DefaultPropsProvider';
const useUtilityClasses = (ownerState) => {
const { classes, variant } = ownerState;
@@ -53,7 +53,7 @@ function defaultGetAriaLabel(type, page, selected) {
}
const Pagination = React.forwardRef(function Pagination(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiPagination' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiPagination' });
const {
boundaryCount = 1,
className,
diff --git a/packages/mui-material/src/PaginationItem/PaginationItem.js b/packages/mui-material/src/PaginationItem/PaginationItem.js
index 07c4df53b50452..0a5aca797d497a 100644
--- a/packages/mui-material/src/PaginationItem/PaginationItem.js
+++ b/packages/mui-material/src/PaginationItem/PaginationItem.js
@@ -13,9 +13,9 @@ import LastPageIcon from '../internal/svg-icons/LastPage';
import NavigateBeforeIcon from '../internal/svg-icons/NavigateBefore';
import NavigateNextIcon from '../internal/svg-icons/NavigateNext';
import useSlot from '../utils/useSlot';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
-const useThemeProps = createUseThemeProps('MuiPaginationItem');
+import { useDefaultProps } from '../DefaultPropsProvider';
const overridesResolver = (props, styles) => {
const { ownerState } = props;
@@ -302,7 +302,7 @@ const PaginationItemPageIcon = styled('div', {
}));
const PaginationItem = React.forwardRef(function PaginationItem(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiPaginationItem' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiPaginationItem' });
const {
className,
color = 'standard',
diff --git a/packages/mui-material/src/Paper/Paper.js b/packages/mui-material/src/Paper/Paper.js
index f4b9bbb4ae1bc8..abb07e7966bed5 100644
--- a/packages/mui-material/src/Paper/Paper.js
+++ b/packages/mui-material/src/Paper/Paper.js
@@ -6,12 +6,11 @@ import integerPropType from '@mui/utils/integerPropType';
import chainPropTypes from '@mui/utils/chainPropTypes';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import getOverlayAlpha from '../styles/getOverlayAlpha';
import { getPaperUtilityClass } from './paperClasses';
-const useThemeProps = createUseThemeProps('MuiPaper');
-
const useUtilityClasses = (ownerState) => {
const { square, elevation, variant, classes } = ownerState;
@@ -72,7 +71,7 @@ const PaperRoot = styled('div', {
}));
const Paper = React.forwardRef(function Paper(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiPaper' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiPaper' });
const theme = useTheme();
const {
diff --git a/packages/mui-material/src/Popover/Popover.js b/packages/mui-material/src/Popover/Popover.js
index b0594958bf0595..427818eedef29f 100644
--- a/packages/mui-material/src/Popover/Popover.js
+++ b/packages/mui-material/src/Popover/Popover.js
@@ -9,7 +9,8 @@ import refType from '@mui/utils/refType';
import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
import integerPropType from '@mui/utils/integerPropType';
import chainPropTypes from '@mui/utils/chainPropTypes';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import debounce from '../utils/debounce';
import ownerDocument from '../utils/ownerDocument';
import ownerWindow from '../utils/ownerWindow';
@@ -20,8 +21,6 @@ import PaperBase from '../Paper';
import { getPopoverUtilityClass } from './popoverClasses';
import useSlot from '../utils/useSlot';
-const useThemeProps = createUseThemeProps('MuiPopover');
-
export function getOffsetTop(rect, vertical) {
let offset = 0;
@@ -96,7 +95,7 @@ export const PopoverPaper = styled(PaperBase, {
});
const Popover = React.forwardRef(function Popover(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiPopover' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiPopover' });
const {
action,
anchorEl,
diff --git a/packages/mui-material/src/Radio/Radio.js b/packages/mui-material/src/Radio/Radio.js
index 7aa76e7d0395e6..d3b81667586245 100644
--- a/packages/mui-material/src/Radio/Radio.js
+++ b/packages/mui-material/src/Radio/Radio.js
@@ -12,9 +12,9 @@ import createChainedFunction from '../utils/createChainedFunction';
import useRadioGroup from '../RadioGroup/useRadioGroup';
import radioClasses, { getRadioUtilityClass } from './radioClasses';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
-const useThemeProps = createUseThemeProps('MuiRadio');
+import { useDefaultProps } from '../DefaultPropsProvider';
const useUtilityClasses = (ownerState) => {
const { classes, color, size } = ownerState;
@@ -108,7 +108,7 @@ const defaultCheckedIcon = ;
const defaultIcon = ;
const Radio = React.forwardRef(function Radio(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiRadio' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiRadio' });
const {
checked: checkedProp,
checkedIcon = defaultCheckedIcon,
diff --git a/packages/mui-material/src/Rating/Rating.js b/packages/mui-material/src/Rating/Rating.js
index a61b3dde83c6e6..3648cfb33d344d 100644
--- a/packages/mui-material/src/Rating/Rating.js
+++ b/packages/mui-material/src/Rating/Rating.js
@@ -16,12 +16,11 @@ import {
} from '../utils';
import Star from '../internal/svg-icons/Star';
import StarBorder from '../internal/svg-icons/StarBorder';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import slotShouldForwardProp from '../styles/slotShouldForwardProp';
import ratingClasses, { getRatingUtilityClass } from './ratingClasses';
-const useThemeProps = createUseThemeProps('MuiRating');
-
function getDecimalPrecision(num) {
const decimalPart = num.toString().split('.')[1];
return decimalPart ? decimalPart.length : 0;
@@ -331,7 +330,7 @@ function defaultLabelText(value) {
}
const Rating = React.forwardRef(function Rating(inProps, ref) {
- const props = useThemeProps({ name: 'MuiRating', props: inProps });
+ const props = useDefaultProps({ name: 'MuiRating', props: inProps });
const {
className,
defaultValue = null,
diff --git a/packages/mui-material/src/Skeleton/Skeleton.js b/packages/mui-material/src/Skeleton/Skeleton.js
index 46ad2e2d5c0c02..9321d08c2afbda 100644
--- a/packages/mui-material/src/Skeleton/Skeleton.js
+++ b/packages/mui-material/src/Skeleton/Skeleton.js
@@ -4,11 +4,10 @@ import clsx from 'clsx';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { alpha, unstable_getUnit as getUnit, unstable_toUnitless as toUnitless } from '../styles';
-import { keyframes, css, createUseThemeProps, styled } from '../zero-styled';
+import { keyframes, css, styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getSkeletonUtilityClass } from './skeletonClasses';
-const useThemeProps = createUseThemeProps('MuiSkeleton');
-
const useUtilityClasses = (ownerState) => {
const { classes, variant, animation, hasChildren, width, height } = ownerState;
@@ -200,7 +199,7 @@ const SkeletonRoot = styled('span', {
});
const Skeleton = React.forwardRef(function Skeleton(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSkeleton' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSkeleton' });
const {
animation = 'pulse',
className,
diff --git a/packages/mui-material/src/Slider/Slider.js b/packages/mui-material/src/Slider/Slider.js
index 00c7f49cfcaf81..ada5fda52457f3 100644
--- a/packages/mui-material/src/Slider/Slider.js
+++ b/packages/mui-material/src/Slider/Slider.js
@@ -8,15 +8,14 @@ import composeClasses from '@mui/utils/composeClasses';
import { useSlider, valueToPercent } from '@mui/base/useSlider';
import { alpha, lighten, darken } from '@mui/system/colorManipulator';
import { useRtl } from '@mui/system/RtlProvider';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import slotShouldForwardProp from '../styles/slotShouldForwardProp';
import shouldSpreadAdditionalProps from '../utils/shouldSpreadAdditionalProps';
import capitalize from '../utils/capitalize';
import BaseSliderValueLabel from './SliderValueLabel';
import sliderClasses, { getSliderUtilityClass } from './sliderClasses';
-const useThemeProps = createUseThemeProps('MuiSlider');
-
function Identity(x) {
return x;
}
@@ -531,7 +530,7 @@ const useUtilityClasses = (ownerState) => {
const Forward = ({ children }) => children;
const Slider = React.forwardRef(function Slider(inputProps, ref) {
- const props = useThemeProps({ props: inputProps, name: 'MuiSlider' });
+ const props = useDefaultProps({ props: inputProps, name: 'MuiSlider' });
const isRtl = useRtl();
diff --git a/packages/mui-material/src/Snackbar/Snackbar.js b/packages/mui-material/src/Snackbar/Snackbar.js
index e44634c3679e1f..70abf93913296f 100644
--- a/packages/mui-material/src/Snackbar/Snackbar.js
+++ b/packages/mui-material/src/Snackbar/Snackbar.js
@@ -5,14 +5,13 @@ import { useSlotProps } from '@mui/base/utils';
import composeClasses from '@mui/utils/composeClasses';
import { ClickAwayListener } from '@mui/base/ClickAwayListener';
import { useSnackbar } from '@mui/base/useSnackbar';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import Grow from '../Grow';
import SnackbarContent from '../SnackbarContent';
import { getSnackbarUtilityClass } from './snackbarClasses';
-const useThemeProps = createUseThemeProps('MuiSnackbar');
-
const useUtilityClasses = (ownerState) => {
const { classes, anchorOrigin } = ownerState;
@@ -92,7 +91,7 @@ const SnackbarRoot = styled('div', {
}));
const Snackbar = React.forwardRef(function Snackbar(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSnackbar' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSnackbar' });
const theme = useTheme();
const defaultTransitionDuration = {
enter: theme.transitions.duration.enteringScreen,
diff --git a/packages/mui-material/src/SnackbarContent/SnackbarContent.js b/packages/mui-material/src/SnackbarContent/SnackbarContent.js
index 10e1e774167f23..da761faad762f0 100644
--- a/packages/mui-material/src/SnackbarContent/SnackbarContent.js
+++ b/packages/mui-material/src/SnackbarContent/SnackbarContent.js
@@ -4,12 +4,11 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { emphasize } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Paper from '../Paper';
import { getSnackbarContentUtilityClass } from './snackbarContentClasses';
-const useThemeProps = createUseThemeProps('MuiSnackbarContent');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -70,7 +69,7 @@ const SnackbarContentAction = styled('div', {
});
const SnackbarContent = React.forwardRef(function SnackbarContent(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSnackbarContent' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSnackbarContent' });
const { action, className, message, role = 'alert', ...other } = props;
const ownerState = props;
const classes = useUtilityClasses(ownerState);
diff --git a/packages/mui-material/src/SpeedDial/SpeedDial.js b/packages/mui-material/src/SpeedDial/SpeedDial.js
index 5fec02b848c903..9c9badd4f085da 100644
--- a/packages/mui-material/src/SpeedDial/SpeedDial.js
+++ b/packages/mui-material/src/SpeedDial/SpeedDial.js
@@ -6,7 +6,8 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import useTimeout from '@mui/utils/useTimeout';
import clamp from '@mui/utils/clamp';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Zoom from '../Zoom';
import Fab from '../Fab';
import capitalize from '../utils/capitalize';
@@ -16,8 +17,6 @@ import useControlled from '../utils/useControlled';
import speedDialClasses, { getSpeedDialUtilityClass } from './speedDialClasses';
import useSlot from '../utils/useSlot';
-const useThemeProps = createUseThemeProps('MuiSpeedDial');
-
const useUtilityClasses = (ownerState) => {
const { classes, open, direction } = ownerState;
@@ -143,7 +142,7 @@ const SpeedDialActions = styled('div', {
});
const SpeedDial = React.forwardRef(function SpeedDial(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSpeedDial' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSpeedDial' });
const theme = useTheme();
const defaultTransitionDuration = {
enter: theme.transitions.duration.enteringScreen,
diff --git a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js
index 50729eccf4a4f1..e93a42155ccddc 100644
--- a/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js
+++ b/packages/mui-material/src/SpeedDialAction/SpeedDialAction.js
@@ -5,14 +5,13 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { emphasize } from '@mui/system/colorManipulator';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Fab from '../Fab';
import Tooltip from '../Tooltip';
import capitalize from '../utils/capitalize';
import speedDialActionClasses, { getSpeedDialActionUtilityClass } from './speedDialActionClasses';
-const useThemeProps = createUseThemeProps('MuiSpeedDialAction');
-
const useUtilityClasses = (ownerState) => {
const { open, tooltipPlacement, classes } = ownerState;
@@ -137,7 +136,7 @@ const SpeedDialActionStaticTooltipLabel = styled('span', {
}));
const SpeedDialAction = React.forwardRef(function SpeedDialAction(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSpeedDialAction' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSpeedDialAction' });
const {
className,
delay = 0,
diff --git a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js
index 06dfaebd0ae7bb..9943a79ee0a1d3 100644
--- a/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js
+++ b/packages/mui-material/src/SpeedDialIcon/SpeedDialIcon.js
@@ -3,12 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import AddIcon from '../internal/svg-icons/Add';
import speedDialIconClasses, { getSpeedDialIconUtilityClass } from './speedDialIconClasses';
-const useThemeProps = createUseThemeProps('MuiSpeedDialIcon');
-
const useUtilityClasses = (ownerState) => {
const { classes, open, openIcon } = ownerState;
@@ -84,7 +83,7 @@ const SpeedDialIconRoot = styled('span', {
}));
const SpeedDialIcon = React.forwardRef(function SpeedDialIcon(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSpeedDialIcon' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSpeedDialIcon' });
const { className, icon: iconProp, open, openIcon: openIconProp, ...other } = props;
const ownerState = props;
diff --git a/packages/mui-material/src/Step/Step.js b/packages/mui-material/src/Step/Step.js
index 61bd9567935007..048efdbb8a03a4 100644
--- a/packages/mui-material/src/Step/Step.js
+++ b/packages/mui-material/src/Step/Step.js
@@ -6,11 +6,10 @@ import integerPropType from '@mui/utils/integerPropType';
import composeClasses from '@mui/utils/composeClasses';
import StepperContext from '../Stepper/StepperContext';
import StepContext from './StepContext';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getStepUtilityClass } from './stepClasses';
-const useThemeProps = createUseThemeProps('MuiStep');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation, alternativeLabel, completed } = ownerState;
@@ -54,7 +53,7 @@ const StepRoot = styled('div', {
});
const Step = React.forwardRef(function Step(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStep' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStep' });
const {
active: activeProp,
children,
diff --git a/packages/mui-material/src/StepButton/StepButton.js b/packages/mui-material/src/StepButton/StepButton.js
index a724a65805bc51..86b75c33b6a9f7 100644
--- a/packages/mui-material/src/StepButton/StepButton.js
+++ b/packages/mui-material/src/StepButton/StepButton.js
@@ -3,7 +3,8 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import ButtonBase from '../ButtonBase';
import StepLabel from '../StepLabel';
import isMuiElement from '../utils/isMuiElement';
@@ -11,8 +12,6 @@ import StepperContext from '../Stepper/StepperContext';
import StepContext from '../Step/StepContext';
import stepButtonClasses, { getStepButtonUtilityClass } from './stepButtonClasses';
-const useThemeProps = createUseThemeProps('MuiStepButton');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation } = ownerState;
@@ -57,7 +56,7 @@ const StepButtonRoot = styled(ButtonBase, {
});
const StepButton = React.forwardRef(function StepButton(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepButton' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepButton' });
const { children, className, icon, optional, ...other } = props;
const { disabled, active } = React.useContext(StepContext);
diff --git a/packages/mui-material/src/StepConnector/StepConnector.js b/packages/mui-material/src/StepConnector/StepConnector.js
index a7fb2da0d41939..3d6f439096668b 100644
--- a/packages/mui-material/src/StepConnector/StepConnector.js
+++ b/packages/mui-material/src/StepConnector/StepConnector.js
@@ -4,13 +4,12 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import StepperContext from '../Stepper/StepperContext';
import StepContext from '../Step/StepContext';
import { getStepConnectorUtilityClass } from './stepConnectorClasses';
-const useThemeProps = createUseThemeProps('MuiStepConnector');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation, alternativeLabel, active, completed, disabled } = ownerState;
@@ -98,7 +97,7 @@ const StepConnectorLine = styled('span', {
});
const StepConnector = React.forwardRef(function StepConnector(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepConnector' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepConnector' });
const { className, ...other } = props;
const { alternativeLabel, orientation = 'horizontal' } = React.useContext(StepperContext);
diff --git a/packages/mui-material/src/StepContent/StepContent.js b/packages/mui-material/src/StepContent/StepContent.js
index 528685347c41d0..8584ea779da836 100644
--- a/packages/mui-material/src/StepContent/StepContent.js
+++ b/packages/mui-material/src/StepContent/StepContent.js
@@ -3,14 +3,13 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Collapse from '../Collapse';
import StepperContext from '../Stepper/StepperContext';
import StepContext from '../Step/StepContext';
import { getStepContentUtilityClass } from './stepContentClasses';
-const useThemeProps = createUseThemeProps('MuiStepContent');
-
const useUtilityClasses = (ownerState) => {
const { classes, last } = ownerState;
@@ -53,7 +52,7 @@ const StepContentTransition = styled(Collapse, {
})({});
const StepContent = React.forwardRef(function StepContent(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepContent' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepContent' });
const {
children,
className,
diff --git a/packages/mui-material/src/StepIcon/StepIcon.js b/packages/mui-material/src/StepIcon/StepIcon.js
index 6ed6c6c31ccc5a..f51d3c070ef061 100644
--- a/packages/mui-material/src/StepIcon/StepIcon.js
+++ b/packages/mui-material/src/StepIcon/StepIcon.js
@@ -3,14 +3,13 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import CheckCircle from '../internal/svg-icons/CheckCircle';
import Warning from '../internal/svg-icons/Warning';
import SvgIcon from '../SvgIcon';
import stepIconClasses, { getStepIconUtilityClass } from './stepIconClasses';
-const useThemeProps = createUseThemeProps('MuiStepIcon');
-
const useUtilityClasses = (ownerState) => {
const { classes, active, completed, error } = ownerState;
@@ -54,7 +53,7 @@ const StepIconText = styled('text', {
}));
const StepIcon = React.forwardRef(function StepIcon(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepIcon' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepIcon' });
const {
active = false,
className: classNameProp,
diff --git a/packages/mui-material/src/StepLabel/StepLabel.js b/packages/mui-material/src/StepLabel/StepLabel.js
index e70efaacc6c2f2..41441f449525aa 100644
--- a/packages/mui-material/src/StepLabel/StepLabel.js
+++ b/packages/mui-material/src/StepLabel/StepLabel.js
@@ -6,12 +6,11 @@ import * as React from 'react';
import StepContext from '../Step/StepContext';
import StepIcon from '../StepIcon';
import StepperContext from '../Stepper/StepperContext';
-import { createUseThemeProps, styled } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import stepLabelClasses, { getStepLabelUtilityClass } from './stepLabelClasses';
import useSlot from '../utils/useSlot';
-const useThemeProps = createUseThemeProps('MuiStepLabel');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation, active, completed, error, disabled, alternativeLabel } = ownerState;
@@ -124,7 +123,7 @@ const StepLabelLabelContainer = styled('span', {
}));
const StepLabel = React.forwardRef(function StepLabel(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepLabel' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepLabel' });
const {
children,
className,
diff --git a/packages/mui-material/src/Stepper/Stepper.js b/packages/mui-material/src/Stepper/Stepper.js
index 34d5e8d0dbf35a..d80c29df95ede0 100644
--- a/packages/mui-material/src/Stepper/Stepper.js
+++ b/packages/mui-material/src/Stepper/Stepper.js
@@ -4,13 +4,12 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import integerPropType from '@mui/utils/integerPropType';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getStepperUtilityClass } from './stepperClasses';
import StepConnector from '../StepConnector';
import StepperContext from './StepperContext';
-const useThemeProps = createUseThemeProps('MuiStepper');
-
const useUtilityClasses = (ownerState) => {
const { orientation, nonLinear, alternativeLabel, classes } = ownerState;
const slots = {
@@ -60,7 +59,7 @@ const StepperRoot = styled('div', {
const defaultConnector = ;
const Stepper = React.forwardRef(function Stepper(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiStepper' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiStepper' });
const {
activeStep = 0,
alternativeLabel = false,
diff --git a/packages/mui-material/src/SvgIcon/SvgIcon.js b/packages/mui-material/src/SvgIcon/SvgIcon.js
index 7aeae60d5f7539..04d38dac8b3c27 100644
--- a/packages/mui-material/src/SvgIcon/SvgIcon.js
+++ b/packages/mui-material/src/SvgIcon/SvgIcon.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getSvgIconUtilityClass } from './svgIconClasses';
-const useThemeProps = createUseThemeProps('MuiSvgIcon');
-
const useUtilityClasses = (ownerState) => {
const { color, fontSize, classes } = ownerState;
@@ -92,7 +91,7 @@ const SvgIconRoot = styled('svg', {
}));
const SvgIcon = React.forwardRef(function SvgIcon(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSvgIcon' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSvgIcon' });
const {
children,
className,
diff --git a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js
index 5be8cdab8d0bb6..35a2a03ebb8f14 100644
--- a/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js
+++ b/packages/mui-material/src/SwipeableDrawer/SwipeableDrawer.js
@@ -10,12 +10,11 @@ import ownerDocument from '../utils/ownerDocument';
import ownerWindow from '../utils/ownerWindow';
import useEventCallback from '../utils/useEventCallback';
import useEnhancedEffect from '../utils/useEnhancedEffect';
-import { createUseThemeProps, useTheme } from '../zero-styled';
+import { useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTransitionProps } from '../transitions/utils';
import SwipeArea from './SwipeArea';
-const useThemeProps = createUseThemeProps('MuiSwipeableDrawer');
-
// This value is closed to what browsers are using internally to
// trigger a native scroll.
const UNCERTAINTY_THRESHOLD = 3; // px
@@ -136,7 +135,7 @@ function computeHasNativeHandler({ domTreeShapes, start, current, anchor }) {
const iOS = typeof navigator !== 'undefined' && /iPad|iPhone|iPod/.test(navigator.userAgent);
const SwipeableDrawer = React.forwardRef(function SwipeableDrawer(inProps, ref) {
- const props = useThemeProps({ name: 'MuiSwipeableDrawer', props: inProps });
+ const props = useDefaultProps({ name: 'MuiSwipeableDrawer', props: inProps });
const theme = useTheme();
const transitionDurationDefault = {
enter: theme.transitions.duration.enteringScreen,
diff --git a/packages/mui-material/src/Switch/Switch.js b/packages/mui-material/src/Switch/Switch.js
index 0731297c81972e..f69e5e7ffb799c 100644
--- a/packages/mui-material/src/Switch/Switch.js
+++ b/packages/mui-material/src/Switch/Switch.js
@@ -8,11 +8,10 @@ import composeClasses from '@mui/utils/composeClasses';
import { alpha, darken, lighten } from '@mui/system/colorManipulator';
import capitalize from '../utils/capitalize';
import SwitchBase from '../internal/SwitchBase';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import switchClasses, { getSwitchUtilityClass } from './switchClasses';
-const useThemeProps = createUseThemeProps('MuiSwitch');
-
const useUtilityClasses = (ownerState) => {
const { classes, edge, size, color, checked, disabled } = ownerState;
@@ -216,7 +215,7 @@ const SwitchThumb = styled('span', {
}));
const Switch = React.forwardRef(function Switch(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiSwitch' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiSwitch' });
const { className, color = 'primary', edge = false, size = 'medium', sx, ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/Tab/Tab.js b/packages/mui-material/src/Tab/Tab.js
index 9a466ebf92d76c..ed3fd8ac3a3cf6 100644
--- a/packages/mui-material/src/Tab/Tab.js
+++ b/packages/mui-material/src/Tab/Tab.js
@@ -5,12 +5,11 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import ButtonBase from '../ButtonBase';
import capitalize from '../utils/capitalize';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import unsupportedProp from '../utils/unsupportedProp';
import tabClasses, { getTabUtilityClass } from './tabClasses';
-const useThemeProps = createUseThemeProps('MuiTab');
-
const useUtilityClasses = (ownerState) => {
const { classes, textColor, fullWidth, wrapped, icon, label, selected, disabled } = ownerState;
@@ -186,7 +185,7 @@ const TabRoot = styled(ButtonBase, {
}));
const Tab = React.forwardRef(function Tab(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTab' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTab' });
const {
className,
disabled = false,
diff --git a/packages/mui-material/src/TabScrollButton/TabScrollButton.js b/packages/mui-material/src/TabScrollButton/TabScrollButton.js
index e9a3fa1e476b20..a331bde367a628 100644
--- a/packages/mui-material/src/TabScrollButton/TabScrollButton.js
+++ b/packages/mui-material/src/TabScrollButton/TabScrollButton.js
@@ -9,11 +9,10 @@ import { useRtl } from '@mui/system/RtlProvider';
import KeyboardArrowLeft from '../internal/svg-icons/KeyboardArrowLeft';
import KeyboardArrowRight from '../internal/svg-icons/KeyboardArrowRight';
import ButtonBase from '../ButtonBase';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import tabScrollButtonClasses, { getTabScrollButtonUtilityClass } from './tabScrollButtonClasses';
-const useThemeProps = createUseThemeProps('MuiTabScrollButton');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation, disabled } = ownerState;
@@ -56,7 +55,7 @@ const TabScrollButtonRoot = styled(ButtonBase, {
});
const TabScrollButton = React.forwardRef(function TabScrollButton(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTabScrollButton' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTabScrollButton' });
const {
className,
slots = {},
diff --git a/packages/mui-material/src/Table/Table.js b/packages/mui-material/src/Table/Table.js
index d513e8e4528850..60ddc6b4626b95 100644
--- a/packages/mui-material/src/Table/Table.js
+++ b/packages/mui-material/src/Table/Table.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import TableContext from './TableContext';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTableUtilityClass } from './tableClasses';
-const useThemeProps = createUseThemeProps('MuiTable');
-
const useUtilityClasses = (ownerState) => {
const { classes, stickyHeader } = ownerState;
@@ -52,7 +51,7 @@ const TableRoot = styled('table', {
const defaultComponent = 'table';
const Table = React.forwardRef(function Table(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTable' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTable' });
const {
className,
component = defaultComponent,
diff --git a/packages/mui-material/src/TableBody/TableBody.js b/packages/mui-material/src/TableBody/TableBody.js
index 9116e8274d0cb1..40ad6e652d8fdf 100644
--- a/packages/mui-material/src/TableBody/TableBody.js
+++ b/packages/mui-material/src/TableBody/TableBody.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import Tablelvl2Context from '../Table/Tablelvl2Context';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTableBodyUtilityClass } from './tableBodyClasses';
-const useThemeProps = createUseThemeProps('MuiTableBody');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -34,7 +33,7 @@ const tablelvl2 = {
const defaultComponent = 'tbody';
const TableBody = React.forwardRef(function TableBody(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableBody' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableBody' });
const { className, component = defaultComponent, ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/TableCell/TableCell.js b/packages/mui-material/src/TableCell/TableCell.js
index 71a8c53e1013a2..b4180528e0e370 100644
--- a/packages/mui-material/src/TableCell/TableCell.js
+++ b/packages/mui-material/src/TableCell/TableCell.js
@@ -7,11 +7,10 @@ import { darken, alpha, lighten } from '@mui/system/colorManipulator';
import capitalize from '../utils/capitalize';
import TableContext from '../Table/TableContext';
import Tablelvl2Context from '../Table/Tablelvl2Context';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import tableCellClasses, { getTableCellUtilityClass } from './tableCellClasses';
-const useThemeProps = createUseThemeProps('MuiTableCell');
-
const useUtilityClasses = (ownerState) => {
const { classes, variant, align, padding, size, stickyHeader } = ownerState;
@@ -171,7 +170,7 @@ const TableCellRoot = styled('td', {
* or otherwise a `` element.
*/
const TableCell = React.forwardRef(function TableCell(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableCell' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableCell' });
const {
align = 'inherit',
className,
diff --git a/packages/mui-material/src/TableContainer/TableContainer.js b/packages/mui-material/src/TableContainer/TableContainer.js
index f786b6192e247b..1140e605cf4220 100644
--- a/packages/mui-material/src/TableContainer/TableContainer.js
+++ b/packages/mui-material/src/TableContainer/TableContainer.js
@@ -3,11 +3,10 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTableContainerUtilityClass } from './tableContainerClasses';
-const useThemeProps = createUseThemeProps('MuiTableContainer');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -28,7 +27,7 @@ const TableContainerRoot = styled('div', {
});
const TableContainer = React.forwardRef(function TableContainer(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableContainer' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableContainer' });
const { className, component = 'div', ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/TableFooter/TableFooter.js b/packages/mui-material/src/TableFooter/TableFooter.js
index 5de3b7d0a3909d..5f652088392255 100644
--- a/packages/mui-material/src/TableFooter/TableFooter.js
+++ b/packages/mui-material/src/TableFooter/TableFooter.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import Tablelvl2Context from '../Table/Tablelvl2Context';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTableFooterUtilityClass } from './tableFooterClasses';
-const useThemeProps = createUseThemeProps('MuiTableFooter');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -34,7 +33,7 @@ const tablelvl2 = {
const defaultComponent = 'tfoot';
const TableFooter = React.forwardRef(function TableFooter(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableFooter' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableFooter' });
const { className, component = defaultComponent, ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/TableHead/TableHead.js b/packages/mui-material/src/TableHead/TableHead.js
index 32943035f0911b..4724d8d0534ef0 100644
--- a/packages/mui-material/src/TableHead/TableHead.js
+++ b/packages/mui-material/src/TableHead/TableHead.js
@@ -4,11 +4,10 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import Tablelvl2Context from '../Table/Tablelvl2Context';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getTableHeadUtilityClass } from './tableHeadClasses';
-const useThemeProps = createUseThemeProps('MuiTableHead');
-
const useUtilityClasses = (ownerState) => {
const { classes } = ownerState;
@@ -34,7 +33,7 @@ const tablelvl2 = {
const defaultComponent = 'thead';
const TableHead = React.forwardRef(function TableHead(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableHead' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableHead' });
const { className, component = defaultComponent, ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/TablePagination/TablePagination.js b/packages/mui-material/src/TablePagination/TablePagination.js
index 3aad5afa263e01..e55660a64c54f2 100644
--- a/packages/mui-material/src/TablePagination/TablePagination.js
+++ b/packages/mui-material/src/TablePagination/TablePagination.js
@@ -6,7 +6,8 @@ import integerPropType from '@mui/utils/integerPropType';
import chainPropTypes from '@mui/utils/chainPropTypes';
import { isHostComponent } from '@mui/base/utils';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import InputBase from '../InputBase';
import MenuItem from '../MenuItem';
import Select from '../Select';
@@ -16,8 +17,6 @@ import TablePaginationActions from './TablePaginationActions';
import useId from '../utils/useId';
import tablePaginationClasses, { getTablePaginationUtilityClass } from './tablePaginationClasses';
-const useThemeProps = createUseThemeProps('MuiTablePagination');
-
const TablePaginationRoot = styled(TableCell, {
name: 'MuiTablePagination',
slot: 'Root',
@@ -140,7 +139,7 @@ const useUtilityClasses = (ownerState) => {
* A `TableCell` based component for placing inside `TableFooter` for pagination.
*/
const TablePagination = React.forwardRef(function TablePagination(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTablePagination' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTablePagination' });
const {
ActionsComponent = TablePaginationActions,
backIconButtonProps,
diff --git a/packages/mui-material/src/TableRow/TableRow.js b/packages/mui-material/src/TableRow/TableRow.js
index d96f9fce5745d4..eec9ee944c429c 100644
--- a/packages/mui-material/src/TableRow/TableRow.js
+++ b/packages/mui-material/src/TableRow/TableRow.js
@@ -5,11 +5,10 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
import Tablelvl2Context from '../Table/Tablelvl2Context';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import tableRowClasses, { getTableRowUtilityClass } from './tableRowClasses';
-const useThemeProps = createUseThemeProps('MuiTableRow');
-
const useUtilityClasses = (ownerState) => {
const { classes, selected, hover, head, footer } = ownerState;
@@ -58,7 +57,7 @@ const defaultComponent = 'tr';
* based on the material table element parent (head, body, etc).
*/
const TableRow = React.forwardRef(function TableRow(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableRow' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableRow' });
const {
className,
component = defaultComponent,
diff --git a/packages/mui-material/src/TableSortLabel/TableSortLabel.js b/packages/mui-material/src/TableSortLabel/TableSortLabel.js
index 67da18573c774b..dee42f5355b249 100644
--- a/packages/mui-material/src/TableSortLabel/TableSortLabel.js
+++ b/packages/mui-material/src/TableSortLabel/TableSortLabel.js
@@ -5,12 +5,11 @@ import PropTypes from 'prop-types';
import * as React from 'react';
import ButtonBase from '../ButtonBase';
import ArrowDownwardIcon from '../internal/svg-icons/ArrowDownward';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import tableSortLabelClasses, { getTableSortLabelUtilityClass } from './tableSortLabelClasses';
-const useThemeProps = createUseThemeProps('MuiTableSortLabel');
-
const useUtilityClasses = (ownerState) => {
const { classes, direction, active } = ownerState;
@@ -95,7 +94,7 @@ const TableSortLabelIcon = styled('span', {
* A button based label for placing inside `TableCell` for column sorting.
*/
const TableSortLabel = React.forwardRef(function TableSortLabel(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTableSortLabel' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTableSortLabel' });
const {
active = false,
children,
diff --git a/packages/mui-material/src/Tabs/Tabs.js b/packages/mui-material/src/Tabs/Tabs.js
index 435b0702ddb6f9..6d02a527234fb8 100644
--- a/packages/mui-material/src/Tabs/Tabs.js
+++ b/packages/mui-material/src/Tabs/Tabs.js
@@ -7,7 +7,8 @@ import refType from '@mui/utils/refType';
import { useSlotProps } from '@mui/base/utils';
import composeClasses from '@mui/utils/composeClasses';
import { useRtl } from '@mui/system/RtlProvider';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import debounce from '../utils/debounce';
import animate from '../internal/animate';
import ScrollbarSize from './ScrollbarSize';
@@ -17,8 +18,6 @@ import tabsClasses, { getTabsUtilityClass } from './tabsClasses';
import ownerDocument from '../utils/ownerDocument';
import ownerWindow from '../utils/ownerWindow';
-const useThemeProps = createUseThemeProps('MuiTabs');
-
const nextItem = (list, item) => {
if (list === item) {
return list.firstChild;
@@ -274,7 +273,7 @@ const defaultIndicatorStyle = {};
let warnedOnceTabPresent = false;
const Tabs = React.forwardRef(function Tabs(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTabs' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTabs' });
const theme = useTheme();
const isRtl = useRtl();
const {
diff --git a/packages/mui-material/src/TextField/TextField.js b/packages/mui-material/src/TextField/TextField.js
index 6f0c0d14c0cade..4efdcc9124f01a 100644
--- a/packages/mui-material/src/TextField/TextField.js
+++ b/packages/mui-material/src/TextField/TextField.js
@@ -5,7 +5,8 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import useId from '@mui/utils/useId';
import refType from '@mui/utils/refType';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import Input from '../Input';
import FilledInput from '../FilledInput';
import OutlinedInput from '../OutlinedInput';
@@ -16,8 +17,6 @@ import Select from '../Select';
import { getTextFieldUtilityClass } from './textFieldClasses';
import useSlot from '../utils/useSlot';
-const useThemeProps = createUseThemeProps('MuiTextField');
-
const variantComponent = {
standard: Input,
filled: FilledInput,
@@ -73,7 +72,7 @@ const TextFieldRoot = styled(FormControl, {
* - using the underlying components directly as shown in the demos
*/
const TextField = React.forwardRef(function TextField(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTextField' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTextField' });
const {
autoComplete,
autoFocus = false,
diff --git a/packages/mui-material/src/ToggleButton/ToggleButton.js b/packages/mui-material/src/ToggleButton/ToggleButton.js
index f80211201960b8..4515537658200d 100644
--- a/packages/mui-material/src/ToggleButton/ToggleButton.js
+++ b/packages/mui-material/src/ToggleButton/ToggleButton.js
@@ -8,14 +8,13 @@ import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
import ButtonBase from '../ButtonBase';
import capitalize from '../utils/capitalize';
-import { createUseThemeProps, styled } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import toggleButtonClasses, { getToggleButtonUtilityClass } from './toggleButtonClasses';
import ToggleButtonGroupContext from '../ToggleButtonGroup/ToggleButtonGroupContext';
import ToggleButtonGroupButtonContext from '../ToggleButtonGroup/ToggleButtonGroupButtonContext';
import isValueSelected from '../ToggleButtonGroup/isValueSelected';
-const useThemeProps = createUseThemeProps('MuiToggleButton');
-
const useUtilityClasses = (ownerState) => {
const { classes, fullWidth, selected, disabled, size, color } = ownerState;
@@ -147,7 +146,7 @@ const ToggleButton = React.forwardRef(function ToggleButton(inProps, ref) {
{ ...contextProps, selected: isValueSelected(inProps.value, contextValue) },
inProps,
);
- const props = useThemeProps({ props: resolvedProps, name: 'MuiToggleButton' });
+ const props = useDefaultProps({ props: resolvedProps, name: 'MuiToggleButton' });
const {
children,
className,
diff --git a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js
index 73e31065a0c4c1..a817027acf3fc2 100644
--- a/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js
+++ b/packages/mui-material/src/ToggleButtonGroup/ToggleButtonGroup.js
@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import getValidReactChildren from '@mui/utils/getValidReactChildren';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import toggleButtonGroupClasses, {
getToggleButtonGroupUtilityClass,
@@ -14,8 +15,6 @@ import ToggleButtonGroupContext from './ToggleButtonGroupContext';
import ToggleButtonGroupButtonContext from './ToggleButtonGroupButtonContext';
import toggleButtonClasses from '../ToggleButton/toggleButtonClasses';
-const useThemeProps = createUseThemeProps('MuiToggleButtonGroup');
-
const useUtilityClasses = (ownerState) => {
const { classes, orientation, fullWidth, disabled } = ownerState;
@@ -125,7 +124,7 @@ const ToggleButtonGroupRoot = styled('div', {
}));
const ToggleButtonGroup = React.forwardRef(function ToggleButtonGroup(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiToggleButtonGroup' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiToggleButtonGroup' });
const {
children,
className,
diff --git a/packages/mui-material/src/Toolbar/Toolbar.js b/packages/mui-material/src/Toolbar/Toolbar.js
index 6a9733d2680580..3e6458f477c6f8 100644
--- a/packages/mui-material/src/Toolbar/Toolbar.js
+++ b/packages/mui-material/src/Toolbar/Toolbar.js
@@ -3,11 +3,10 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps } from '../zero-styled';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import { getToolbarUtilityClass } from './toolbarClasses';
-const useThemeProps = createUseThemeProps('MuiToolbar');
-
const useUtilityClasses = (ownerState) => {
const { classes, disableGutters, variant } = ownerState;
@@ -60,7 +59,7 @@ const ToolbarRoot = styled('div', {
}));
const Toolbar = React.forwardRef(function Toolbar(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiToolbar' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiToolbar' });
const {
className,
component = 'div',
diff --git a/packages/mui-material/src/Tooltip/Tooltip.js b/packages/mui-material/src/Tooltip/Tooltip.js
index 512e79347176e2..f9425f6f6a3430 100644
--- a/packages/mui-material/src/Tooltip/Tooltip.js
+++ b/packages/mui-material/src/Tooltip/Tooltip.js
@@ -8,7 +8,8 @@ import { appendOwnerState } from '@mui/base/utils';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
import { useRtl } from '@mui/system/RtlProvider';
-import { styled, createUseThemeProps, useTheme } from '../zero-styled';
+import { styled, useTheme } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import Grow from '../Grow';
import Popper from '../Popper';
@@ -19,8 +20,6 @@ import useIsFocusVisible from '../utils/useIsFocusVisible';
import useControlled from '../utils/useControlled';
import tooltipClasses, { getTooltipUtilityClass } from './tooltipClasses';
-const useThemeProps = createUseThemeProps('MuiTooltip');
-
function round(value) {
return Math.round(value * 1e5) / 1e5;
}
@@ -305,7 +304,7 @@ function composeEventHandler(handler, eventHandler) {
// TODO v6: Remove PopperComponent, PopperProps, TransitionComponent and TransitionProps.
const Tooltip = React.forwardRef(function Tooltip(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiTooltip' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiTooltip' });
const {
arrow = false,
children: childrenProp,
diff --git a/packages/mui-material/src/Typography/Typography.js b/packages/mui-material/src/Typography/Typography.js
index 11c5e434c778aa..394d708564231a 100644
--- a/packages/mui-material/src/Typography/Typography.js
+++ b/packages/mui-material/src/Typography/Typography.js
@@ -3,11 +3,11 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
-import { styled, createUseThemeProps, internal_createExtendSxProp } from '../zero-styled';
+import { styled, internal_createExtendSxProp } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
import capitalize from '../utils/capitalize';
import { getTypographyUtilityClass } from './typographyClasses';
-const useThemeProps = createUseThemeProps('MuiTypography');
const extendSxProp = internal_createExtendSxProp();
const useUtilityClasses = (ownerState) => {
@@ -127,7 +127,7 @@ const colorTransformations = {
};
const Typography = React.forwardRef(function Typography(inProps, ref) {
- const { color, ...themeProps } = useThemeProps({ props: inProps, name: 'MuiTypography' });
+ const { color, ...themeProps } = useDefaultProps({ props: inProps, name: 'MuiTypography' });
const textColor = colorTransformations[color];
const props = extendSxProp({
...themeProps,
diff --git a/packages/mui-material/src/zero-styled/index.tsx b/packages/mui-material/src/zero-styled/index.tsx
index fa7a468615daba..e56c98cf9182d1 100644
--- a/packages/mui-material/src/zero-styled/index.tsx
+++ b/packages/mui-material/src/zero-styled/index.tsx
@@ -1,6 +1,5 @@
import * as React from 'react';
import { extendSxProp } from '@mui/system/styleFunctionSx';
-import useThemeProps from '../styles/useThemeProps';
import useTheme from '../styles/useTheme';
import GlobalStyles, { GlobalStylesProps } from '../GlobalStyles';
@@ -14,11 +13,6 @@ export function globalCss(styles: GlobalStylesProps['styles']) {
};
}
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function createUseThemeProps(name: string) {
- return useThemeProps;
-}
-
// eslint-disable-next-line @typescript-eslint/naming-convention
export function internal_createExtendSxProp() {
return extendSxProp;
diff --git a/packages/mui-system/src/DefaultPropsProvider/DefaultPropsProvider.tsx b/packages/mui-system/src/DefaultPropsProvider/DefaultPropsProvider.tsx
new file mode 100644
index 00000000000000..0c6435addd90c6
--- /dev/null
+++ b/packages/mui-system/src/DefaultPropsProvider/DefaultPropsProvider.tsx
@@ -0,0 +1,61 @@
+'use client';
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import resolveProps from '@mui/utils/resolveProps';
+
+const PropsContext = React.createContext | undefined>(undefined);
+
+function DefaultPropsProvider({
+ value,
+ children,
+}: React.PropsWithChildren<{ value: Record | undefined }>) {
+ return {children} ;
+}
+
+DefaultPropsProvider.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * @ignore
+ */
+ children: PropTypes.node,
+ /**
+ * @ignore
+ */
+ value: PropTypes.object,
+} as any;
+
+function getThemeProps<
+ Theme extends {
+ components?: Record;
+ },
+ Props,
+ Name extends string,
+>(params: { props: Props; name: Name; theme?: Theme }): Props {
+ const { theme, name, props } = params;
+
+ if (!theme || !theme.components || !theme.components[name]) {
+ return props;
+ }
+ const config = theme.components[name];
+
+ if (config.defaultProps) {
+ // compatible with v5 signature
+ return resolveProps(config.defaultProps, props);
+ }
+
+ if (!config.styleOverrides && !config.variants) {
+ // v6 signature, no property 'defaultProps'
+ return resolveProps(config as any, props);
+ }
+ return props;
+}
+
+export function useDefaultProps({ props, name }: { props: Props; name: string }) {
+ const ctx = React.useContext(PropsContext);
+ return getThemeProps({ props, name, theme: { components: ctx } });
+}
+
+export default DefaultPropsProvider;
diff --git a/packages/mui-system/src/DefaultPropsProvider/index.ts b/packages/mui-system/src/DefaultPropsProvider/index.ts
new file mode 100644
index 00000000000000..646b9a27128699
--- /dev/null
+++ b/packages/mui-system/src/DefaultPropsProvider/index.ts
@@ -0,0 +1 @@
+export { default, useDefaultProps } from './DefaultPropsProvider';
diff --git a/packages/mui-system/src/ThemeProvider/ThemeProvider.js b/packages/mui-system/src/ThemeProvider/ThemeProvider.js
index 760b4c4645ee50..71f7fec85e9095 100644
--- a/packages/mui-system/src/ThemeProvider/ThemeProvider.js
+++ b/packages/mui-system/src/ThemeProvider/ThemeProvider.js
@@ -9,6 +9,7 @@ import exactProp from '@mui/utils/exactProp';
import { ThemeContext as StyledEngineThemeContext } from '@mui/styled-engine';
import useThemeWithoutDefault from '../useThemeWithoutDefault';
import RtlProvider from '../RtlProvider';
+import DefaultPropsProvider from '../DefaultPropsProvider';
const EMPTY_THEME = {};
@@ -67,7 +68,9 @@ function ThemeProvider(props) {
return (
- {children}
+
+ {children}
+
);
diff --git a/packages/mui-system/src/cssVars/createCssVarsProvider.test.js b/packages/mui-system/src/cssVars/createCssVarsProvider.test.js
index f011109d6a28ff..53330ceb47507c 100644
--- a/packages/mui-system/src/cssVars/createCssVarsProvider.test.js
+++ b/packages/mui-system/src/cssVars/createCssVarsProvider.test.js
@@ -734,14 +734,16 @@ describe('createCssVarsProvider', () => {
const { CssVarsProvider } = createCssVarsProvider({
theme: createCssVarsTheme({
colorSchemes: { light: { fontSize: 16 } },
- components: 'any',
+ components: {
+ foo: 'bar',
+ },
}),
defaultColorScheme: 'light',
});
function Text() {
const theme = useTheme();
- return {theme.vars.components}
;
+ return {theme.vars.components?.foo}
;
}
render(
@@ -749,7 +751,7 @@ describe('createCssVarsProvider', () => {
,
);
- expect(screen.getByTestId('text').textContent).not.to.equal('var(--components)');
+ expect(screen.getByTestId('text').textContent).not.to.equal('var(--components-foo)');
});
it('`defaultMode` is specified', () => {
From 9476434bf51c7012cc401968b4c91ee3cd49c114 Mon Sep 17 00:00:00 2001
From: Daniel Khakbaz
Date: Thu, 20 Jun 2024 15:24:30 +0330
Subject: [PATCH 17/65] [docs][material-ui][Select] Fix the `SelectAutoWidth`
demo menu item value (#42648)
Signed-off-by: Daniel Khakbaz
Co-authored-by: ZeeshanTamboli
---
docs/data/material/components/selects/SelectAutoWidth.js | 2 +-
docs/data/material/components/selects/SelectAutoWidth.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/data/material/components/selects/SelectAutoWidth.js b/docs/data/material/components/selects/SelectAutoWidth.js
index e47d0de7d21b6c..0d56a041c980f4 100644
--- a/docs/data/material/components/selects/SelectAutoWidth.js
+++ b/docs/data/material/components/selects/SelectAutoWidth.js
@@ -26,7 +26,7 @@ export default function SelectAutoWidth() {
None
- Twenty
+ Twenty
Twenty one
Twenty one and a half
diff --git a/docs/data/material/components/selects/SelectAutoWidth.tsx b/docs/data/material/components/selects/SelectAutoWidth.tsx
index c8688083fd33f9..8f0c8a7acb3d96 100644
--- a/docs/data/material/components/selects/SelectAutoWidth.tsx
+++ b/docs/data/material/components/selects/SelectAutoWidth.tsx
@@ -26,7 +26,7 @@ export default function SelectAutoWidth() {
None
- Twenty
+ Twenty
Twenty one
Twenty one and a half
From a6ecef359b69844e06f3d57659fb864ecd398bb0 Mon Sep 17 00:00:00 2001
From: Alexandre Fauquette <45398769+alexfauquette@users.noreply.github.com>
Date: Fri, 21 Jun 2024 09:10:17 +0200
Subject: [PATCH 18/65] [docs] Fix 301 links (#42697)
---
docs/pages/blog/mui-x-end-v6-features.md | 2 +-
docs/pages/blog/mui-x-mid-v6-features.md | 2 +-
docs/src/components/pricing/PricingTable.tsx | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/pages/blog/mui-x-end-v6-features.md b/docs/pages/blog/mui-x-end-v6-features.md
index e350c4af838be7..b105d483733837 100644
--- a/docs/pages/blog/mui-x-end-v6-features.md
+++ b/docs/pages/blog/mui-x-end-v6-features.md
@@ -146,7 +146,7 @@ Most notably:
- New UI for column management
- Pivoting for the [Premium](/x/react-data-grid/#premium-plan) version
-We'll continue to expand our portfolio of Charts, including [Heatmap](/x/react-charts/heat-map/), [Funnel](/x/react-charts/funnel/), and [Gantt](/x/react-charts/gantt/); and explore virtualization and other advanced use cases for the Tree View component.
+We'll continue to expand our portfolio of Charts, including [Heatmap](/x/react-charts/heatmap/), [Funnel](/x/react-charts/funnel/), and [Gantt](/x/react-charts/gantt/); and explore virtualization and other advanced use cases for the Tree View component.
We encourage you to upvote issues on GitHub to help us prioritize.
Your input directly influences our development schedule, so don't hesitate to let us know what matters most to you!
diff --git a/docs/pages/blog/mui-x-mid-v6-features.md b/docs/pages/blog/mui-x-mid-v6-features.md
index 8348b66c7e2baa..c8d8b3fad5152b 100644
--- a/docs/pages/blog/mui-x-mid-v6-features.md
+++ b/docs/pages/blog/mui-x-mid-v6-features.md
@@ -112,7 +112,7 @@ Check out the video below, highlighting some of our Charts:
As we progress toward the stable version, we're committed to enhancing the overall experience for developers and users, so your feedback is fundamental!
-We will also steadily expand our portfolio with new chart types such as [Heatmap](https://mui.com/x/react-charts/heat-map/), [Funnel](https://mui.com/x/react-charts/funnel/), [Gantt](https://mui.com/x/react-charts/gantt/), and more.
+We will also steadily expand our portfolio with new chart types such as [Heatmap](https://mui.com/x/react-charts/heatmap/), [Funnel](https://mui.com/x/react-charts/funnel/), [Gantt](https://mui.com/x/react-charts/gantt/), and more.
If there's a specific chart visualization you'd like us to prioritize, we encourage you to upvote the respective [issue on GitHub](https://github.com/mui/mui-x/issues?q=is%3Aissue+is%3Aopen+label%3A%22component%3A+charts%22+label%3A%22waiting+for+%F0%9F%91%8D%22).
Your input can directly influence our development schedule, so don't hesitate to let us know what matters most to you!
diff --git a/docs/src/components/pricing/PricingTable.tsx b/docs/src/components/pricing/PricingTable.tsx
index ebbb229409f9b3..e6f59ff66df62f 100644
--- a/docs/src/components/pricing/PricingTable.tsx
+++ b/docs/src/components/pricing/PricingTable.tsx
@@ -597,8 +597,8 @@ const rowHeaders: Record = {
'charts/pie': ,
'charts/sparkline': ,
'charts/gauge': ,
- 'charts/treemap': ,
- 'charts/heatmap': ,
+ 'charts/treemap': ,
+ 'charts/heatmap': ,
'charts/radar': ,
'charts/funnel': ,
'charts/sankey': ,
From e8abc17d5c4c1f759e926ece44489d22884b54b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 14:12:10 +0200
Subject: [PATCH 19/65] Bump marked to ^13.0.0 (#42665)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ZeeshanTamboli
---
docs/package.json | 2 +-
packages/markdown/package.json | 2 +-
packages/markdown/parseMarkdown.js | 24 +++++++++++++-----------
pnpm-lock.yaml | 16 ++++++++--------
4 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/docs/package.json b/docs/package.json
index 3b0219898c1d55..664709cbb1e37a 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -132,7 +132,7 @@
"chai": "^4.4.1",
"cross-fetch": "^4.0.0",
"gm": "^1.25.0",
- "marked": "^5.1.2",
+ "marked": "^13.0.0",
"playwright": "^1.44.1",
"prettier": "^3.3.2",
"tailwindcss": "^3.4.4",
diff --git a/packages/markdown/package.json b/packages/markdown/package.json
index 69a4515e45a0fb..643f36fccae791 100644
--- a/packages/markdown/package.json
+++ b/packages/markdown/package.json
@@ -22,7 +22,7 @@
"dependencies": {
"@babel/runtime": "^7.24.7",
"lodash": "^4.17.21",
- "marked": "^5.1.2",
+ "marked": "^13.0.0",
"prismjs": "^1.29.0"
},
"devDependencies": {
diff --git a/packages/markdown/parseMarkdown.js b/packages/markdown/parseMarkdown.js
index d0f1fd3cdab0c3..3432a346e2e728 100644
--- a/packages/markdown/parseMarkdown.js
+++ b/packages/markdown/parseMarkdown.js
@@ -309,12 +309,13 @@ function createRender(context) {
*/
function render(markdown) {
const renderer = new marked.Renderer();
- renderer.heading = (headingHtml, level) => {
+ renderer.heading = function heading({ tokens, depth: level }) {
// Main title, no need for an anchor.
// It adds noises to the URL.
//
// Small title, no need for an anchor.
// It reduces the risk of duplicated id and it's fewer elements in the DOM.
+ const headingHtml = this.parser.parseInline(tokens);
if (level === 1 || level >= 4) {
return `${headingHtml} `;
}
@@ -372,11 +373,12 @@ function createRender(context) {
``,
].join('');
};
- renderer.link = (href, linkTitle, linkText) => {
+ renderer.link = function link({ href, title, tokens }) {
+ const linkText = this.parser.parseInline(tokens);
let more = '';
- if (linkTitle) {
- more += ` title="${linkTitle}"`;
+ if (title) {
+ more += ` title="${title}"`;
}
if (noSEOadvantage.some((domain) => href.indexOf(domain) !== -1)) {
@@ -404,17 +406,17 @@ function createRender(context) {
return `${linkText} `;
};
- renderer.code = (code, infostring, escaped) => {
+ renderer.code = ({ lang, text, escaped }) => {
// https://github.com/markedjs/marked/blob/30e90e5175700890e6feb1836c57b9404c854466/src/Renderer.js#L15
- const lang = (infostring || '').match(/\S*/)[0];
- const title = (infostring || '').match(/title="([^"]*)"/)?.[1];
- const out = prism(code, lang);
- if (out != null && out !== code) {
+ const langString = (lang || '').match(/\S*/)[0];
+ const title = (lang || '').match(/title="([^"]*)"/)?.[1];
+ const out = prism(text, langString);
+ if (out != null && out !== text) {
escaped = true;
- code = out;
+ text = out;
}
- code = `${code.replace(/\n$/, '')}\n`;
+ const code = `${text.replace(/\n$/, '')}\n`;
if (!lang) {
return `${escaped ? code : escape(code, true)}
\n`;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4b0b8fc6927a7..831d0c0d465769 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -888,8 +888,8 @@ importers:
specifier: ^1.25.0
version: 1.25.0
marked:
- specifier: ^5.1.2
- version: 5.1.2
+ specifier: ^13.0.0
+ version: 13.0.0
playwright:
specifier: ^1.44.1
version: 1.44.1
@@ -1252,8 +1252,8 @@ importers:
specifier: ^4.17.21
version: 4.17.21
marked:
- specifier: ^5.1.2
- version: 5.1.2
+ specifier: ^13.0.0
+ version: 13.0.0
prismjs:
specifier: ^1.29.0
version: 1.29.0
@@ -9123,9 +9123,9 @@ packages:
resolution: {integrity: sha512-qwGyuyKwjkEMOJ10XN6OTKNOVYvOIi35RNvDLNxTof5s8UmyGHlCdpngRHoRGNvQVGuxO3BJ7uNSgdeX166WXw==}
engines: {node: '>=18'}
- marked@5.1.2:
- resolution: {integrity: sha512-ahRPGXJpjMjwSOlBoTMZAK7ATXkli5qCPxZ21TG44rx1KEo44bii4ekgTDQPNRQ4Kh7JMb9Ub1PVk1NxRSsorg==}
- engines: {node: '>= 16'}
+ marked@13.0.0:
+ resolution: {integrity: sha512-VTeDCd9txf4KLLljUZ0nljE/Incb9SrWuueE44QVuU0pkOdh4sfCeW1Z6lPcxyDRSVY6rm8db/0OPaN75RNUmw==}
+ engines: {node: '>= 18'}
hasBin: true
marky@1.2.5:
@@ -20886,7 +20886,7 @@ snapshots:
markdown-it: 14.1.0
markdownlint-micromark: 0.1.9
- marked@5.1.2: {}
+ marked@13.0.0: {}
marky@1.2.5: {}
From b9b9c217dc069ffc51f80980c58b1a987e80d55f Mon Sep 17 00:00:00 2001
From: Alex Liu
Date: Sat, 22 Jun 2024 00:51:44 +0800
Subject: [PATCH 20/65] [material-ui][usePagination] Update pagination
`siblingsEnd` calculation logic (#42667)
Co-authored-by: ZeeshanTamboli
---
packages/mui-material/src/usePagination/usePagination.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/mui-material/src/usePagination/usePagination.js b/packages/mui-material/src/usePagination/usePagination.js
index 63cd2d10cc4c0e..999a419cf4d589 100644
--- a/packages/mui-material/src/usePagination/usePagination.js
+++ b/packages/mui-material/src/usePagination/usePagination.js
@@ -63,7 +63,7 @@ export default function usePagination(props = {}) {
boundaryCount + siblingCount * 2 + 2,
),
// Less than endPages
- endPages.length > 0 ? endPages[0] - 2 : count - 1,
+ count - boundaryCount - 1,
);
// Basic list of items to render
From 9ffa010dfb051830aad0a4d8f611caec6e64bd3b Mon Sep 17 00:00:00 2001
From: Diego Andai
Date: Fri, 21 Jun 2024 14:37:25 -0400
Subject: [PATCH 21/65] [material-ui][Autocomplete] Fix renderOption props type
(#42689)
---
packages/mui-material/src/Autocomplete/Autocomplete.d.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts
index 8c12280c8ea32d..ab215eeae54cef 100644
--- a/packages/mui-material/src/Autocomplete/Autocomplete.d.ts
+++ b/packages/mui-material/src/Autocomplete/Autocomplete.d.ts
@@ -325,7 +325,7 @@ export interface AutocompleteProps<
* @returns {ReactNode}
*/
renderOption?: (
- props: React.HTMLAttributes,
+ props: React.HTMLAttributes & { key: any },
option: Value,
state: AutocompleteRenderOptionState,
ownerState: AutocompleteOwnerState,
From 2e057759bf3a7e6a5a88fde8bb884aa082a34316 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari
Date: Sat, 22 Jun 2024 22:28:36 +0200
Subject: [PATCH 22/65] [docs] Use new email for sponsoring
We want to test Front in anticipation of using it for Custom Success.
Based on the experience, we could either kill Front and move to Freshdesk or stay on it.
---
docs/data/material/discover-more/backers/backers.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/data/material/discover-more/backers/backers.md b/docs/data/material/discover-more/backers/backers.md
index 3ddd593cf5ec46..a88996b84f1ce1 100644
--- a/docs/data/material/discover-more/backers/backers.md
+++ b/docs/data/material/discover-more/backers/backers.md
@@ -134,7 +134,7 @@ Your organization logo will be prominently featured:
- the [README.md](https://github.com/mui/material-ui#sponsors) (80k+ unique visitors/month)
- the [Diamond sponsor list](#diamond-sponsors)
-Please contact us at sales@mui.com before subscribing to this tier to get preliminary approval.
+Please contact us at sponsoring@mui.com before subscribing to this tier to get preliminary approval.
### Gold
From 6dfef05b5c1ba0231334d91f6c6282f071b9f744 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari
Date: Sun, 23 Jun 2024 11:27:23 +0200
Subject: [PATCH 23/65] [docs] Fix git diff format in migration to v6 (#42711)
---
.../migration/migration-v5/migration-v5.md | 6 +-
packages/mui-codemod/README.md | 384 +++++++++---------
2 files changed, 200 insertions(+), 190 deletions(-)
diff --git a/docs/data/material/migration/migration-v5/migration-v5.md b/docs/data/material/migration/migration-v5/migration-v5.md
index 69dee66bce5203..0d9607f8c54b5b 100644
--- a/docs/data/material/migration/migration-v5/migration-v5.md
+++ b/docs/data/material/migration/migration-v5/migration-v5.md
@@ -69,8 +69,8 @@ import Chip from '@mui/material/Chip';
export default function ChipExample() {
const chipRef = React.useRef(null);
const keyUpHandler = (event) => {
- if (event.key === 'Escape' && chipRef.current) {
- chipRef.current.blur();
+ if (event.key === 'Escape') {
+ chipRef.current!.blur();
}
};
return (
@@ -101,7 +101,7 @@ This removes the need for the `disableEqualOverflow` prop, so you can remove it:
```diff
```
diff --git a/packages/mui-codemod/README.md b/packages/mui-codemod/README.md
index bcf8b4090895f8..87afe393fbe0f6 100644
--- a/packages/mui-codemod/README.md
+++ b/packages/mui-codemod/README.md
@@ -106,7 +106,7 @@ JS transforms:
- [`& .${accordionSummaryClasses.contentGutters}`]: {
+ [`&.${accordionSummaryClasses.gutters} .${accordionSummaryClasses.content}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -119,7 +119,7 @@ JS transforms:
- '& .MuiAccordionSummary-contentGutters': {
+ '&.MuiAccordionSummary-gutters .MuiAccordionSummary-content': {
color: 'red',
- },
+ },
},
},
},
@@ -130,7 +130,6 @@ CSS transforms:
```diff
-.MuiAccordionSummary-root .MuiAccordionSummary-contentGutters
+.MuiAccordionSummary-root.MuiAccordionSummary-gutters .MuiAccordionSummary-content
- />
```
```bash
@@ -150,51 +149,51 @@ JS transforms:
- [`&.${alertClasses.standardSuccess}`]: {
+ [`&.${alertClasses.standard}.${alertClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.standardInfo}`]: {
+ [`&.${alertClasses.standard}.${alertClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.standardWarning}`]: {
+ [`&.${alertClasses.standard}.${alertClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.standardError}`]: {
+ [`&.${alertClasses.standard}.${alertClasses.colorError}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.outlinedSuccess}`]: {
+ [`&.${alertClasses.outlined}.${alertClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.outlinedInfo}`]: {
+ [`&.${alertClasses.outlined}.${alertClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.outlinedWarning}`]: {
+ [`&.${alertClasses.outlined}.${alertClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.outlinedError}`]: {
+ [`&.${alertClasses.outlined}.${alertClasses.colorError}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.filledSuccess}`]: {
+ [`&.${alertClasses.filled}.${alertClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.filledInfo}`]: {
+ [`&.${alertClasses.filled}.${alertClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.filledWarning}`]: {
+ [`&.${alertClasses.filled}.${alertClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${alertClasses.filledError}`]: {
+ [`&.${alertClasses.filled}.${alertClasses.colorError}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -238,8 +237,8 @@ npx @mui/codemod@next deprecations/alert-classes
```diff
```
@@ -248,10 +247,10 @@ npx @mui/codemod@next deprecations/alert-classes
MuiAlert: {
defaultProps: {
- components: { CloseButton: CustomButton }
-+ slots: { closeButton: CustomButton },
- componentsProps: { closeButton: { testid: 'test-id' }}
++ slots: { closeButton: CustomButton },
+ slotProps: { closeButton: { testid: 'test-id' } },
- },
+ },
},
```
@@ -330,29 +329,29 @@ npx @mui/codemod@next deprecations/autocomplete-props
```diff
;
+ />
```
```diff
;
+ />
```
```diff
MuiAvatarGroup: {
defaultProps: {
- componentsProps: {
-- additionalAvatar: {color: "red"}
+- additionalAvatar: { color: 'red' },
+ slotProps: {
-+ surplus: {color: "red"}
++ surplus: { color: 'red' },
},
},
},
@@ -362,8 +361,8 @@ npx @mui/codemod@next deprecations/autocomplete-props
MuiAvatarGroup: {
defaultProps: {
slotProps: {
-- additionalAvatar: {color: "red"}
-+ surplus: {color: "red"}
+- additionalAvatar: { color: 'red' },
++ surplus: { color: 'red' },
},
},
},
@@ -384,9 +383,9 @@ npx @mui/codemod@next deprecations/avatar-group-props
+ img: {
+ onError: () => {},
+ onLoad: () => {},
-+ }
++ },
}}
- />;
+ />
```
#### `backdrop-props`
@@ -394,8 +393,8 @@ npx @mui/codemod@next deprecations/avatar-group-props
```diff
```
@@ -404,8 +403,8 @@ npx @mui/codemod@next deprecations/avatar-group-props
MuiBackdrop: {
defaultProps: {
- components: { Root: CustomRoot }
-+ slots: { root: CustomRoot },
- componentsProps: { root: { testid: 'root-id' } }
++ slots: { root: CustomRoot },
+ slotProps: { root: { testid: 'root-id' } },
},
},
@@ -413,8 +412,8 @@ npx @mui/codemod@next deprecations/avatar-group-props
```diff
```
@@ -427,8 +426,8 @@ npx @mui/codemod@next deprecations/backdrop-props
```diff
```
@@ -437,8 +436,8 @@ npx @mui/codemod@next deprecations/backdrop-props
MuiBadge: {
defaultProps: {
- components: { Root: CustomRoot }
-+ slots: { root: CustomRoot },
- componentsProps: { root: { testid: 'test-id' }}
++ slots: { root: CustomRoot },
+ slotProps: { root: { testid: 'test-id' } },
},
},
@@ -461,135 +460,135 @@ JS transforms:
- [`&.${buttonClasses.textInherit}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorInherit}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textPrimary}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textSecondary}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textSuccess}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textError}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorError}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textInfo}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textWarning}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedInherit}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorInherit}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedPrimary}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedSecondary}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedSuccess}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedError}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorError}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedInfo}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedWarning}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedInherit}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorInherit}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedPrimary}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedSecondary}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedSuccess}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorSuccess}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedError}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorError}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedInfo}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorInfo}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedWarning}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.colorWarning}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedSizeSmall}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.sizeSmall}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedSizeMedium}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.sizeMedium}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.containedSizeLarge}`]: {
+ [`&.${buttonClasses.contained}.${buttonClasses.sizeLarge}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textSizeSmall}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.sizeSmall}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textSizeMedium}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.sizeMedium}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.textSizeLarge}`]: {
+ [`&.${buttonClasses.text}.${buttonClasses.sizeLarge}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedSizeSmall}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.sizeSmall}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedSizeMedium}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.sizeMedium}`]: {
color: 'red',
- },
+ },
- [`&.${buttonClasses.outlinedSizeLarge}`]: {
+ [`&.${buttonClasses.outlined}.${buttonClasses.sizeLarge}`]: {
color: 'red',
- },
+ },
- [`& .${buttonClasses.iconSizeSmall}`]: {
+ [`&.${buttonClasses.sizeSmall} > .${buttonClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${buttonClasses.iconSizeMedium}`]: {
+ [`&.${buttonClasses.sizeMedium} > .${buttonClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${buttonClasses.iconSizeLarge}`]: {
+ [`&.${buttonClasses.sizeLarge} > .${buttonClasses.icon}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -664,7 +663,6 @@ CSS transforms:
+.MuiButton-root.MuiButton-sizeMedium > .MuiButton-icon
-.MuiButton-root .MuiButton-iconSizeLarge
+.MuiButton-root.MuiButton-sizeLarge > .MuiButton-icon
- />
```
```bash
@@ -684,71 +682,71 @@ JS transforms:
- [`& .${buttonGroupClasses.groupedHorizontal}`]: {
+ [`&.${buttonGroupClasses.horizontal} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedVertical}`]: {
+ [`&.${buttonGroupClasses.vertical} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedText}`]: {
+ [`&.${buttonGroupClasses.text} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedTextHorizontal}`]: {
+ [`&.${buttonGroupClasses.text}.${buttonGroupClasses.horizontal} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedTextVertical}`]: {
+ [`&.${buttonGroupClasses.text}.${buttonGroupClasses.vertical} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedTextPrimary}`]: {
+ [`&.${buttonGroupClasses.text}.${buttonGroupClasses.colorPrimary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedTextSecondary}`]: {
+ [`&.${buttonGroupClasses.text}.${buttonGroupClasses.colorSecondary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedOutlined}`]: {
+ [`&.${buttonGroupClasses.outlined} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedOutlinedHorizontal}`]: {
+ [`&.${buttonGroupClasses.outlined}.${buttonGroupClasses.horizontal} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedOutlinedVertical}`]: {
+ [`&.${buttonGroupClasses.outlined}.${buttonGroupClasses.vertical} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedOutlinedPrimary}`]: {
+ [`&.${buttonGroupClasses.outlined}.${buttonGroupClasses.colorPrimary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedOutlinedSecondary}`]: {
+ [`&.${buttonGroupClasses.outlined}.${buttonGroupClasses.colorSecondary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedContained}`]: {
+ [`&.${buttonGroupClasses.contained} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedContainedHorizontal}`]: {
+ [`&.${buttonGroupClasses.contained}.${buttonGroupClasses.horizontal} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedContainedVertical}`]: {
+ [`&.${buttonGroupClasses.contained}.${buttonGroupClasses.vertical} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedContainedPrimary}`]: {
+ [`&.${buttonGroupClasses.contained}.${buttonGroupClasses.colorPrimary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${buttonGroupClasses.groupedContainedSecondary}`]: {
+ [`&.${buttonGroupClasses.contained}.${buttonGroupClasses.colorSecondary} > .${buttonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -811,107 +809,107 @@ JS transforms:
- [`&.${chipClasses.clickableColorPrimary}`]: {
+ [`&.${chipClasses.clickable}.${chipClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.clickableColorSecondary}`]: {
+ [`&.${chipClasses.clickable}.${chipClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.deletableColorPrimary}`]: {
+ [`&.${chipClasses.deletable}.${chipClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.deletableColorSecondary}`]: {
+ [`&.${chipClasses.deletable}.${chipClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.outlinedPrimary}`]: {
+ [`&.${chipClasses.outlined}.${chipClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.outlinedSecondary}`]: {
+ [`&.${chipClasses.outlined}.${chipClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.filledPrimary}`]: {
+ [`&.${chipClasses.filled}.${chipClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${chipClasses.filledSecondary}`]: {
+ [`&.${chipClasses.filled}.${chipClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.avatarSmall}`]: {
+ [`&.${chipClasses.sizeSmall} > .${chipClasses.avatar}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.avatarMedium}`]: {
+ [`&.${chipClasses.sizeMedium} > .${chipClasses.avatar}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.avatarColorPrimary}`]: {
+ [`&.${chipClasses.colorPrimary} > .${chipClasses.avatar}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.avatarColorSecondary}`]: {
+ [`&.${chipClasses.colorSecondary} > .${chipClasses.avatar}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.iconSmall}`]: {
+ [`&.${chipClasses.sizeSmall} > .${chipClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.iconMedium}`]: {
+ [`&.${chipClasses.sizeMedium} > .${chipClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.iconColorPrimary}`]: {
+ [`&.${chipClasses.colorPrimary} > .${chipClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.iconColorSecondary}`]: {
+ [`&.${chipClasses.colorSecondary} > .${chipClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.labelSmall}`]: {
+ [`&.${chipClasses.sizeSmall} > .${chipClasses.label}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.labelMedium}`]: {
+ [`&.${chipClasses.sizeMedium} > .${chipClasses.label}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconSmall}`]: {
+ [`&.${chipClasses.sizeSmall} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconMedium}`]: {
+ [`&.${chipClasses.sizeMedium} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconColorPrimary}`]: {
+ [`&.${chipClasses.colorPrimary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconColorSecondary}`]: {
+ [`&.${chipClasses.colorSecondary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconOutlinedColorPrimary}`]: {
+ [`&.${chipClasses.outlined}.${chipClasses.colorPrimary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconOutlinedColorSecondary}`]: {
+ [`&.${chipClasses.outlined}.${chipClasses.colorSecondary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconFilledColorPrimary}`]: {
+ [`&.${chipClasses.filled}.${chipClasses.colorPrimary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
- [`& .${chipClasses.deleteIconFilledColorSecondary}`]: {
+ [`&.${chipClasses.filled}.${chipClasses.colorSecondary} > .${chipClasses.deleteIcon}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -992,11 +990,11 @@ JS transforms:
- [`& .${circularProgressClasses.circleDeterminate}`]: {
+ [`&.${circularProgressClasses.determinate} > .${circularProgressClasses.circle}`]: {
color: 'red',
- },
+ },
- [`& .${circularProgressClasses.circleIndeterminate}`]: {
+ [`&.${circularProgressClasses.indeterminate} > .${circularProgressClasses.circle}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -1005,9 +1003,12 @@ JS transforms:
CSS transforms:
```diff
-- .MuiCircularProgress-circleDeterminate
+-.MuiCircularProgress-circleDeterminate
+.MuiCircularProgress-determinate > .MuiCircularProgress-circle
-- .MuiCircularProgress-circleIndeterminate
+```
+
+```diff
+-.MuiCircularProgress-circleIndeterminate
+.MuiCircularProgress-indeterminate > .MuiCircularProgress-circle
```
@@ -1020,7 +1021,7 @@ npx @mui/codemod@next deprecations/circular-progress-classes
```diff
```
@@ -1033,8 +1034,8 @@ npx @mui/codemod@next deprecations/divider-props
```diff
```
@@ -1043,8 +1044,8 @@ npx @mui/codemod@next deprecations/divider-props
MuiFilledInput: {
defaultProps: {
- components: { Input: CustomInput, Root: CustomRoot }
-+ slots: { input: CustomInput, root: CustomRoot },
- componentsProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } }
++ slots: { input: CustomInput, root: CustomRoot },
+ slotProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } },
},
},
@@ -1066,9 +1067,9 @@ npx @mui/codemod@next deprecations/filled-input-props
```diff
MuiFormControlLabel: {
defaultProps: {
-- componentsProps={{ typography: typographyProps }}
-+ slotProps={{ typography: typographyProps }}
- },
+- componentsProps={{ typography: typographyProps }}
++ slotProps={{ typography: typographyProps }}
+ },
},
```
@@ -1082,8 +1083,8 @@ npx @mui/codemod@next deprecations/form-control-label-props
```diff
```
@@ -1092,8 +1093,8 @@ npx @mui/codemod@next deprecations/form-control-label-props
MuiListItem: {
defaultProps: {
- components: { Root: CustomRoot }
-+ slots: { root: CustomRoot },
- componentsProps: { root: { testid: 'test-id' }}
++ slots: { root: CustomRoot },
+ slotProps: { root: { testid: 'test-id' } },
},
},
@@ -1107,8 +1108,8 @@ npx @mui/codemod@next deprecations/list-item-props
```diff
```
@@ -1121,8 +1122,8 @@ npx @mui/codemod@next deprecations/grid-props
```diff
```
@@ -1131,8 +1132,8 @@ npx @mui/codemod@next deprecations/grid-props
MuiInputBase: {
defaultProps: {
- components: { Input: CustomInput, Root: CustomRoot }
-+ slots: { input: CustomInput, root: CustomRoot },
- componentsProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } }
++ slots: { input: CustomInput, root: CustomRoot },
+ slotProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } },
},
},
@@ -1147,8 +1148,8 @@ npx @mui/codemod@next deprecations/input-base-props
```diff
```
@@ -1157,8 +1158,8 @@ npx @mui/codemod@next deprecations/input-base-props
MuiInput: {
defaultProps: {
- components: { Input: CustomInput, Root: CustomRoot }
-+ slots: { input: CustomInput, root: CustomRoot },
- componentsProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } }
++ slots: { input: CustomInput, root: CustomRoot },
+ slotProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } },
},
},
@@ -1173,8 +1174,8 @@ npx @mui/codemod@next deprecations/input-props
```diff
```
@@ -1183,8 +1184,8 @@ npx @mui/codemod@next deprecations/input-props
MuiModal: {
defaultProps: {
- components: { Root: CustomRoot, Backdrop: CustomBackdrop }
-+ slots: { root: CustomRoot, backdrop: CustomBackdrop },
- componentsProps: { root: { testid: 'root-id' }, backdrop: { testid: 'backdrop-id' }}
++ slots: { root: CustomRoot, backdrop: CustomBackdrop },
+ slotProps: { root: { testid: 'root-id' }, backdrop: { testid: 'backdrop-id' } },
},
},
@@ -1207,35 +1208,35 @@ JS transforms:
- [`&.${paginationItemClasses.textPrimary}`]: {
+ [`&.${paginationItemClasses.text}.${paginationItemClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${paginationItemClasses.textSecondary}`]: {
+ [`&.${paginationItemClasses.text}.${paginationItemClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- [`&.${paginationItemClasses.outlinedPrimary}`]: {
+ [`&.${paginationItemClasses.outlined}.${paginationItemClasses.colorPrimary}`]: {
color: 'red',
- },
+ },
- [`&.${paginationItemClasses.outlinedSecondary}`]: {
+ [`&.${paginationItemClasses.outlined}.${paginationItemClasses.colorSecondary}`]: {
color: 'red',
- },
+ },
- '&.MuiPaginationItem-textPrimary': {
+ '&.MuiPaginationItem-text.MuiPaginationItem-colorPrimary': {
color: 'red',
- },
+ },
- '&.MuiPaginationItem-textSecondary': {
+ '&.MuiPaginationItem-text.MuiPaginationItem-colorSecondary': {
color: 'red',
- },
+ },
- '&.MuiPaginationItem-outlinedPrimary': {
+ '&.MuiPaginationItem-outlined.MuiPaginationItem-colorPrimary': {
color: 'red',
- },
+ },
- '&.MuiPaginationItem-outlinedSecondary': {
+ '&.MuiPaginationItem-outlined.MuiPaginationItem-colorSecondary': {
color: 'red',
- },
+ },
},
},
},
@@ -1285,8 +1286,8 @@ npx @mui/codemod@next deprecations/pagination-item-props
```diff
```
@@ -1295,8 +1296,8 @@ npx @mui/codemod@next deprecations/pagination-item-props
MuiPopper: {
defaultProps: {
- components: { Root: CustomRoot }
-+ slots: { root: CustomRoot },
- componentsProps: { root: { testid: 'test-id' }}
++ slots: { root: CustomRoot },
+ slotProps: { root: { testid: 'test-id' } },
},
},
@@ -1311,8 +1312,8 @@ npx @mui/codemod@next deprecations/popper-props
```diff
```
@@ -1321,8 +1322,8 @@ npx @mui/codemod@next deprecations/popper-props
MuiOutlinedInput: {
defaultProps: {
- components: { Input: CustomInput, Root: CustomRoot }
-+ slots: { input: CustomInput, root: CustomRoot },
- componentsProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } }
++ slots: { input: CustomInput, root: CustomRoot },
+ slotProps: { input: { id: 'test-input-id' }, root: { id: 'test-root-id' } },
},
},
@@ -1337,8 +1338,8 @@ npx @mui/codemod@next deprecations/outlined-input-props
```diff
```
@@ -1347,8 +1348,8 @@ npx @mui/codemod@next deprecations/outlined-input-props
MuiSlider: {
defaultProps: {
- components: { Track: CustomTrack }
-+ slots: { track: CustomTrack },
- componentsProps: { track: { testid: 'test-id' }}
++ slots: { track: CustomTrack },
+ slotProps: { track: { testid: 'test-id' } },
},
},
@@ -1363,8 +1364,8 @@ npx @mui/codemod@next deprecations/slider-props
```diff
```
@@ -1397,11 +1398,11 @@ JS transforms:
- [`& .${stepConnectorClasses.lineHorizontal}`]: {
+ [`&.${stepConnectorClasses.horizontal} > .${stepConnectorClasses.line}`]: {
color: 'red',
- },
+ },
- [`& .${stepConnectorClasses.lineVertical}`]: {
+ [`&.${stepConnectorClasses.vertical} > .${stepConnectorClasses.line}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -1441,18 +1442,18 @@ npx @mui/codemod@latest deprecations/step-label-props
```diff
```
@@ -1473,11 +1474,11 @@ JS transforms:
- [`& .${toggleButtonGroupClasses.groupedHorizontal}`]: {
+ [`&.${toggleButtonGroupClasses.horizontal} > .${toggleButtonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
- [`& .${toggleButtonGroupClasses.groupedVertical}`]: {
+ [`&.${toggleButtonGroupClasses.vertical} > .${toggleButtonGroupClasses.grouped}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -1488,9 +1489,11 @@ CSS transforms:
```diff
-.MuiToggleButtonGroup-root .MuiToggleButtonGroup-groupedHorizontal
+.MuiToggleButtonGroup-root.MuiToggleButtonGroup-horizontal > .MuiToggleButtonGroup-grouped
+```
+
+```diff
-.MuiToggleButtonGroup-root .MuiToggleButtonGroup-groupedVertical
+.MuiToggleButtonGroup-root.MuiToggleButtonGroup-vertical > .MuiToggleButtonGroup-grouped
- />
```
```bash
@@ -1500,9 +1503,12 @@ npx @mui/codemod@latest deprecations/toggle-button-group-classes
CSS transforms:
```diff
-- .MuiStepConnector-lineHorizontal
+-.MuiStepConnector-lineHorizontal
+.MuiStepConnector-horizontal > .MuiStepConnector-line
-- .MuiStepConnector-lineVertical
+```
+
+```diff
+-.MuiStepConnector-lineVertical
+.MuiStepConnector-vertical > .MuiStepConnector-line
```
@@ -1523,7 +1529,8 @@ JS transforms:
- [`& .${tabClasses.iconWrapper}`]: {
+ [`& .${tabClasses.icon}`]: {
color: 'red',
- },
+ },
+ },
},
},
```
@@ -1531,8 +1538,8 @@ JS transforms:
CSS transforms:
```diff
-- .MuiTab-iconWrapper
-+ .MuiTab-icon
+-.MuiTab-iconWrapper
++.MuiTab-icon
```
```bash
@@ -1552,11 +1559,11 @@ JS transforms:
- [`& .${tableSortLabelClasses.iconDirectionDesc}`]: {
+ [`&.${tableSortLabelClasses.directionDesc} > .${tableSortLabelClasses.icon}`]: {
color: 'red',
- },
+ },
- [`& .${tableSortLabelClasses.iconDirectionAsc}`]: {
+ [`&.${tableSortLabelClasses.directionAsc} > .${tableSortLabelClasses.icon}`]: {
color: 'red',
- },
+ },
},
},
},
@@ -1565,9 +1572,12 @@ JS transforms:
CSS transforms:
```diff
-- .MuiTableSortLabel-iconDirectionDesc
+-.MuiTableSortLabel-iconDirectionDesc
+.MuiTableSortLabel-directionDesc > .MuiTableSortLabel-icon
-- .MuiTableSortLabel-iconDirectionAsc
+```
+
+```diff
+-.MuiTableSortLabel-iconDirectionAsc
+.MuiTableSortLabel-directionAsc > .MuiTableSortLabel-icon
```
@@ -1589,7 +1599,7 @@ Update the usage of the `sx` prop to be compatible with `@pigment-css/react`.
-- theme.palette.mode === 'light' ? theme.palette.grey[100] : theme.palette.grey[900],
+- theme.palette.mode === 'light' ? theme.palette.grey[100] : theme.palette.grey[900],
- }}
+ sx={theme => ({
+ backgroundColor: theme.palette.grey[900],
@@ -1609,8 +1619,8 @@ npx @mui/codemod@next v6.0.0/system-props
Remove system props and add them to the `sx` prop.
```diff
--
-+
+-
++
```
#### `theme-v6`
@@ -1629,14 +1639,14 @@ Update the theme creation from `@mui/system@v5` to be compatible with `@pigment-
createTheme({
components: {
MuiButton: {
-- variants: [
-- {
-- props: { color: 'primary' },
-- style: {
-- color: 'red',
-- },
-- },
-- ],
+- variants: [
+- {
+- props: { color: 'primary' },
+- style: {
+- color: 'red',
+- },
+- },
+- ],
styleOverrides: {
- root: ({ theme, ownerState }) => ({
+ root: ({ theme }) => ({
@@ -1848,7 +1858,7 @@ Transforms `row` prop to `orientation` prop across `Card`, `List` and `RadioGrou
```diff
;
```
@@ -1876,7 +1886,7 @@ npx @mui/codemod@next v5.0.0/joy-avatar-remove-imgProps
#### `joy-text-field-to-input`
-Replace `` with composition of `Input`
+Replace `` with a composition of input components:
This change only affects Joy UI components.
From 4a00b800e74b476283b49579f586e6b9155d9136 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 15:50:00 +0530
Subject: [PATCH 24/65] Bump @definitelytyped tools (#42716)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 4 ++--
pnpm-lock.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 80a071c78895b7..633827a200d0fd 100644
--- a/package.json
+++ b/package.json
@@ -205,8 +205,8 @@
"@babel/preset-typescript": "^7.24.7",
"@babel/runtime": "^7.24.7",
"@babel/types": "^7.24.7",
- "@definitelytyped/header-parser": "^0.2.9",
- "@definitelytyped/typescript-versions": "^0.1.1",
+ "@definitelytyped/header-parser": "^0.2.10",
+ "@definitelytyped/typescript-versions": "^0.1.2",
"@definitelytyped/utils": "^0.1.6",
"@types/node": "^18.19.34",
"@types/react": "18.2.55",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 831d0c0d465769..14d638a88cfb02 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,8 +13,8 @@ overrides:
'@babel/preset-typescript': ^7.24.7
'@babel/runtime': ^7.24.7
'@babel/types': ^7.24.7
- '@definitelytyped/header-parser': ^0.2.9
- '@definitelytyped/typescript-versions': ^0.1.1
+ '@definitelytyped/header-parser': ^0.2.10
+ '@definitelytyped/typescript-versions': ^0.1.2
'@definitelytyped/utils': ^0.1.6
'@types/node': ^18.19.34
'@types/react': 18.2.55
From 800fe7e2fc0a3e3c40b580c10cdc0333171cdf44 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 15:50:40 +0530
Subject: [PATCH 25/65] Bump @types/mocha to ^10.0.7 (#42717)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
packages/api-docs-builder-core/package.json | 2 +-
packages/api-docs-builder/package.json | 2 +-
packages/mui-babel-macros/package.json | 2 +-
packages/mui-utils/package.json | 2 +-
packages/rsc-builder/package.json | 2 +-
pnpm-lock.yaml | 30 ++++++++++-----------
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/package.json b/package.json
index 633827a200d0fd..581dfd815d0396 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
"@types/enzyme": "^3.10.18",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.5",
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34",
"@types/react": "^18.2.55",
"@types/yargs": "^17.0.32",
diff --git a/packages/api-docs-builder-core/package.json b/packages/api-docs-builder-core/package.json
index b0c29c7a5af7db..8a35884418b208 100644
--- a/packages/api-docs-builder-core/package.json
+++ b/packages/api-docs-builder-core/package.json
@@ -16,7 +16,7 @@
},
"devDependencies": {
"@types/chai": "^4.3.16",
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34",
"@types/sinon": "^17.0.3",
"chai": "^4.4.1",
diff --git a/packages/api-docs-builder/package.json b/packages/api-docs-builder/package.json
index 7073bfa50f92b2..a06f2183a779b3 100644
--- a/packages/api-docs-builder/package.json
+++ b/packages/api-docs-builder/package.json
@@ -31,7 +31,7 @@
"@types/chai": "^4.3.16",
"@types/doctrine": "^0.0.9",
"@types/mdast": "4.0.4",
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34",
"@types/react-docgen": "workspace:*",
"@types/sinon": "^17.0.3",
diff --git a/packages/mui-babel-macros/package.json b/packages/mui-babel-macros/package.json
index bfef3cab623381..e5f8cef4c685dc 100644
--- a/packages/mui-babel-macros/package.json
+++ b/packages/mui-babel-macros/package.json
@@ -31,7 +31,7 @@
"@mui/internal-babel-macros": "workspace:*",
"@types/babel-plugin-macros": "^3.1.3",
"@types/chai": "^4.3.16",
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34",
"babel-plugin-tester": "^11.0.4",
"chai": "^4.4.1"
diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json
index 008d99c66fd3f9..0e01886c18be7d 100644
--- a/packages/mui-utils/package.json
+++ b/packages/mui-utils/package.json
@@ -48,7 +48,7 @@
"@mui/internal-test-utils": "workspace:^",
"@mui/types": "workspace:^",
"@types/chai": "^4.3.16",
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
diff --git a/packages/rsc-builder/package.json b/packages/rsc-builder/package.json
index da203c68c8b262..d8f9be5d9a9839 100644
--- a/packages/rsc-builder/package.json
+++ b/packages/rsc-builder/package.json
@@ -8,7 +8,7 @@
"yargs": "^17.7.2"
},
"devDependencies": {
- "@types/mocha": "^10.0.6",
+ "@types/mocha": "^10.0.7",
"@types/node": "^18.19.34"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 14d638a88cfb02..9c6815627c5360 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -120,8 +120,8 @@ importers:
specifier: ^4.17.5
version: 4.17.5
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -1155,8 +1155,8 @@ importers:
specifier: 4.0.4
version: 4.0.4
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -1192,8 +1192,8 @@ importers:
specifier: ^4.3.16
version: 4.3.16
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -1290,8 +1290,8 @@ importers:
specifier: ^4.3.16
version: 4.3.16
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -2157,8 +2157,8 @@ importers:
specifier: ^4.3.16
version: 4.3.16
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -2210,8 +2210,8 @@ importers:
version: 17.7.2
devDependencies:
'@types/mocha':
- specifier: ^10.0.6
- version: 10.0.6
+ specifier: ^10.0.7
+ version: 10.0.7
'@types/node':
specifier: ^18.19.34
version: 18.19.34
@@ -5236,8 +5236,8 @@ packages:
'@types/minimist@1.2.2':
resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==}
- '@types/mocha@10.0.6':
- resolution: {integrity: sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg==}
+ '@types/mocha@10.0.7':
+ resolution: {integrity: sha512-GN8yJ1mNTcFcah/wKEFIJckJx9iJLoMSzWcfRRuxz/Jk+U6KQNnml+etbtxFK8lPjzOw3zp4Ha/kjSst9fsHYw==}
'@types/ms@0.7.34':
resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
@@ -16030,7 +16030,7 @@ snapshots:
'@types/minimist@1.2.2': {}
- '@types/mocha@10.0.6': {}
+ '@types/mocha@10.0.7': {}
'@types/ms@0.7.34': {}
From 4d67b45b80ce84afbbc0a962df6389310564fad7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:15:50 +0530
Subject: [PATCH 26/65] Bump @types/node to ^18.19.39 (#42718)
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-babel-macros/package.json | 2 +-
packages/mui-docs/package.json | 2 +-
packages/mui-utils/package.json | 2 +-
packages/rsc-builder/package.json | 2 +-
pnpm-lock.yaml | 134 ++++++++++----------
10 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/docs/package.json b/docs/package.json
index 664709cbb1e37a..8bafc08a2e02b4 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -121,7 +121,7 @@
"@types/chai": "^4.3.16",
"@types/css-mediaquery": "^0.1.4",
"@types/json2mq": "^0.2.2",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/prop-types": "^15.7.12",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
diff --git a/package.json b/package.json
index 581dfd815d0396..b2891e8a6adb80 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.5",
"@types/mocha": "^10.0.7",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/react": "^18.2.55",
"@types/yargs": "^17.0.32",
"@typescript-eslint/eslint-plugin": "^6.21.0",
@@ -208,7 +208,7 @@
"@definitelytyped/header-parser": "^0.2.10",
"@definitelytyped/typescript-versions": "^0.1.2",
"@definitelytyped/utils": "^0.1.6",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/react": "18.2.55",
"@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 5224dfaee1166c..c0886d29005233 100644
--- a/packages-internal/scripts/package.json
+++ b/packages-internal/scripts/package.json
@@ -42,7 +42,7 @@
"@types/chai": "^4.3.16",
"@types/doctrine": "^0.0.9",
"@types/lodash": "^4.17.5",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/react": "^18.2.55",
"@types/uuid": "^9.0.8",
"chai": "^4.4.1",
diff --git a/packages/api-docs-builder-core/package.json b/packages/api-docs-builder-core/package.json
index 8a35884418b208..6a3c525a78cd4a 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.16",
"@types/mocha": "^10.0.7",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/sinon": "^17.0.3",
"chai": "^4.4.1",
"sinon": "^16.1.3",
diff --git a/packages/api-docs-builder/package.json b/packages/api-docs-builder/package.json
index a06f2183a779b3..d49bc0782e5f9d 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.34",
+ "@types/node": "^18.19.39",
"@types/react-docgen": "workspace:*",
"@types/sinon": "^17.0.3",
"chai": "^4.4.1",
diff --git a/packages/mui-babel-macros/package.json b/packages/mui-babel-macros/package.json
index e5f8cef4c685dc..dcbfb1f8044c0e 100644
--- a/packages/mui-babel-macros/package.json
+++ b/packages/mui-babel-macros/package.json
@@ -32,7 +32,7 @@
"@types/babel-plugin-macros": "^3.1.3",
"@types/chai": "^4.3.16",
"@types/mocha": "^10.0.7",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"babel-plugin-tester": "^11.0.4",
"chai": "^4.4.1"
},
diff --git a/packages/mui-docs/package.json b/packages/mui-docs/package.json
index 1466e31b395eb8..6fc9f6ff331d8c 100644
--- a/packages/mui-docs/package.json
+++ b/packages/mui-docs/package.json
@@ -44,7 +44,7 @@
"devDependencies": {
"@mui/icons-material": "workspace:*",
"@mui/material": "workspace:*",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/prop-types": "^15.7.12",
"@types/react": "^18.2.55",
"next": "^13.5.1",
diff --git a/packages/mui-utils/package.json b/packages/mui-utils/package.json
index 0e01886c18be7d..5b37484eedef98 100644
--- a/packages/mui-utils/package.json
+++ b/packages/mui-utils/package.json
@@ -49,7 +49,7 @@
"@mui/types": "workspace:^",
"@types/chai": "^4.3.16",
"@types/mocha": "^10.0.7",
- "@types/node": "^18.19.34",
+ "@types/node": "^18.19.39",
"@types/react": "^18.2.55",
"@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 d8f9be5d9a9839..53c0f5fd9129fb 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.34"
+ "@types/node": "^18.19.39"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9c6815627c5360..e5819959caafc9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,7 +16,7 @@ overrides:
'@definitelytyped/header-parser': ^0.2.10
'@definitelytyped/typescript-versions': ^0.1.2
'@definitelytyped/utils': ^0.1.6
- '@types/node': ^18.19.34
+ '@types/node': ^18.19.39
'@types/react': 18.2.55
'@types/react-dom': 18.3.0
cross-fetch: ^4.0.0
@@ -123,8 +123,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -376,8 +376,8 @@ importers:
specifier: ^0.0.14
version: 0.0.14(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -444,7 +444,7 @@ importers:
version: 7.24.7(@babel/core@7.24.7)
'@pigment-css/vite-plugin':
specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2))
+ version: 0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -453,7 +453,7 @@ importers:
version: 18.3.0
'@vitejs/plugin-react':
specifier: ^4.3.1
- version: 4.3.1(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2))
+ version: 4.3.1(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))
postcss:
specifier: ^8.4.38
version: 8.4.38
@@ -462,10 +462,10 @@ importers:
version: 1.0.1
vite:
specifier: 5.3.1
- version: 5.3.1(@types/node@18.19.34)(terser@5.29.2)
+ version: 5.3.1(@types/node@18.19.39)(terser@5.29.2)
vite-plugin-pages:
specifier: ^0.32.2
- version: 0.32.2(react-router@6.23.1(react@18.2.0))(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2))
+ version: 0.32.2(react-router@6.23.1(react@18.2.0))(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))
benchmark:
dependencies:
@@ -855,8 +855,8 @@ importers:
specifier: ^0.2.2
version: 0.2.2
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/prop-types':
specifier: ^15.7.12
version: 15.7.12
@@ -961,8 +961,8 @@ importers:
specifier: ^4.17.5
version: 4.17.5
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -1158,8 +1158,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/react-docgen':
specifier: workspace:*
version: link:../react-docgen-types
@@ -1195,8 +1195,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/sinon':
specifier: ^17.0.3
version: 17.0.3
@@ -1293,8 +1293,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
babel-plugin-tester:
specifier: ^11.0.4
version: 11.0.4(@babel/core@7.24.7)
@@ -1448,8 +1448,8 @@ importers:
specifier: workspace:*
version: link:../mui-material/build
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/prop-types':
specifier: ^15.7.12
version: 15.7.12
@@ -2160,8 +2160,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -2213,8 +2213,8 @@ importers:
specifier: ^10.0.7
version: 10.0.7
'@types/node':
- specifier: ^18.19.34
- version: 18.19.34
+ specifier: ^18.19.39
+ version: 18.19.39
packages/waterfall: {}
@@ -5242,8 +5242,8 @@ packages:
'@types/ms@0.7.34':
resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
- '@types/node@18.19.34':
- resolution: {integrity: sha512-eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==}
+ '@types/node@18.19.39':
+ resolution: {integrity: sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==}
'@types/normalize-package-data@2.4.1':
resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
@@ -12035,7 +12035,7 @@ packages:
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
peerDependencies:
- '@types/node': ^18.19.34
+ '@types/node': ^18.19.39
less: '*'
lightningcss: ^1.21.0
sass: '*'
@@ -13892,7 +13892,7 @@ snapshots:
'@fast-csv/format@4.3.5':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
lodash.escaperegexp: 4.1.2
lodash.isboolean: 3.0.3
lodash.isequal: 4.5.0
@@ -13901,7 +13901,7 @@ snapshots:
'@fast-csv/parse@4.3.6':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
lodash.escaperegexp: 4.1.2
lodash.groupby: 4.6.0
lodash.isfunction: 3.0.9
@@ -14089,14 +14089,14 @@ snapshots:
dependencies:
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
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.34
+ '@types/node': 18.19.39
jest-message-util: 29.7.0
jest-mock: 29.7.0
jest-util: 29.7.0
@@ -14109,7 +14109,7 @@ snapshots:
dependencies:
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/yargs': 15.0.19
chalk: 4.1.2
@@ -14118,7 +14118,7 @@ snapshots:
'@jest/schemas': 29.6.3
'@types/istanbul-lib-coverage': 2.0.6
'@types/istanbul-reports': 3.0.4
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/yargs': 17.0.32
chalk: 4.1.2
@@ -15132,7 +15132,7 @@ snapshots:
- react
- supports-color
- '@pigment-css/vite-plugin@0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2))':
+ '@pigment-css/vite-plugin@0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))':
dependencies:
'@babel/core': 7.24.7
'@babel/preset-typescript': 7.24.7(@babel/core@7.24.7)
@@ -15140,7 +15140,7 @@ snapshots:
'@wyw-in-js/shared': 0.5.3
'@wyw-in-js/transform': 0.5.3
babel-plugin-define-var: 0.1.0
- vite: 5.3.1(@types/node@18.19.34)(terser@5.29.2)
+ vite: 5.3.1(@types/node@18.19.39)(terser@5.29.2)
transitivePeerDependencies:
- '@types/react'
- react
@@ -15656,18 +15656,18 @@ snapshots:
'@slack/logger@3.0.0':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@slack/logger@4.0.0':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@slack/oauth@2.6.2':
dependencies:
'@slack/logger': 3.0.0
'@slack/web-api': 6.12.0
'@types/jsonwebtoken': 8.5.9
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
jsonwebtoken: 9.0.0
lodash.isstring: 4.0.1
transitivePeerDependencies:
@@ -15677,7 +15677,7 @@ snapshots:
dependencies:
'@slack/logger': 3.0.0
'@slack/web-api': 6.12.0
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/p-queue': 2.3.2
'@types/ws': 7.4.7
eventemitter3: 3.1.2
@@ -15697,7 +15697,7 @@ snapshots:
'@slack/logger': 3.0.0
'@slack/types': 2.11.0
'@types/is-stream': 1.1.0
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
axios: 1.6.8(debug@4.3.4)
eventemitter3: 3.1.2
form-data: 2.5.1
@@ -15900,7 +15900,7 @@ snapshots:
'@types/body-parser@1.19.2':
dependencies:
'@types/connect': 3.4.35
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/chai-dom@1.11.3':
dependencies:
@@ -15910,11 +15910,11 @@ snapshots:
'@types/cheerio@0.22.31':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/connect@3.4.35':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/cookie@0.4.1': {}
@@ -15947,7 +15947,7 @@ snapshots:
'@types/express-serve-static-core@4.17.35':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/qs': 6.9.7
'@types/range-parser': 1.2.4
'@types/send': 0.17.1
@@ -15964,7 +15964,7 @@ snapshots:
'@types/fs-extra@11.0.4':
dependencies:
'@types/jsonfile': 6.1.1
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/hoist-non-react-statics@3.3.5':
dependencies:
@@ -15977,7 +15977,7 @@ snapshots:
'@types/is-stream@1.1.0':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/istanbul-lib-coverage@2.0.6': {}
@@ -16002,11 +16002,11 @@ snapshots:
'@types/jsonfile@6.1.1':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/jsonwebtoken@8.5.9':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/lodash.mergewith@4.6.7':
dependencies:
@@ -16034,7 +16034,7 @@ snapshots:
'@types/ms@0.7.34': {}
- '@types/node@18.19.34':
+ '@types/node@18.19.39':
dependencies:
undici-types: 5.26.5
@@ -16099,13 +16099,13 @@ snapshots:
'@types/send@0.17.1':
dependencies:
'@types/mime': 1.3.2
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/serve-static@1.15.2':
dependencies:
'@types/http-errors': 2.0.1
'@types/mime': 3.0.1
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/sinon@17.0.3':
dependencies:
@@ -16135,7 +16135,7 @@ snapshots:
'@types/ws@7.4.7':
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
'@types/yargs-parser@21.0.3': {}
@@ -16235,14 +16235,14 @@ snapshots:
'@ungap/structured-clone@1.2.0': {}
- '@vitejs/plugin-react@4.3.1(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2))':
+ '@vitejs/plugin-react@4.3.1(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))':
dependencies:
'@babel/core': 7.24.7
'@babel/plugin-transform-react-jsx-self': 7.24.6(@babel/core@7.24.7)
'@babel/plugin-transform-react-jsx-source': 7.24.1(@babel/core@7.24.7)
'@types/babel__core': 7.20.5
react-refresh: 0.14.2
- vite: 5.3.1(@types/node@18.19.34)(terser@5.29.2)
+ vite: 5.3.1(@types/node@18.19.39)(terser@5.29.2)
transitivePeerDependencies:
- supports-color
@@ -17278,7 +17278,7 @@ snapshots:
chrome-launcher@0.15.2:
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
escape-string-regexp: 4.0.0
is-wsl: 2.2.0
lighthouse-logger: 1.4.2
@@ -17289,7 +17289,7 @@ snapshots:
chromium-edge-launcher@1.0.0:
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
escape-string-regexp: 4.0.0
is-wsl: 2.2.0
lighthouse-logger: 1.4.2
@@ -18165,7 +18165,7 @@ snapshots:
dependencies:
'@types/cookie': 0.4.1
'@types/cors': 2.8.12
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
accepts: 1.3.8
base64id: 2.0.0
cookie: 0.4.2
@@ -20024,7 +20024,7 @@ snapshots:
'@jest/environment': 29.7.0
'@jest/fake-timers': 29.7.0
'@jest/types': 29.6.3
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
jest-mock: 29.7.0
jest-util: 29.7.0
@@ -20045,13 +20045,13 @@ snapshots:
jest-mock@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
jest-util: 29.7.0
jest-util@29.7.0:
dependencies:
'@jest/types': 29.6.3
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
chalk: 4.1.2
ci-info: 3.9.0
graceful-fs: 4.2.11
@@ -20068,13 +20068,13 @@ snapshots:
jest-worker@27.5.1:
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
merge-stream: 2.0.0
supports-color: 8.1.1
jest-worker@29.7.0:
dependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
jest-util: 29.7.0
merge-stream: 2.0.0
supports-color: 8.1.1
@@ -24380,7 +24380,7 @@ snapshots:
unist-util-stringify-position: 2.0.3
vfile-message: 2.0.4
- vite-plugin-pages@0.32.2(react-router@6.23.1(react@18.2.0))(vite@5.3.1(@types/node@18.19.34)(terser@5.29.2)):
+ vite-plugin-pages@0.32.2(react-router@6.23.1(react@18.2.0))(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2)):
dependencies:
'@types/debug': 4.1.12
debug: 4.3.4(supports-color@8.1.1)
@@ -24390,20 +24390,20 @@ snapshots:
json5: 2.2.3
local-pkg: 0.5.0
picocolors: 1.0.1
- vite: 5.3.1(@types/node@18.19.34)(terser@5.29.2)
+ vite: 5.3.1(@types/node@18.19.39)(terser@5.29.2)
yaml: 2.4.2
optionalDependencies:
react-router: 6.23.1(react@18.2.0)
transitivePeerDependencies:
- supports-color
- vite@5.3.1(@types/node@18.19.34)(terser@5.29.2):
+ vite@5.3.1(@types/node@18.19.39)(terser@5.29.2):
dependencies:
esbuild: 0.21.5
postcss: 8.4.38
rollup: 4.13.0
optionalDependencies:
- '@types/node': 18.19.34
+ '@types/node': 18.19.39
fsevents: 2.3.3
terser: 5.29.2
From 4dfc98cad6667e248a4ce911e32c821623278257 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:36:34 +0530
Subject: [PATCH 27/65] Bump MUI X to 7.7.1 (#42719)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
docs/package.json | 18 ++---
pnpm-lock.yaml | 178 +++++++++++++++++++++++-----------------------
2 files changed, 98 insertions(+), 98 deletions(-)
diff --git a/docs/package.json b/docs/package.json
index 8bafc08a2e02b4..907cf9f2c3f0b5 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -43,15 +43,15 @@
"@mui/system": "workspace:^",
"@mui/types": "workspace:^",
"@mui/utils": "workspace:^",
- "@mui/x-charts": "7.7.0",
- "@mui/x-data-grid": "7.7.0",
- "@mui/x-data-grid-generator": "7.7.0",
- "@mui/x-data-grid-premium": "7.7.0",
- "@mui/x-data-grid-pro": "7.7.0",
- "@mui/x-date-pickers": "7.7.0",
- "@mui/x-date-pickers-pro": "7.7.0",
- "@mui/x-license": "7.7.0",
- "@mui/x-tree-view": "7.7.0",
+ "@mui/x-charts": "7.7.1",
+ "@mui/x-data-grid": "7.7.1",
+ "@mui/x-data-grid-generator": "7.7.1",
+ "@mui/x-data-grid-premium": "7.7.1",
+ "@mui/x-data-grid-pro": "7.7.1",
+ "@mui/x-date-pickers": "7.7.1",
+ "@mui/x-date-pickers-pro": "7.7.1",
+ "@mui/x-license": "7.7.1",
+ "@mui/x-tree-view": "7.7.1",
"@popperjs/core": "^2.11.8",
"@react-spring/web": "^9.7.3",
"autoprefixer": "^10.4.19",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5819959caafc9..8f78387fb04f51 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -626,32 +626,32 @@ importers:
specifier: workspace:^
version: link:../packages/mui-utils/build
'@mui/x-charts':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-data-grid':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-data-grid-generator':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-data-grid-premium':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-data-grid-pro':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-date-pickers':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-date-pickers-pro':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/x-license':
- specifier: 7.7.0
- version: 7.7.0(@types/react@18.2.55)(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@types/react@18.2.55)(react@18.2.0)
'@mui/x-tree-view':
- specifier: 7.7.0
- version: 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ specifier: 7.7.1
+ version: 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@popperjs/core':
specifier: ^2.11.8
version: 2.11.8
@@ -1275,7 +1275,7 @@ importers:
version: 7.24.7
'@mui/utils':
specifier: ^5.0.0
- version: 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ version: 5.15.20(@types/react@18.2.55)(react@18.2.0)
babel-plugin-macros:
specifier: ^3.1.0
version: 3.1.0
@@ -1427,7 +1427,7 @@ importers:
version: link:../markdown
'@mui/system':
specifier: ^5.0.0
- version: 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ version: 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
clipboard-copy:
specifier: ^4.0.1
version: 4.0.1
@@ -3882,8 +3882,8 @@ packages:
'@types/react':
optional: true
- '@mui/private-theming@5.15.14':
- resolution: {integrity: sha512-UH0EiZckOWcxiXLX3Jbb0K7rC8mxTr9L9l6QhOZxYc4r8FHUkefltV9VDGLrzCaWh30SQiJvAEd7djX3XXY6Xw==}
+ '@mui/private-theming@5.15.20':
+ resolution: {integrity: sha512-BK8F94AIqSrnaPYXf2KAOjGZJgWfvqAVQ2gVR3EryvQFtuBnG6RwodxrCvd3B48VuMy6Wsk897+lQMUxJyk+6g==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': 18.2.55
@@ -3928,8 +3928,8 @@ packages:
'@emotion/styled':
optional: true
- '@mui/system@5.15.15':
- resolution: {integrity: sha512-aulox6N1dnu5PABsfxVGOZffDVmlxPOVgj56HrUnJE8MCSh8lOvvkd47cebIVQQYAjpwieXQXiDPj5pwM40jTQ==}
+ '@mui/system@5.15.20':
+ resolution: {integrity: sha512-LoMq4IlAAhxzL2VNUDBTQxAb4chnBe8JvRINVNDiMtHE2PiPOoHlhOPutSxEbaL5mkECPVWSv6p8JEV+uykwIA==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@emotion/react': ^11.5.0
@@ -3968,8 +3968,8 @@ packages:
'@types/react':
optional: true
- '@mui/utils@5.15.14':
- resolution: {integrity: sha512-0lF/7Hh/ezDv5X7Pry6enMsbYyGKjADzvHyo3Qrc/SSlTsQ1VkbDMbH0m2t3OR5iIVLwMoxwM7yGd+6FCMtTFA==}
+ '@mui/utils@5.15.20':
+ resolution: {integrity: sha512-mAbYx0sovrnpAu1zHc3MDIhPqL8RPVC5W5xcO1b7PiSCJPtckIZmBkp8hefamAvUiAV8gpfMOM6Zb+eSisbI2A==}
engines: {node: '>=12.0.0'}
peerDependencies:
'@types/react': 18.2.55
@@ -3988,8 +3988,8 @@ packages:
'@types/react':
optional: true
- '@mui/x-charts@7.7.0':
- resolution: {integrity: sha512-HkJ6RGEjCyyPuZ79I+b0mo7B4B/w9iciJKpkNJ4HM5Wu3/vsVIsq6CdYYq83hk2Mtp+G9SIUeT/17CQ/9vxs/w==}
+ '@mui/x-charts@7.7.1':
+ resolution: {integrity: sha512-qUvkGGxBukHXLUqoTUs2rJZz1t+gK0P+bZzQWFbxN93XQyAhrjrOU8VN0x+G7nO3qcXrC2P6s0nevms7ZRSDrA==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.9.0
@@ -4003,40 +4003,40 @@ packages:
'@emotion/styled':
optional: true
- '@mui/x-data-grid-generator@7.7.0':
- resolution: {integrity: sha512-EL7NWjYivg0snLtC0Oja4bwekEChZHLw9ME496GuR9qvgq2Wfm6Kaa9dW1DmLL72l/lOIeck4RjIZtfltUnTCg==}
+ '@mui/x-data-grid-generator@7.7.1':
+ resolution: {integrity: sha512-QRZobT3MfSZMQTChBT4IbPiGPk0CKSQrZ0gHbal1CS/fBWutzbRFvAmXqNkpn/DLfypiokLmKkrNKcHSuZzwhQ==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@mui/icons-material': ^5.4.1
'@mui/material': ^5.15.14
react: ^17.0.0 || ^18.0.0
- '@mui/x-data-grid-premium@7.7.0':
- resolution: {integrity: sha512-SvJdmtj6gSmd1/fc3TwZgiv9Un53RvxaRG/0/Xa+hoS1BQeI6uITrf+qqzXTr6GfATBZyg3W9P45Wagu6QXk8Q==}
+ '@mui/x-data-grid-premium@7.7.1':
+ resolution: {integrity: sha512-fZa+vs2H6xMRh1XfrZcME19QCuE8OM8lrb7ybeJ2zKwzWbLFf+5jABB68Ku1kxdX2Je+lWRShRMGDsWecV75Cg==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@mui/material': ^5.15.14
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
- '@mui/x-data-grid-pro@7.7.0':
- resolution: {integrity: sha512-3yMZIFj0VopJzlSCJjBVZi9fBZhFJgqxquSuOwlMUhnQ4ocOP9Uov547wzBfR4op+bJD+P+O/GFcoi83CCyDuw==}
+ '@mui/x-data-grid-pro@7.7.1':
+ resolution: {integrity: sha512-Hu7R2BlGAE9nS3Lxt0V5Tbahkbi9wnzhqybtM71tktKa7YTM68lMPgrIhf3Blz/jZXvHdCfQm+JvlAeGvB9lPw==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@mui/material': ^5.15.14
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
- '@mui/x-data-grid@7.7.0':
- resolution: {integrity: sha512-s3Oii9EKcYPnL7M4g5evNley/J0slLL6xWRi0VwYqTHPGntBAMntUktMZ63bD/xko99f5ZcFoRBYTc55+mJ+AQ==}
+ '@mui/x-data-grid@7.7.1':
+ resolution: {integrity: sha512-5XsvuVpJfjV2ERtNiVRWL+0UUq5rh2Tq8aLZdJ8Ca5PnweEfNzOesQMlf0lpjXqnzuoq7uTwvICqoAMjsTTglg==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@mui/material': ^5.15.14
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
- '@mui/x-date-pickers-pro@7.7.0':
- resolution: {integrity: sha512-kIP6LzzhEWE281vXSIWO3W7IdW9G6mZ4EKAEGYWE+nZ+vnCopC7xHlDOtPDi/7ag7vWZDjB12gmo+19kM+brug==}
+ '@mui/x-date-pickers-pro@7.7.1':
+ resolution: {integrity: sha512-+E11dpc4nf1k+SB/bU6veYU7kt6n84n2HZCiRSjr1w5hkPBWiSsioejxzgcTsn+EiZ1TnrygivF4wbxiImp/ng==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.9.0
@@ -4071,8 +4071,8 @@ packages:
moment-jalaali:
optional: true
- '@mui/x-date-pickers@7.7.0':
- resolution: {integrity: sha512-huyoA22Vi8iCkee6ro0sX7CcFIcPV/Fl7ZGWwaQC8PTAheXhz823DjMYAiwRU/imF+UFYfUInWQ4XZCIkM+2Dw==}
+ '@mui/x-date-pickers@7.7.1':
+ resolution: {integrity: sha512-p7/TY8QcdQd6RelNqzW5q89GeUFctvZnDHTfQVEC0l0nAy7ArE6u21uNF8QWGrijZoJXCM+OlIRzlZADaUPpWA==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.9.0
@@ -4107,14 +4107,14 @@ packages:
moment-jalaali:
optional: true
- '@mui/x-license@7.7.0':
- resolution: {integrity: sha512-lslSjrgD0XmzSokYbuOZ2qiQmbEcq9w8SY4B8fnzVfwUa/pnaIFD0FmKOQRAsozwYD/P21PuXJ9r9jNAHVvc7w==}
+ '@mui/x-license@7.7.1':
+ resolution: {integrity: sha512-8Ycgidva5dmBHy5Uhf1X+Rqr7zuU9u3i8hefufT44Z5xYAVR0AJWKt75cTmBclyg0hpA55m6hRZwxP0W0cYN6A==}
engines: {node: '>=14.0.0'}
peerDependencies:
react: ^17.0.0 || ^18.0.0
- '@mui/x-tree-view@7.7.0':
- resolution: {integrity: sha512-kUTMS77EcNjp1iXZlm4GGFzZHnQdZJfn2L9gvxAaHtNTDSRMS61jpsCcXknIyC797dmRPdALPewNzSOfkThF+Q==}
+ '@mui/x-tree-view@7.7.1':
+ resolution: {integrity: sha512-r2K287+dN2XI5wdovinbJfTgiBbJLZsdQyYH7EXYO1HvHLjnRmY5UjmwTnsq75LJobjok5TAQNfrz2MXfsRY8w==}
engines: {node: '>=14.0.0'}
peerDependencies:
'@emotion/react': ^11.9.0
@@ -14239,7 +14239,7 @@ snapshots:
'@babel/runtime': 7.24.7
'@floating-ui/react-dom': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
prop-types: 15.8.1
@@ -14253,7 +14253,7 @@ snapshots:
'@babel/runtime': 7.24.7
'@floating-ui/react-dom': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
prop-types: 15.8.1
@@ -14267,7 +14267,7 @@ snapshots:
'@babel/runtime': 7.24.7
'@floating-ui/react-dom': 2.1.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@popperjs/core': 2.11.8
clsx: 2.1.1
prop-types: 15.8.1
@@ -14283,9 +14283,9 @@ snapshots:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.31(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/core-downloads-tracker': 5.15.14
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
clsx: 2.1.1
prop-types: 15.8.1
react: 18.2.0
@@ -14300,9 +14300,9 @@ snapshots:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.31(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/core-downloads-tracker': 5.15.14
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@types/react-transition-group': 4.4.10
clsx: 2.1.1
csstype: 3.1.3
@@ -14316,10 +14316,10 @@ snapshots:
'@emotion/styled': 11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
'@types/react': 18.2.55
- '@mui/private-theming@5.15.14(@types/react@18.2.55)(react@18.2.0)':
+ '@mui/private-theming@5.15.20(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
prop-types: 15.8.1
react: 18.2.0
optionalDependencies:
@@ -14356,13 +14356,13 @@ snapshots:
'@emotion/react': 11.11.4(@types/react@18.2.55)(react@18.2.0)
'@emotion/styled': 11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/system@5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)':
+ '@mui/system@5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
- '@mui/private-theming': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/private-theming': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@mui/styled-engine': 5.15.14(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(react@18.2.0)
'@mui/types': 7.2.14(@types/react@18.2.55)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
clsx: 2.1.1
csstype: 3.1.3
prop-types: 15.8.1
@@ -14392,7 +14392,7 @@ snapshots:
optionalDependencies:
'@types/react': 18.2.55
- '@mui/utils@5.15.14(@types/react@18.2.55)(react@18.2.0)':
+ '@mui/utils@5.15.20(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@types/prop-types': 15.7.12
@@ -14412,13 +14412,13 @@ snapshots:
optionalDependencies:
'@types/react': 18.2.55
- '@mui/x-charts@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-charts@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.40(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@react-spring/rafz': 9.7.3
'@react-spring/web': 9.7.3(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
clsx: 2.1.1
@@ -14436,13 +14436,13 @@ snapshots:
transitivePeerDependencies:
- '@types/react'
- '@mui/x-data-grid-generator@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-data-grid-generator@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/icons-material@packages+mui-icons-material+build)(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.40(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/icons-material': link:packages/mui-icons-material/build
'@mui/material': link:packages/mui-material/build
- '@mui/x-data-grid-premium': 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ '@mui/x-data-grid-premium': 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
chance: 1.1.11
clsx: 2.1.1
lru-cache: 7.18.3
@@ -14453,15 +14453,15 @@ snapshots:
- '@types/react'
- react-dom
- '@mui/x-data-grid-premium@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-data-grid-premium@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
- '@mui/x-data-grid': 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
- '@mui/x-data-grid-pro': 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
- '@mui/x-license': 7.7.0(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
+ '@mui/x-data-grid': 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ '@mui/x-data-grid-pro': 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ '@mui/x-license': 7.7.1(@types/react@18.2.55)(react@18.2.0)
'@types/format-util': 1.0.4
clsx: 2.1.1
exceljs: 4.4.0
@@ -14474,14 +14474,14 @@ snapshots:
- '@emotion/styled'
- '@types/react'
- '@mui/x-data-grid-pro@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-data-grid-pro@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
- '@mui/x-data-grid': 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
- '@mui/x-license': 7.7.0(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
+ '@mui/x-data-grid': 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ '@mui/x-license': 7.7.1(@types/react@18.2.55)(react@18.2.0)
'@types/format-util': 1.0.4
clsx: 2.1.1
prop-types: 15.8.1
@@ -14493,12 +14493,12 @@ snapshots:
- '@emotion/styled'
- '@types/react'
- '@mui/x-data-grid@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-data-grid@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
clsx: 2.1.1
prop-types: 15.8.1
react: 18.2.0
@@ -14509,15 +14509,15 @@ snapshots:
- '@emotion/styled'
- '@types/react'
- '@mui/x-date-pickers-pro@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-date-pickers-pro@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.40(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
- '@mui/x-date-pickers': 7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
- '@mui/x-license': 7.7.0(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
+ '@mui/x-date-pickers': 7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+ '@mui/x-license': 7.7.1(@types/react@18.2.55)(react@18.2.0)
clsx: 2.1.1
prop-types: 15.8.1
react: 18.2.0
@@ -14532,13 +14532,13 @@ snapshots:
transitivePeerDependencies:
- '@types/react'
- '@mui/x-date-pickers@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-date-pickers@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(date-fns-jalali@2.21.3-1)(date-fns@2.30.0)(dayjs@1.11.11)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@mui/base': 5.0.0-beta.40(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@types/react-transition-group': 4.4.10
clsx: 2.1.1
prop-types: 15.8.1
@@ -14554,23 +14554,23 @@ snapshots:
transitivePeerDependencies:
- '@types/react'
- '@mui/x-license@7.7.0(@types/react@18.2.55)(react@18.2.0)':
+ '@mui/x-license@7.7.1(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
react: 18.2.0
transitivePeerDependencies:
- '@types/react'
- '@mui/x-tree-view@7.7.0(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+ '@mui/x-tree-view@7.7.1(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@mui/material@packages+mui-material+build)(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
'@emotion/react': 11.11.4(@types/react@18.2.55)(react@18.2.0)
'@emotion/styled': 11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
'@mui/base': 5.0.0-beta.40(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui/material': link:packages/mui-material/build
- '@mui/system': 5.15.15(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
- '@mui/utils': 5.15.14(@types/react@18.2.55)(react@18.2.0)
+ '@mui/system': 5.15.20(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0))(@types/react@18.2.55)(react@18.2.0)
+ '@mui/utils': 5.15.20(@types/react@18.2.55)(react@18.2.0)
'@types/react-transition-group': 4.4.10
clsx: 2.1.1
prop-types: 15.8.1
From abbe033dea3d677120d8815bb73c2e19732015df Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:44:30 +0530
Subject: [PATCH 28/65] Bump danger to ^12.3.3 (#42720)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index b2891e8a6adb80..4b2dec371e2a81 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
"concurrently": "^8.2.2",
"cpy-cli": "^5.0.0",
"cross-env": "^7.0.3",
- "danger": "^12.3.1",
+ "danger": "^12.3.3",
"enzyme": "^3.11.0",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8f78387fb04f51..d11b0bf9707f06 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -174,8 +174,8 @@ importers:
specifier: ^7.0.3
version: 7.0.3
danger:
- specifier: ^12.3.1
- version: 12.3.1(encoding@0.1.13)
+ specifier: ^12.3.3
+ version: 12.3.3(encoding@0.1.13)
enzyme:
specifier: ^3.11.0
version: 3.11.0
@@ -6709,8 +6709,8 @@ packages:
damerau-levenshtein@1.0.8:
resolution: {integrity: sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==}
- danger@12.3.1:
- resolution: {integrity: sha512-K5ydQs6fTl6+iAWZJ5Fk238YmGMGnDx/5ZD7ZBTK4NgztAxXIupWVEYUACFy/lUpvih6EDKocn12OF1MS3UsLQ==}
+ danger@12.3.3:
+ resolution: {integrity: sha512-nZKzpgXN21rr4dwa6bFhM7G2JEa79dZRJiT3RVRSyi4yk1/hgZ2f8HDGoa7tMladTmu8WjJFyE3LpBIihh+aDw==}
engines: {node: '>=18'}
hasBin: true
@@ -17824,7 +17824,7 @@ snapshots:
damerau-levenshtein@1.0.8: {}
- danger@12.3.1(encoding@0.1.13):
+ danger@12.3.3(encoding@0.1.13):
dependencies:
'@gitbeaker/rest': 38.12.1
'@octokit/rest': 18.12.0(encoding@0.1.13)
From e0d119a14899f5e07737475be31f89f72a26394e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:45:50 +0530
Subject: [PATCH 29/65] Bump eslint-plugin-react to ^7.34.3 (#42721)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 25 +++++++++++++------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index 4b2dec371e2a81..2ba29011e97ac1 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
"eslint-plugin-jsx-a11y": "^6.7.1",
"eslint-plugin-material-ui": "workspace:^",
"eslint-plugin-mocha": "^10.4.3",
- "eslint-plugin-react": "^7.34.2",
+ "eslint-plugin-react": "^7.34.3",
"eslint-plugin-react-compiler": "0.0.0-experimental-51a85ea-20240601",
"eslint-plugin-react-hooks": "^4.6.2",
"fast-glob": "^3.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d11b0bf9707f06..6d2608b2070fa4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -184,7 +184,7 @@ importers:
version: 8.57.0
eslint-config-airbnb:
specifier: ^19.0.4
- version: 19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.2(eslint@8.57.0))(eslint@8.57.0)
+ version: 19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.3(eslint@8.57.0))(eslint@8.57.0)
eslint-config-airbnb-typescript:
specifier: ^18.0.0
version: 18.0.0(@typescript-eslint/eslint-plugin@6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint@8.57.0)(typescript@5.4.5))(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0)
@@ -213,8 +213,8 @@ importers:
specifier: ^10.4.3
version: 10.4.3(eslint@8.57.0)
eslint-plugin-react:
- specifier: ^7.34.2
- version: 7.34.2(eslint@8.57.0)
+ specifier: ^7.34.3
+ version: 7.34.3(eslint@8.57.0)
eslint-plugin-react-compiler:
specifier: 0.0.0-experimental-51a85ea-20240601
version: 0.0.0-experimental-51a85ea-20240601(eslint@8.57.0)
@@ -5780,8 +5780,9 @@ packages:
array.prototype.toreversed@1.1.2:
resolution: {integrity: sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==}
- array.prototype.tosorted@1.1.3:
- resolution: {integrity: sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==}
+ array.prototype.tosorted@1.1.4:
+ resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+ engines: {node: '>= 0.4'}
arraybuffer.prototype.slice@1.0.3:
resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
@@ -7277,8 +7278,8 @@ packages:
peerDependencies:
eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
- eslint-plugin-react@7.34.2:
- resolution: {integrity: sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==}
+ eslint-plugin-react@7.34.3:
+ resolution: {integrity: sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==}
engines: {node: '>=4'}
peerDependencies:
eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
@@ -16712,7 +16713,7 @@ snapshots:
es-abstract: 1.23.3
es-shim-unscopables: 1.0.2
- array.prototype.tosorted@1.1.3:
+ array.prototype.tosorted@1.1.4:
dependencies:
call-bind: 1.0.7
define-properties: 1.2.1
@@ -18433,13 +18434,13 @@ snapshots:
transitivePeerDependencies:
- eslint-plugin-import
- eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.2(eslint@8.57.0))(eslint@8.57.0):
+ eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint-plugin-jsx-a11y@6.7.1(eslint@8.57.0))(eslint-plugin-react-hooks@4.6.2(eslint@8.57.0))(eslint-plugin-react@7.34.3(eslint@8.57.0))(eslint@8.57.0):
dependencies:
eslint: 8.57.0
eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0))(eslint@8.57.0)
eslint-plugin-import: 2.29.1(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-webpack@0.13.8)(eslint@8.57.0)
eslint-plugin-jsx-a11y: 6.7.1(eslint@8.57.0)
- eslint-plugin-react: 7.34.2(eslint@8.57.0)
+ eslint-plugin-react: 7.34.3(eslint@8.57.0)
eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
object.assign: 4.1.5
object.entries: 1.1.8
@@ -18568,13 +18569,13 @@ snapshots:
dependencies:
eslint: 8.57.0
- eslint-plugin-react@7.34.2(eslint@8.57.0):
+ eslint-plugin-react@7.34.3(eslint@8.57.0):
dependencies:
array-includes: 3.1.8
array.prototype.findlast: 1.2.5
array.prototype.flatmap: 1.3.2
array.prototype.toreversed: 1.1.2
- array.prototype.tosorted: 1.1.3
+ array.prototype.tosorted: 1.1.4
doctrine: 2.1.0
es-iterator-helpers: 1.0.19
eslint: 8.57.0
From 8cd5c8f281ec749891af555506f6abf7fa1ff1ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:48:25 +0530
Subject: [PATCH 30/65] Bump nx to ^19.3.1 (#42722)
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 2ba29011e97ac1..bdd95046a9076b 100644
--- a/package.json
+++ b/package.json
@@ -172,7 +172,7 @@
"lodash": "^4.17.21",
"markdownlint-cli2": "^0.13.0",
"mocha": "^10.4.0",
- "nx": "^19.3.0",
+ "nx": "^19.3.1",
"nyc": "^17.0.0",
"piscina": "^4.5.1",
"postcss-styled-syntax": "^0.6.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6d2608b2070fa4..a99bba5d53f3a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -267,8 +267,8 @@ importers:
specifier: ^10.4.0
version: 10.4.0
nx:
- specifier: ^19.3.0
- version: 19.3.0
+ specifier: ^19.3.1
+ version: 19.3.1
nyc:
specifier: ^17.0.0
version: 17.0.0
@@ -4299,8 +4299,8 @@ packages:
'@nrwl/devkit@17.2.8':
resolution: {integrity: sha512-l2dFy5LkWqSA45s6pee6CoqJeluH+sjRdVnAAQfjLHRNSx6mFAKblyzq5h1f4P0EUCVVVqLs+kVqmNx5zxYqvw==}
- '@nrwl/tao@19.3.0':
- resolution: {integrity: sha512-MyGYeHbh9O4Tv9xmz3Du+/leY5sKUHaPy4ancfNyShHgYi21hemX0/YYjzzoYHi44D8GzSc1XG2rAuwba7Kilw==}
+ '@nrwl/tao@19.3.1':
+ resolution: {integrity: sha512-K3VqTNwJ5/4vAaExIVmESWnQgO95MiJEgo+OzkmfkFvYTCOH2006OwvgCJFTQdjyONJ8Ao/lUPrHSDfsoevSeA==}
hasBin: true
'@nx/devkit@17.2.8':
@@ -4308,62 +4308,62 @@ packages:
peerDependencies:
nx: '>= 16 <= 18'
- '@nx/nx-darwin-arm64@19.3.0':
- resolution: {integrity: sha512-TMTxjrN7Y/UsKFjmz0YfhVItLTGWqvud8cmQchw5NEjdNakfjXk0mREufO5/5PwoiRIsen6MbThoTprLpjOUiQ==}
+ '@nx/nx-darwin-arm64@19.3.1':
+ resolution: {integrity: sha512-B8kpnfBBJJE4YfSvpNPNdKLi63cyd41dZJRePkBrW/7Va/wUiHuKoyAEQZEI2WmH9ZM3RNmw7dp5vESr05Sw5g==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [darwin]
- '@nx/nx-darwin-x64@19.3.0':
- resolution: {integrity: sha512-GH2L6ftnzdIs7JEdv7ZPCdbpAdB5sW6NijK07riYZSONzq5fEruD1yDWDkyZbYBb8RTxsparUWJnq8q1qxEPHQ==}
+ '@nx/nx-darwin-x64@19.3.1':
+ resolution: {integrity: sha512-XKY76oi7hLQAKZzGlEsqPxNWx7BOS8E801CA9k+hKNVqNJdD6Vz/1hkhzKo/TwBrPkyhdvrq+BqBMLS7ZDefKw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [darwin]
- '@nx/nx-freebsd-x64@19.3.0':
- resolution: {integrity: sha512-1ow7Xku1yyjHviCKsWiuHCAnTd3fD+5O5c+e4DXHVthT8wnadKSotvBIWf38DMbMthl7na82e72OzxcdSbrVqQ==}
+ '@nx/nx-freebsd-x64@19.3.1':
+ resolution: {integrity: sha512-ZXDmzosPEq1DKC9r7UxPxF9I2GE11TmmYePcwN2xE1/you9+NUd14+SVW/jh/uH1j1n/41w0g35oNA6X0U+fGw==}
engines: {node: '>= 10'}
cpu: [x64]
os: [freebsd]
- '@nx/nx-linux-arm-gnueabihf@19.3.0':
- resolution: {integrity: sha512-mYQMIUvNr2gww8vbg766uk/C1RxoC1fwioeP87bmV5NRUKSzJ8WEJVxAsqc9RGhAOUaNXOgEuKYrMcVhKyIKJQ==}
+ '@nx/nx-linux-arm-gnueabihf@19.3.1':
+ resolution: {integrity: sha512-2Ls+08J14BmkHpkQ6DhHGdW97IcY3vvqmuwogTBrt5ATmJIim3o/O4Kp4Sq+uuotf0kae0NP986BuoFw/WW/xg==}
engines: {node: '>= 10'}
cpu: [arm]
os: [linux]
- '@nx/nx-linux-arm64-gnu@19.3.0':
- resolution: {integrity: sha512-rHL3eQ0RHkeAXnhHHu/NIyouN/ykiXvgyNU3TuCd50+2MZcAbjB+Xq3mwL0MwiP+BQuptiE+snTuxFUJp4ZH6A==}
+ '@nx/nx-linux-arm64-gnu@19.3.1':
+ resolution: {integrity: sha512-+UbThXaqKmctAavcwdYxmtZIjrojGLK4PJKdivR0awjPEJ9qXnxA0bOQk/GdbD8nse66LR2NnPeNDxxqfsh8tw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
- '@nx/nx-linux-arm64-musl@19.3.0':
- resolution: {integrity: sha512-im0+OgOD6ShpTkI9ZRz7BjzxhQ/Lk3xjYmmCu+PFGmaybEnkNNDFwsgS0iEVKMdWZ/EQoQvJrqOYsX125iIBuQ==}
+ '@nx/nx-linux-arm64-musl@19.3.1':
+ resolution: {integrity: sha512-JMuBbg2Zqdz4N7i+hiJGr2QdsDarDZ8vyzzeoevFq3b8nhZfqKh/lno7+Y0WkXNpH7aT05GHaUA1r1NXf/5BeQ==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [linux]
- '@nx/nx-linux-x64-gnu@19.3.0':
- resolution: {integrity: sha512-k8q/d6WBSXOeUpBq6Mw69yMKL4n9LaX3o4LBNwBkVCEZ8p6s0njwKefLtjwnKlai0g/k5f0NcilU2zTwP/Ex8g==}
+ '@nx/nx-linux-x64-gnu@19.3.1':
+ resolution: {integrity: sha512-cVmDMtolaqK7PziWxvjus1nCyj2wMNM+N0/4+rBEjG4v47gTtBxlZJoxK02jApdV+XELehsTjd0Z/xVfO4Rl1Q==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
- '@nx/nx-linux-x64-musl@19.3.0':
- resolution: {integrity: sha512-sahEV99glBlpGKG1TIQ5PkJ0QvpHp69wWsBFK2DKtCETxOtsWqwvIjemxTCXRirTqeHiP7BiR6VWsf2YqqqBdw==}
+ '@nx/nx-linux-x64-musl@19.3.1':
+ resolution: {integrity: sha512-UGujK/TLMz9TNJ6+6HLhoOV7pdlgPVosSyeNZcoXCHOg/Mg9NGM7Hgk9jDodtcAY+TP6QMDJIMVGuXBsCE7NLQ==}
engines: {node: '>= 10'}
cpu: [x64]
os: [linux]
- '@nx/nx-win32-arm64-msvc@19.3.0':
- resolution: {integrity: sha512-w03gFwLijStmhUji70QJHYo/U16ovybNczxGO7+5TT330X8/y+ihw9FCGHiIcujAjTAE88h0DKGn05WlNqRmfg==}
+ '@nx/nx-win32-arm64-msvc@19.3.1':
+ resolution: {integrity: sha512-q+2aaRXarh/+HOOW/JXRwEnEEwPdGipsfzXBPDuDDJ7aOYKuyG7g1DlSERKdzI/aEBP+joneZbcbZHaDcEv2xw==}
engines: {node: '>= 10'}
cpu: [arm64]
os: [win32]
- '@nx/nx-win32-x64-msvc@19.3.0':
- resolution: {integrity: sha512-M7e2zXGfTjH8NLiwqKLdWC9VlfMSQDYlI4/SM4OSpPqhUTfPlRPa+wNKNTG7perKfDXxE9ei8yjocujknXJk/A==}
+ '@nx/nx-win32-x64-msvc@19.3.1':
+ resolution: {integrity: sha512-TG4DP1lodTnIwY/CiSsc9Pk7o9/JZXgd1pP/xdHNTkrZYjE//z6TbSm+facBLuryuMhp6s/WlJaAlW241qva0Q==}
engines: {node: '>= 10'}
cpu: [x64]
os: [win32]
@@ -9682,8 +9682,8 @@ packages:
nwsapi@2.2.7:
resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
- nx@19.3.0:
- resolution: {integrity: sha512-WILWiROUkZWwuPJ12tP24Z0NULPEhxFN9i55/fECuVXYaFtkg6FvEne9C4d4bRqhZPcbrz6WhHnzE3NhdjH7XQ==}
+ nx@19.3.1:
+ resolution: {integrity: sha512-dDkhnXMpnDN5/ZJxJXz7wPlKA3pQwQmwNQ3YmTrCwucNbpwNRdwXiDgbLpjlGCtaeE9yZh2E/dAH1HNbgViJ6g==}
hasBin: true
peerDependencies:
'@swc-node/register': ^1.8.0
@@ -14148,7 +14148,7 @@ snapshots:
'@lerna/create@8.1.3(encoding@0.1.13)':
dependencies:
'@npmcli/run-script': 7.0.2
- '@nx/devkit': 17.2.8(nx@19.3.0)
+ '@nx/devkit': 17.2.8(nx@19.3.1)
'@octokit/plugin-enterprise-rest': 6.0.1
'@octokit/rest': 19.0.11(encoding@0.1.13)
byte-size: 8.1.1
@@ -14185,7 +14185,7 @@ snapshots:
npm-packlist: 5.1.1
npm-registry-fetch: 14.0.5
npmlog: 6.0.2
- nx: 19.3.0
+ nx: 19.3.1
p-map: 4.0.0
p-map-series: 2.1.0
p-queue: 6.6.2
@@ -14726,60 +14726,60 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@nrwl/devkit@17.2.8(nx@19.3.0)':
+ '@nrwl/devkit@17.2.8(nx@19.3.1)':
dependencies:
- '@nx/devkit': 17.2.8(nx@19.3.0)
+ '@nx/devkit': 17.2.8(nx@19.3.1)
transitivePeerDependencies:
- nx
- '@nrwl/tao@19.3.0':
+ '@nrwl/tao@19.3.1':
dependencies:
- nx: 19.3.0
+ nx: 19.3.1
tslib: 2.6.2
transitivePeerDependencies:
- '@swc-node/register'
- '@swc/core'
- debug
- '@nx/devkit@17.2.8(nx@19.3.0)':
+ '@nx/devkit@17.2.8(nx@19.3.1)':
dependencies:
- '@nrwl/devkit': 17.2.8(nx@19.3.0)
+ '@nrwl/devkit': 17.2.8(nx@19.3.1)
ejs: 3.1.8
enquirer: 2.3.6
ignore: 5.3.1
- nx: 19.3.0
+ nx: 19.3.1
semver: 7.5.3
tmp: 0.2.3
tslib: 2.6.2
- '@nx/nx-darwin-arm64@19.3.0':
+ '@nx/nx-darwin-arm64@19.3.1':
optional: true
- '@nx/nx-darwin-x64@19.3.0':
+ '@nx/nx-darwin-x64@19.3.1':
optional: true
- '@nx/nx-freebsd-x64@19.3.0':
+ '@nx/nx-freebsd-x64@19.3.1':
optional: true
- '@nx/nx-linux-arm-gnueabihf@19.3.0':
+ '@nx/nx-linux-arm-gnueabihf@19.3.1':
optional: true
- '@nx/nx-linux-arm64-gnu@19.3.0':
+ '@nx/nx-linux-arm64-gnu@19.3.1':
optional: true
- '@nx/nx-linux-arm64-musl@19.3.0':
+ '@nx/nx-linux-arm64-musl@19.3.1':
optional: true
- '@nx/nx-linux-x64-gnu@19.3.0':
+ '@nx/nx-linux-x64-gnu@19.3.1':
optional: true
- '@nx/nx-linux-x64-musl@19.3.0':
+ '@nx/nx-linux-x64-musl@19.3.1':
optional: true
- '@nx/nx-win32-arm64-msvc@19.3.0':
+ '@nx/nx-win32-arm64-msvc@19.3.1':
optional: true
- '@nx/nx-win32-x64-msvc@19.3.0':
+ '@nx/nx-win32-x64-msvc@19.3.1':
optional: true
'@octokit/auth-token@2.5.0':
@@ -20496,7 +20496,7 @@ snapshots:
dependencies:
'@lerna/create': 8.1.3(encoding@0.1.13)
'@npmcli/run-script': 7.0.2
- '@nx/devkit': 17.2.8(nx@19.3.0)
+ '@nx/devkit': 17.2.8(nx@19.3.1)
'@octokit/plugin-enterprise-rest': 6.0.1
'@octokit/rest': 19.0.11(encoding@0.1.13)
byte-size: 8.1.1
@@ -20539,7 +20539,7 @@ snapshots:
npm-packlist: 5.1.1
npm-registry-fetch: 14.0.5
npmlog: 6.0.2
- nx: 19.3.0
+ nx: 19.3.1
p-map: 4.0.0
p-map-series: 2.1.0
p-pipe: 3.1.0
@@ -21637,9 +21637,9 @@ snapshots:
nwsapi@2.2.7: {}
- nx@19.3.0:
+ nx@19.3.1:
dependencies:
- '@nrwl/tao': 19.3.0
+ '@nrwl/tao': 19.3.1
'@yarnpkg/lockfile': 1.1.0
'@yarnpkg/parsers': 3.0.0-rc.46
'@zkochan/js-yaml': 0.0.7
@@ -21674,16 +21674,16 @@ snapshots:
yargs: 17.7.2
yargs-parser: 21.1.1
optionalDependencies:
- '@nx/nx-darwin-arm64': 19.3.0
- '@nx/nx-darwin-x64': 19.3.0
- '@nx/nx-freebsd-x64': 19.3.0
- '@nx/nx-linux-arm-gnueabihf': 19.3.0
- '@nx/nx-linux-arm64-gnu': 19.3.0
- '@nx/nx-linux-arm64-musl': 19.3.0
- '@nx/nx-linux-x64-gnu': 19.3.0
- '@nx/nx-linux-x64-musl': 19.3.0
- '@nx/nx-win32-arm64-msvc': 19.3.0
- '@nx/nx-win32-x64-msvc': 19.3.0
+ '@nx/nx-darwin-arm64': 19.3.1
+ '@nx/nx-darwin-x64': 19.3.1
+ '@nx/nx-freebsd-x64': 19.3.1
+ '@nx/nx-linux-arm-gnueabihf': 19.3.1
+ '@nx/nx-linux-arm64-gnu': 19.3.1
+ '@nx/nx-linux-arm64-musl': 19.3.1
+ '@nx/nx-linux-x64-gnu': 19.3.1
+ '@nx/nx-linux-x64-musl': 19.3.1
+ '@nx/nx-win32-arm64-msvc': 19.3.1
+ '@nx/nx-win32-x64-msvc': 19.3.1
transitivePeerDependencies:
- debug
From 3a21fda51ebb8074bade8e2028eda9c53261bb45 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:49:05 +0530
Subject: [PATCH 31/65] Bump tsx to ^4.15.7 (#42723)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/package.json b/package.json
index bdd95046a9076b..5fb06be314d6b5 100644
--- a/package.json
+++ b/package.json
@@ -185,7 +185,7 @@
"stylelint-config-standard": "^34.0.0",
"stylelint-processor-styled-components": "^1.10.0",
"terser-webpack-plugin": "^5.3.10",
- "tsx": "^4.15.5",
+ "tsx": "^4.15.7",
"typescript": "^5.4.5",
"webpack": "^5.92.0",
"webpack-bundle-analyzer": "^4.10.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a99bba5d53f3a4..e8ebd318067f78 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -306,8 +306,8 @@ importers:
specifier: ^5.3.10
version: 5.3.10(webpack@5.92.0(webpack-cli@5.1.4))
tsx:
- specifier: ^4.15.5
- version: 4.15.5
+ specifier: ^4.15.7
+ version: 4.15.7
typescript:
specifier: ^5.4.5
version: 5.4.5
@@ -1395,7 +1395,7 @@ importers:
version: 8.4.38
postcss-cli:
specifier: ^11.0.0
- version: 11.0.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.5)
+ version: 11.0.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.7)
yargs:
specifier: ^17.7.2
version: 17.7.2
@@ -11740,8 +11740,8 @@ packages:
resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
engines: {node: '>=0.6.x'}
- tsx@4.15.5:
- resolution: {integrity: sha512-iKi8jQ2VBmZ2kU/FkGkL2OSHBHsazsUzsdC/W/RwhKIEsIoZ1alCclZHP5jGfNHEaEWUJFM1GquzCf+4db3b0w==}
+ tsx@4.15.7:
+ resolution: {integrity: sha512-u3H0iSFDZM3za+VxkZ1kywdCeHCn+8/qHQS1MNoO2sONDgD95HlWtt8aB23OzeTmFP9IU4/8bZUdg58Uu5J4cg==}
engines: {node: '>=18.0.0'}
hasBin: true
@@ -22181,7 +22181,7 @@ snapshots:
possible-typed-array-names@1.0.0: {}
- postcss-cli@11.0.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.5):
+ postcss-cli@11.0.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.7):
dependencies:
chokidar: 3.6.0
dependency-graph: 0.11.0
@@ -22190,7 +22190,7 @@ snapshots:
globby: 14.0.1
picocolors: 1.0.1
postcss: 8.4.38
- postcss-load-config: 5.1.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.5)
+ postcss-load-config: 5.1.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.7)
postcss-reporter: 7.1.0(postcss@8.4.38)
pretty-hrtime: 1.0.3
read-cache: 1.0.0
@@ -22230,14 +22230,14 @@ snapshots:
optionalDependencies:
postcss: 8.4.38
- postcss-load-config@5.1.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.5):
+ postcss-load-config@5.1.0(jiti@1.21.0)(postcss@8.4.38)(tsx@4.15.7):
dependencies:
lilconfig: 3.1.1
yaml: 2.4.2
optionalDependencies:
jiti: 1.21.0
postcss: 8.4.38
- tsx: 4.15.5
+ tsx: 4.15.7
postcss-nested@6.0.1(postcss@8.4.38):
dependencies:
@@ -24092,7 +24092,7 @@ snapshots:
tsscmp@1.0.6: {}
- tsx@4.15.5:
+ tsx@4.15.7:
dependencies:
esbuild: 0.21.5
get-tsconfig: 4.7.5
From 4a31b981a0e7da413a4209ba59d1de50e5fb7da1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:49:40 +0530
Subject: [PATCH 32/65] Bump webpack to ^5.92.1 (#42724)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
benchmark/package.json | 2 +-
package.json | 2 +-
pnpm-lock.yaml | 104 ++++++++++++++++++++---------------------
test/package.json | 2 +-
4 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/benchmark/package.json b/benchmark/package.json
index c8685b2f2ea1d0..268161e59a29f6 100644
--- a/benchmark/package.json
+++ b/benchmark/package.json
@@ -37,6 +37,6 @@
"styled-components": "^6.1.11",
"styled-system": "^5.1.5",
"theme-ui": "^0.16.2",
- "webpack": "^5.92.0"
+ "webpack": "^5.92.1"
}
}
diff --git a/package.json b/package.json
index 5fb06be314d6b5..3a614aed039cf3 100644
--- a/package.json
+++ b/package.json
@@ -187,7 +187,7 @@
"terser-webpack-plugin": "^5.3.10",
"tsx": "^4.15.7",
"typescript": "^5.4.5",
- "webpack": "^5.92.0",
+ "webpack": "^5.92.1",
"webpack-bundle-analyzer": "^4.10.2",
"webpack-cli": "^5.1.4",
"yargs": "^17.7.2"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e8ebd318067f78..856000efe0b6b9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -139,7 +139,7 @@ importers:
version: 6.21.0(eslint@8.57.0)(typescript@5.4.5)
babel-loader:
specifier: ^9.1.3
- version: 9.1.3(@babel/core@7.24.7)(webpack@5.92.0(webpack-cli@5.1.4))
+ version: 9.1.3(@babel/core@7.24.7)(webpack@5.92.1(webpack-cli@5.1.4))
babel-plugin-istanbul:
specifier: ^6.1.1
version: 6.1.1
@@ -163,7 +163,7 @@ importers:
version: 5.3.0
compression-webpack-plugin:
specifier: ^11.1.0
- version: 11.1.0(webpack@5.92.0(webpack-cli@5.1.4))
+ version: 11.1.0(webpack@5.92.1(webpack-cli@5.1.4))
concurrently:
specifier: ^8.2.2
version: 8.2.2
@@ -193,7 +193,7 @@ importers:
version: 9.1.0(eslint@8.57.0)
eslint-import-resolver-webpack:
specifier: ^0.13.8
- version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.0(webpack-cli@5.1.4))
+ version: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4))
eslint-plugin-babel:
specifier: ^5.3.1
version: 5.3.1(eslint@8.57.0)
@@ -253,7 +253,7 @@ importers:
version: 0.4.0
karma-webpack:
specifier: ^5.0.0
- version: 5.0.0(webpack@5.92.0(webpack-cli@5.1.4))
+ version: 5.0.0(webpack@5.92.1(webpack-cli@5.1.4))
lerna:
specifier: ^8.1.3
version: 8.1.3(encoding@0.1.13)
@@ -304,7 +304,7 @@ importers:
version: 1.10.0
terser-webpack-plugin:
specifier: ^5.3.10
- version: 5.3.10(webpack@5.92.0(webpack-cli@5.1.4))
+ version: 5.3.10(webpack@5.92.1(webpack-cli@5.1.4))
tsx:
specifier: ^4.15.7
version: 4.15.7
@@ -312,14 +312,14 @@ importers:
specifier: ^5.4.5
version: 5.4.5
webpack:
- specifier: ^5.92.0
- version: 5.92.0(webpack-cli@5.1.4)
+ specifier: ^5.92.1
+ version: 5.92.1(webpack-cli@5.1.4)
webpack-bundle-analyzer:
specifier: ^4.10.2
version: 4.10.2
webpack-cli:
specifier: ^5.1.4
- version: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ version: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
yargs:
specifier: ^17.7.2
version: 17.7.2
@@ -548,8 +548,8 @@ importers:
specifier: ^0.16.2
version: 0.16.2(@emotion/react@11.11.4(@types/react@18.2.55)(react@18.2.0))(react@18.2.0)
webpack:
- specifier: ^5.92.0
- version: 5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))
+ specifier: ^5.92.1
+ version: 5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))
docs:
dependencies:
@@ -2289,7 +2289,7 @@ importers:
version: 11.2.0
html-webpack-plugin:
specifier: ^5.6.0
- version: 5.6.0(webpack@5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)))
+ version: 5.6.0(webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)))
lodash:
specifier: ^4.17.21
version: 4.17.21
@@ -2330,8 +2330,8 @@ importers:
specifier: ^1.6.28
version: 1.6.28
webpack:
- specifier: ^5.92.0
- version: 5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))
+ specifier: ^5.92.1
+ version: 5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))
yargs:
specifier: ^17.7.2
version: 17.7.2
@@ -12133,8 +12133,8 @@ packages:
webpack-virtual-modules@0.6.1:
resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
- webpack@5.92.0:
- resolution: {integrity: sha512-Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA==}
+ webpack@5.92.1:
+ resolution: {integrity: sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==}
engines: {node: '>=10.13.0'}
hasBin: true
peerDependencies:
@@ -16323,20 +16323,20 @@ snapshots:
'@webassemblyjs/ast': 1.12.1
'@xtuc/long': 4.2.2
- '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))':
+ '@webpack-cli/configtest@2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))':
dependencies:
- webpack: 5.92.0(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ webpack: 5.92.1(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
- '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))':
+ '@webpack-cli/info@2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))':
dependencies:
- webpack: 5.92.0(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ webpack: 5.92.1(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
- '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))':
+ '@webpack-cli/serve@2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))':
dependencies:
- webpack: 5.92.0(webpack-cli@5.1.4)
- webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ webpack: 5.92.1(webpack-cli@5.1.4)
+ webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
'@wyw-in-js/processor-utils@0.5.3':
dependencies:
@@ -16823,12 +16823,12 @@ snapshots:
dependencies:
'@babel/core': 7.24.7
- babel-loader@9.1.3(@babel/core@7.24.7)(webpack@5.92.0(webpack-cli@5.1.4)):
+ babel-loader@9.1.3(@babel/core@7.24.7)(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
'@babel/core': 7.24.7
find-cache-dir: 4.0.0
schema-utils: 4.2.0
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
babel-merge@3.0.0(@babel/core@7.24.7):
dependencies:
@@ -17475,11 +17475,11 @@ snapshots:
dependencies:
mime-db: 1.52.0
- compression-webpack-plugin@11.1.0(webpack@5.92.0(webpack-cli@5.1.4)):
+ compression-webpack-plugin@11.1.0(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
schema-utils: 4.2.0
serialize-javascript: 6.0.2
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
compression@1.7.4:
dependencies:
@@ -18457,7 +18457,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.0(webpack-cli@5.1.4)):
+ eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
array.prototype.find: 2.2.2
debug: 3.2.7
@@ -18471,18 +18471,18 @@ snapshots:
lodash: 4.17.21
resolve: 2.0.0-next.5
semver: 5.7.2
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
transitivePeerDependencies:
- supports-color
- eslint-module-utils@2.8.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.0(webpack-cli@5.1.4)))(eslint@8.57.0):
+ eslint-module-utils@2.8.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0):
dependencies:
debug: 3.2.7
optionalDependencies:
'@typescript-eslint/parser': 6.21.0(eslint@8.57.0)(typescript@5.4.5)
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
- eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.0(webpack-cli@5.1.4))
+ eslint-import-resolver-webpack: 0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4))
transitivePeerDependencies:
- supports-color
@@ -18509,7 +18509,7 @@ snapshots:
doctrine: 2.1.0
eslint: 8.57.0
eslint-import-resolver-node: 0.3.9
- eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.0(webpack-cli@5.1.4)))(eslint@8.57.0)
+ eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.21.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-webpack@0.13.8(eslint-plugin-import@2.29.1)(webpack@5.92.1(webpack-cli@5.1.4)))(eslint@8.57.0)
hasown: 2.0.2
is-core-module: 2.13.1
is-glob: 4.0.3
@@ -19498,7 +19498,7 @@ snapshots:
readable-stream: 1.0.34
through2: 0.4.2
- html-webpack-plugin@5.6.0(webpack@5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))):
+ html-webpack-plugin@5.6.0(webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))):
dependencies:
'@types/html-minifier-terser': 6.1.0
html-minifier-terser: 6.1.0
@@ -19506,7 +19506,7 @@ snapshots:
pretty-error: 4.0.0
tapable: 2.2.1
optionalDependencies:
- webpack: 5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))
+ webpack: 5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))
htmlparser2@6.1.0:
dependencies:
@@ -20429,11 +20429,11 @@ snapshots:
dependencies:
graceful-fs: 4.2.11
- karma-webpack@5.0.0(webpack@5.92.0(webpack-cli@5.1.4)):
+ karma-webpack@5.0.0(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
glob: 7.2.3
minimatch: 3.1.2
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
webpack-merge: 4.2.2
karma@6.4.3:
@@ -23938,23 +23938,23 @@ snapshots:
dependencies:
rimraf: 2.6.3
- terser-webpack-plugin@5.3.10(webpack@5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))):
+ terser-webpack-plugin@5.3.10(webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))):
dependencies:
'@jridgewell/trace-mapping': 0.3.25
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.2
terser: 5.29.2
- webpack: 5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))
+ webpack: 5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))
- terser-webpack-plugin@5.3.10(webpack@5.92.0(webpack-cli@5.1.4)):
+ terser-webpack-plugin@5.3.10(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
'@jridgewell/trace-mapping': 0.3.25
jest-worker: 27.5.1
schema-utils: 3.3.0
serialize-javascript: 6.0.2
terser: 5.29.2
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
terser@5.29.2:
dependencies:
@@ -24462,12 +24462,12 @@ snapshots:
- bufferutil
- utf-8-validate
- webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0):
+ webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1):
dependencies:
'@discoveryjs/json-ext': 0.5.7
- '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))
- '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))
- '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0))(webpack@5.92.0(webpack-cli@5.1.4))
+ '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))
+ '@webpack-cli/info': 2.0.2(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))
+ '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))(webpack@5.92.1(webpack-cli@5.1.4))
colorette: 2.0.20
commander: 10.0.1
cross-spawn: 7.0.3
@@ -24476,7 +24476,7 @@ snapshots:
import-local: 3.1.0
interpret: 3.1.1
rechoir: 0.8.0
- webpack: 5.92.0(webpack-cli@5.1.4)
+ webpack: 5.92.1(webpack-cli@5.1.4)
webpack-merge: 5.9.0
optionalDependencies:
webpack-bundle-analyzer: 4.10.2
@@ -24494,7 +24494,7 @@ snapshots:
webpack-virtual-modules@0.6.1: {}
- webpack@5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)):
+ webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)):
dependencies:
'@types/eslint-scope': 3.7.4
'@types/estree': 1.0.5
@@ -24517,17 +24517,17 @@ snapshots:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(webpack@5.92.0(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)))
+ terser-webpack-plugin: 5.3.10(webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)))
watchpack: 2.4.1
webpack-sources: 3.2.3
optionalDependencies:
- webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
transitivePeerDependencies:
- '@swc/core'
- esbuild
- uglify-js
- webpack@5.92.0(webpack-cli@5.1.4):
+ webpack@5.92.1(webpack-cli@5.1.4):
dependencies:
'@types/eslint-scope': 3.7.4
'@types/estree': 1.0.5
@@ -24550,11 +24550,11 @@ snapshots:
neo-async: 2.6.2
schema-utils: 3.3.0
tapable: 2.2.1
- terser-webpack-plugin: 5.3.10(webpack@5.92.0(webpack-cli@5.1.4))
+ terser-webpack-plugin: 5.3.10(webpack@5.92.1(webpack-cli@5.1.4))
watchpack: 2.4.1
webpack-sources: 3.2.3
optionalDependencies:
- webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.0)
+ webpack-cli: 5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1)
transitivePeerDependencies:
- '@swc/core'
- esbuild
diff --git a/test/package.json b/test/package.json
index 9fc9b3578bcd66..7f2aa77835bd4b 100644
--- a/test/package.json
+++ b/test/package.json
@@ -41,7 +41,7 @@
"stylis-plugin-rtl": "^2.1.1",
"stylis-plugin-rtl-sc": "npm:stylis-plugin-rtl@^1.1.0",
"webfontloader": "^1.6.28",
- "webpack": "^5.92.0",
+ "webpack": "^5.92.1",
"yargs": "^17.7.2"
},
"dependencies": {
From 4978ba8fb6bc12e7b7e8d972d9fc7c289154b036 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:50:27 +0530
Subject: [PATCH 33/65] Bump @argos-ci/core to ^2.3.0 (#42725)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 3a614aed039cf3..cd9363e573e7bc 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
"google-auth-library": "^9.11.0"
},
"devDependencies": {
- "@argos-ci/core": "^2.2.0",
+ "@argos-ci/core": "^2.3.0",
"@babel/cli": "^7.24.7",
"@babel/core": "^7.24.7",
"@babel/node": "^7.24.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 856000efe0b6b9..e10e0fc354a2bf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -42,8 +42,8 @@ importers:
version: 9.11.0(encoding@0.1.13)
devDependencies:
'@argos-ci/core':
- specifier: ^2.2.0
- version: 2.2.0
+ specifier: ^2.3.0
+ version: 2.3.0
'@babel/cli':
specifier: ^7.24.7
version: 7.24.7(@babel/core@7.24.7)
@@ -2430,8 +2430,8 @@ packages:
resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
engines: {node: '>=6.0.0'}
- '@argos-ci/core@2.2.0':
- resolution: {integrity: sha512-T5W37CZ6HZjRcVAXuPj0wUB/Fm4VdwLvKpQL9yqSwiJganeNz7u8AFYJ30ujSUJS1jdUViW5TNnmsgDjuvGyTQ==}
+ '@argos-ci/core@2.3.0':
+ resolution: {integrity: sha512-0mHncBeOD7GFYfGZYUEcDgLyzsvPyxK/L1MROfAurFeWcw89ODG24JEdPsECtZBSCZMmMcK8XqeJIJkZsnDGZA==}
engines: {node: '>=18.0.0'}
'@argos-ci/util@2.0.0':
@@ -12559,7 +12559,7 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.5
'@jridgewell/trace-mapping': 0.3.25
- '@argos-ci/core@2.2.0':
+ '@argos-ci/core@2.3.0':
dependencies:
'@argos-ci/util': 2.0.0
axios: 1.6.8(debug@4.3.4)
From eb350d577e7272dad7a146d949d12d57e020c7e4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 16:51:21 +0530
Subject: [PATCH 34/65] Bump aws-sdk to ^2.1646.0 (#42728)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
packages/feedback/package.json | 2 +-
pnpm-lock.yaml | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/feedback/package.json b/packages/feedback/package.json
index 37daa907aead91..8b625c68c02ca0 100644
--- a/packages/feedback/package.json
+++ b/packages/feedback/package.json
@@ -25,6 +25,6 @@
"claudia": "^5.14.1"
},
"optionalDependencies": {
- "aws-sdk": "^2.1642.0"
+ "aws-sdk": "^2.1646.0"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e10e0fc354a2bf..b72b1fd645df1e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1236,8 +1236,8 @@ importers:
version: 9.0.1
optionalDependencies:
aws-sdk:
- specifier: ^2.1642.0
- version: 2.1642.0
+ specifier: ^2.1646.0
+ version: 2.1646.0
devDependencies:
claudia:
specifier: ^5.14.1
@@ -5858,8 +5858,8 @@ packages:
resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
engines: {node: '>= 0.4'}
- aws-sdk@2.1642.0:
- resolution: {integrity: sha512-xTqRcLbb7F3GadFQN1+m25nP1twA2Lmlmhpt5gbYb3VCR91lb+c9EnsEr7U60zLv4AR2ip/GkDtSpKS/EzLOzA==}
+ aws-sdk@2.1646.0:
+ resolution: {integrity: sha512-PAvDiR8ow3zjO0T5HMda04kXIzQ5e1zeWxWGSUodRwu9W569gZPBnqzcPX3PJFNAKBZnZBdbNgsci1g2nXCcBg==}
engines: {node: '>= 10.0.0'}
axe-core@4.7.2:
@@ -16792,7 +16792,7 @@ snapshots:
dependencies:
possible-typed-array-names: 1.0.0
- aws-sdk@2.1642.0:
+ aws-sdk@2.1646.0:
dependencies:
buffer: 4.9.2
events: 1.1.1
@@ -17310,7 +17310,7 @@ snapshots:
claudia@5.14.1:
dependencies:
archiver: 3.1.1
- aws-sdk: 2.1642.0
+ aws-sdk: 2.1646.0
fs-extra: 6.0.1
glob: 7.2.3
gunzip-maybe: 1.4.2
From 55f4ddf7dcabc31ae87affcb91ec8db56c55d660 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:12:38 +0530
Subject: [PATCH 35/65] Bump @slack/bolt to ^3.19.0 (#42727)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index cd9363e573e7bc..c041616f018f75 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
"dependencies": {
"@googleapis/sheets": "^8.0.0",
"@netlify/functions": "^2.7.0",
- "@slack/bolt": "^3.18.0",
+ "@slack/bolt": "^3.19.0",
"execa": "^9.2.0",
"google-auth-library": "^9.11.0"
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b72b1fd645df1e..ea178cae81cebb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,8 +32,8 @@ importers:
specifier: ^2.7.0
version: 2.7.0(@opentelemetry/api@1.8.0)
'@slack/bolt':
- specifier: ^3.18.0
- version: 3.18.0
+ specifier: ^3.19.0
+ version: 3.19.0
execa:
specifier: ^9.2.0
version: 9.2.0
@@ -4931,8 +4931,8 @@ packages:
'@sinonjs/text-encoding@0.7.2':
resolution: {integrity: sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==}
- '@slack/bolt@3.18.0':
- resolution: {integrity: sha512-A7bDi5kY50fS6/nsmURkQdO3iMxD8aX/rA+m1UXEM2ue2z4KijeQtx2sOZ4YkJQ/h7BsgTQM0CYh3qqmo+m5sQ==}
+ '@slack/bolt@3.19.0':
+ resolution: {integrity: sha512-P5Yup/PbO8sE5xsuqkBkpSPkxEkfWZ6yo5ZlmBGxRhhoU1usUSU2w0bgZoiDX4WFm7ZX+3x2Dyf4VMa9kzfmVQ==}
engines: {node: '>=12.13.0', npm: '>=6.12.0'}
'@slack/logger@3.0.0':
@@ -15632,7 +15632,7 @@ snapshots:
'@sinonjs/text-encoding@0.7.2': {}
- '@slack/bolt@3.18.0':
+ '@slack/bolt@3.19.0':
dependencies:
'@slack/logger': 4.0.0
'@slack/oauth': 2.6.2
From 7bdc0300b01278e995b2450a1ecd8551680ea458 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:16:06 +0530
Subject: [PATCH 36/65] Bump jscodeshift to ^0.16.0 (#42730)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
packages/mui-codemod/package.json | 2 +-
pnpm-lock.yaml | 398 ++++++++++++++++++++++++++----
2 files changed, 348 insertions(+), 52 deletions(-)
diff --git a/packages/mui-codemod/package.json b/packages/mui-codemod/package.json
index 2fe4c040851eb8..b17022668676f6 100644
--- a/packages/mui-codemod/package.json
+++ b/packages/mui-codemod/package.json
@@ -33,7 +33,7 @@
"@babel/core": "^7.24.7",
"@babel/runtime": "^7.24.7",
"@babel/traverse": "^7.24.7",
- "jscodeshift": "^0.15.2",
+ "jscodeshift": "^0.16.0",
"jscodeshift-add-imports": "^1.0.10",
"postcss": "^8.4.38",
"postcss-cli": "^11.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea178cae81cebb..14a5777aa3eb0c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1385,11 +1385,11 @@ importers:
specifier: ^7.24.7
version: 7.24.7
jscodeshift:
- specifier: ^0.15.2
- version: 0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7))
+ specifier: ^0.16.0
+ version: 0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7))
jscodeshift-add-imports:
specifier: ^1.0.10
- version: 1.0.10(jscodeshift@0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7)))
+ version: 1.0.10(jscodeshift@0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7)))
postcss:
specifier: ^8.4.38
version: 8.4.38
@@ -2708,8 +2708,8 @@ packages:
peerDependencies:
'@babel/core': ^7.24.7
- '@babel/plugin-syntax-flow@7.24.1':
- resolution: {integrity: sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA==}
+ '@babel/plugin-syntax-flow@7.24.7':
+ resolution: {integrity: sha512-9G8GYT/dxn/D1IIKOUBmGX0mnmj46mGH9NnZyJLwtCpgh5f7D2VbuKodb+2s9m1Yavh1s7ASQN8lf0eqrb1LTw==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.24.7
@@ -2886,8 +2886,8 @@ packages:
peerDependencies:
'@babel/core': ^7.24.7
- '@babel/plugin-transform-flow-strip-types@7.24.1':
- resolution: {integrity: sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==}
+ '@babel/plugin-transform-flow-strip-types@7.24.7':
+ resolution: {integrity: sha512-cjRKJ7FobOH2eakx7Ja+KpJRj8+y+/SiB3ooYm/n2UJfxu0oEaOoxOinitkJcPqv9KxS0kxTGPUaR7L2XcXDXA==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.24.7
@@ -3150,8 +3150,8 @@ packages:
peerDependencies:
'@babel/core': ^7.24.7
- '@babel/preset-flow@7.24.1':
- resolution: {integrity: sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA==}
+ '@babel/preset-flow@7.24.7':
+ resolution: {integrity: sha512-NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==}
engines: {node: '>=6.9.0'}
peerDependencies:
'@babel/core': ^7.24.7
@@ -5638,6 +5638,10 @@ packages:
ansi-fragments@0.2.1:
resolution: {integrity: sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==}
+ ansi-regex@2.1.1:
+ resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
+ engines: {node: '>=0.10.0'}
+
ansi-regex@4.1.1:
resolution: {integrity: sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==}
engines: {node: '>=6'}
@@ -5650,6 +5654,10 @@ packages:
resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
engines: {node: '>=12'}
+ ansi-styles@2.2.1:
+ resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
+ engines: {node: '>=0.10.0'}
+
ansi-styles@3.2.1:
resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
engines: {node: '>=4'}
@@ -5872,11 +5880,23 @@ packages:
axobject-query@3.2.1:
resolution: {integrity: sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==}
+ babel-code-frame@6.26.0:
+ resolution: {integrity: sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==}
+
+ babel-core@6.26.3:
+ resolution: {integrity: sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==}
+
babel-core@7.0.0-bridge.0:
resolution: {integrity: sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==}
peerDependencies:
'@babel/core': ^7.24.7
+ babel-generator@6.26.1:
+ resolution: {integrity: sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==}
+
+ babel-helpers@6.24.1:
+ resolution: {integrity: sha512-n7pFrqQm44TCYvrCDb0MqabAF+JUBq+ijBvNMUxpkLjJaAu32faIexewMumrH5KLLJ1HDyT0PTEqRyAe/GwwuQ==}
+
babel-loader@9.1.3:
resolution: {integrity: sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==}
engines: {node: '>= 14.15.0'}
@@ -5890,6 +5910,9 @@ packages:
peerDependencies:
'@babel/core': ^7.24.7
+ babel-messages@6.23.0:
+ resolution: {integrity: sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w==}
+
babel-plugin-define-var@0.1.0:
resolution: {integrity: sha512-WcK43U4uz+9G35Wvdnyri4Tcg8Ux9/hSbQC4ckpfrHFQp8Cuz1BIQK5NswuGxT3T8cc3d4e55wDeSO4dViOugg==}
engines: {node: '>=10'}
@@ -5938,6 +5961,25 @@ packages:
babel-plugin-transform-react-remove-prop-types@0.4.24:
resolution: {integrity: sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==}
+ babel-register@6.26.0:
+ resolution: {integrity: sha512-veliHlHX06wjaeY8xNITbveXSiI+ASFnOqvne/LaIJIqOWi2Ogmj91KOugEz/hoh/fwMhXNBJPCv8Xaz5CyM4A==}
+
+ babel-runtime@6.26.0:
+ resolution: {integrity: sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==}
+
+ babel-template@6.26.0:
+ resolution: {integrity: sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg==}
+
+ babel-traverse@6.26.0:
+ resolution: {integrity: sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA==}
+
+ babel-types@6.26.0:
+ resolution: {integrity: sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g==}
+
+ babylon@6.18.0:
+ resolution: {integrity: sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==}
+ hasBin: true
+
bail@1.0.5:
resolution: {integrity: sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==}
@@ -5997,8 +6039,8 @@ packages:
brace-expansion@2.0.1:
resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
- braces@3.0.2:
- resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
+ braces@3.0.3:
+ resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
engines: {node: '>=8'}
browser-stdout@1.3.1:
@@ -6159,6 +6201,10 @@ packages:
resolution: {integrity: sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==}
engines: {node: '>=12'}
+ chalk@1.1.3:
+ resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
+ engines: {node: '>=0.10.0'}
+
chalk@2.4.2:
resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
engines: {node: '>=4'}
@@ -6885,6 +6931,10 @@ packages:
resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+ detect-indent@4.0.0:
+ resolution: {integrity: sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A==}
+ engines: {node: '>=0.10.0'}
+
detect-indent@5.0.0:
resolution: {integrity: sha512-rlpvsxUtM0PQvy9iZe640/IWwWYyBsTApREbA1pHOpmOUIl9MkP/U4z7vTtg4Oaojvqhxt7sdufnT0EzGaR31g==}
engines: {node: '>=4'}
@@ -7483,8 +7533,8 @@ packages:
filelist@1.0.4:
resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
- fill-range@7.0.1:
- resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
+ fill-range@7.1.1:
+ resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
final-form@4.20.10:
@@ -7816,6 +7866,10 @@ packages:
resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
engines: {node: '>=8'}
+ globals@9.18.0:
+ resolution: {integrity: sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==}
+ engines: {node: '>=0.10.0'}
+
globalthis@1.0.3:
resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
engines: {node: '>= 0.4'}
@@ -7885,6 +7939,10 @@ packages:
resolution: {integrity: sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==}
engines: {node: '>=6'}
+ has-ansi@2.0.0:
+ resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
+ engines: {node: '>=0.10.0'}
+
has-bigints@1.0.2:
resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
@@ -7953,6 +8011,10 @@ packages:
hoist-non-react-statics@3.3.2:
resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
+ home-or-tmp@2.0.0:
+ resolution: {integrity: sha512-ycURW7oUxE2sNiPVw1HVEFsW+ecOpJ5zaj7eC0RlwhibhRBod20muUN8qu/gzx956YrLolVvs1MTXwKgC2rVEg==}
+ engines: {node: '>=0.10.0'}
+
homedir-polyfill@1.0.3:
resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
engines: {node: '>=0.10.0'}
@@ -8267,6 +8329,10 @@ packages:
is-finalizationregistry@1.0.2:
resolution: {integrity: sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==}
+ is-finite@1.1.0:
+ resolution: {integrity: sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==}
+ engines: {node: '>=0.10.0'}
+
is-fullwidth-code-point@2.0.0:
resolution: {integrity: sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==}
engines: {node: '>=4'}
@@ -8568,6 +8634,9 @@ packages:
joi@17.12.2:
resolution: {integrity: sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw==}
+ js-tokens@3.0.2:
+ resolution: {integrity: sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg==}
+
js-tokens@4.0.0:
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -8601,8 +8670,8 @@ packages:
peerDependencies:
'@babel/preset-env': ^7.24.7
- jscodeshift@0.15.2:
- resolution: {integrity: sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==}
+ jscodeshift@0.16.0:
+ resolution: {integrity: sha512-cIpXaBLnUJr1xdtj+odUsOn47wco6JPmmciTqF3E+BaN3DYL5YtLxwUgS1jw/Q26Dc6fsmcqnm8zDYOOlSqRsg==}
hasBin: true
peerDependencies:
'@babel/preset-env': ^7.24.7
@@ -8623,6 +8692,10 @@ packages:
resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==}
hasBin: true
+ jsesc@1.3.0:
+ resolution: {integrity: sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA==}
+ hasBin: true
+
jsesc@2.5.2:
resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==}
engines: {node: '>=4'}
@@ -8659,6 +8732,10 @@ packages:
json2mq@0.2.0:
resolution: {integrity: sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA==}
+ json5@0.5.1:
+ resolution: {integrity: sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==}
+ hasBin: true
+
json5@1.0.2:
resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
hasBin: true
@@ -9264,6 +9341,10 @@ packages:
resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
engines: {node: '>=8.6'}
+ micromatch@4.0.7:
+ resolution: {integrity: sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==}
+ engines: {node: '>=8.6'}
+
mime-db@1.33.0:
resolution: {integrity: sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==}
engines: {node: '>= 0.6'}
@@ -9810,6 +9891,10 @@ packages:
resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
engines: {node: '>=10'}
+ os-homedir@1.0.2:
+ resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==}
+ engines: {node: '>=0.10.0'}
+
os-tmpdir@1.0.2:
resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
engines: {node: '>=0.10.0'}
@@ -10317,6 +10402,10 @@ packages:
resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
engines: {node: '>=6'}
+ private@0.1.8:
+ resolution: {integrity: sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==}
+ engines: {node: '>= 0.6'}
+
proc-log@3.0.0:
resolution: {integrity: sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -10816,6 +10905,9 @@ packages:
regenerate@1.4.2:
resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+ regenerator-runtime@0.11.1:
+ resolution: {integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==}
+
regenerator-runtime@0.13.11:
resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
@@ -10871,6 +10963,10 @@ packages:
resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
engines: {node: '>=0.10'}
+ repeating@2.0.1:
+ resolution: {integrity: sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==}
+ engines: {node: '>=0.10.0'}
+
require-directory@2.1.1:
resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
engines: {node: '>=0.10.0'}
@@ -11184,6 +11280,10 @@ packages:
sisteransi@1.0.5:
resolution: {integrity: sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==}
+ slash@1.0.0:
+ resolution: {integrity: sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==}
+ engines: {node: '>=0.10.0'}
+
slash@2.0.0:
resolution: {integrity: sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==}
engines: {node: '>=6'}
@@ -11243,6 +11343,9 @@ packages:
resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
engines: {node: '>=0.10.0'}
+ source-map-support@0.4.18:
+ resolution: {integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==}
+
source-map-support@0.5.21:
resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
@@ -11369,6 +11472,10 @@ packages:
string_decoder@1.3.0:
resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+ strip-ansi@3.0.1:
+ resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
+ engines: {node: '>=0.10.0'}
+
strip-ansi@5.2.0:
resolution: {integrity: sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==}
engines: {node: '>=6'}
@@ -11491,6 +11598,10 @@ packages:
sudo-prompt@9.2.1:
resolution: {integrity: sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==}
+ supports-color@2.0.0:
+ resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
+ engines: {node: '>=0.8.0'}
+
supports-color@5.5.0:
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
engines: {node: '>=4'}
@@ -11579,6 +11690,10 @@ packages:
resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
engines: {node: '>=6.0.0'}
+ temp@0.9.4:
+ resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+ engines: {node: '>=6.0.0'}
+
terser-webpack-plugin@5.3.10:
resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
engines: {node: '>= 10.13.0'}
@@ -11665,6 +11780,10 @@ packages:
tmpl@1.0.5:
resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
+ to-fast-properties@1.0.3:
+ resolution: {integrity: sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og==}
+ engines: {node: '>=0.10.0'}
+
to-fast-properties@2.0.0:
resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
engines: {node: '>=4'}
@@ -11707,6 +11826,10 @@ packages:
resolution: {integrity: sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==}
engines: {node: '>=12'}
+ trim-right@1.0.1:
+ resolution: {integrity: sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw==}
+ engines: {node: '>=0.10.0'}
+
trough@1.0.5:
resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==}
@@ -12922,7 +13045,7 @@ snapshots:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
- '@babel/plugin-syntax-flow@7.24.1(@babel/core@7.24.7)':
+ '@babel/plugin-syntax-flow@7.24.7(@babel/core@7.24.7)':
dependencies:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
@@ -13110,11 +13233,11 @@ snapshots:
'@babel/helper-plugin-utils': 7.24.7
'@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.7)
- '@babel/plugin-transform-flow-strip-types@7.24.1(@babel/core@7.24.7)':
+ '@babel/plugin-transform-flow-strip-types@7.24.7(@babel/core@7.24.7)':
dependencies:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
- '@babel/plugin-syntax-flow': 7.24.1(@babel/core@7.24.7)
+ '@babel/plugin-syntax-flow': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-for-of@7.24.7(@babel/core@7.24.7)':
dependencies:
@@ -13485,12 +13608,12 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@babel/preset-flow@7.24.1(@babel/core@7.24.7)':
+ '@babel/preset-flow@7.24.7(@babel/core@7.24.7)':
dependencies:
'@babel/core': 7.24.7
'@babel/helper-plugin-utils': 7.24.7
'@babel/helper-validator-option': 7.24.7
- '@babel/plugin-transform-flow-strip-types': 7.24.1(@babel/core@7.24.7)
+ '@babel/plugin-transform-flow-strip-types': 7.24.7(@babel/core@7.24.7)
'@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.7)':
dependencies:
@@ -15321,7 +15444,7 @@ snapshots:
'@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.24.7)
'@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.7)
'@babel/plugin-syntax-export-default-from': 7.24.1(@babel/core@7.24.7)
- '@babel/plugin-syntax-flow': 7.24.1(@babel/core@7.24.7)
+ '@babel/plugin-syntax-flow': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.7)
'@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.7)
'@babel/plugin-transform-arrow-functions': 7.24.7(@babel/core@7.24.7)
@@ -15330,7 +15453,7 @@ snapshots:
'@babel/plugin-transform-classes': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-computed-properties': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-destructuring': 7.24.7(@babel/core@7.24.7)
- '@babel/plugin-transform-flow-strip-types': 7.24.1(@babel/core@7.24.7)
+ '@babel/plugin-transform-flow-strip-types': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-function-name': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-literals': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7)
@@ -16531,12 +16654,16 @@ snapshots:
slice-ansi: 2.1.0
strip-ansi: 5.2.0
+ ansi-regex@2.1.1: {}
+
ansi-regex@4.1.1: {}
ansi-regex@5.0.1: {}
ansi-regex@6.0.1: {}
+ ansi-styles@2.2.1: {}
+
ansi-styles@3.2.1:
dependencies:
color-convert: 1.9.3
@@ -16819,10 +16946,58 @@ snapshots:
dependencies:
dequal: 2.0.3
+ babel-code-frame@6.26.0:
+ dependencies:
+ chalk: 1.1.3
+ esutils: 2.0.3
+ js-tokens: 3.0.2
+
+ babel-core@6.26.3:
+ dependencies:
+ babel-code-frame: 6.26.0
+ babel-generator: 6.26.1
+ babel-helpers: 6.24.1
+ babel-messages: 6.23.0
+ babel-register: 6.26.0
+ babel-runtime: 6.26.0
+ babel-template: 6.26.0
+ babel-traverse: 6.26.0
+ babel-types: 6.26.0
+ babylon: 6.18.0
+ convert-source-map: 1.8.0
+ debug: 2.6.9
+ json5: 0.5.1
+ lodash: 4.17.21
+ minimatch: 3.1.2
+ path-is-absolute: 1.0.1
+ private: 0.1.8
+ slash: 1.0.0
+ source-map: 0.5.7
+ transitivePeerDependencies:
+ - supports-color
+
babel-core@7.0.0-bridge.0(@babel/core@7.24.7):
dependencies:
'@babel/core': 7.24.7
+ babel-generator@6.26.1:
+ dependencies:
+ babel-messages: 6.23.0
+ babel-runtime: 6.26.0
+ babel-types: 6.26.0
+ detect-indent: 4.0.0
+ jsesc: 1.3.0
+ lodash: 4.17.21
+ source-map: 0.5.7
+ trim-right: 1.0.1
+
+ babel-helpers@6.24.1:
+ dependencies:
+ babel-runtime: 6.26.0
+ babel-template: 6.26.0
+ transitivePeerDependencies:
+ - supports-color
+
babel-loader@9.1.3(@babel/core@7.24.7)(webpack@5.92.1(webpack-cli@5.1.4)):
dependencies:
'@babel/core': 7.24.7
@@ -16836,6 +17011,10 @@ snapshots:
deepmerge: 2.2.1
object.omit: 3.0.0
+ babel-messages@6.23.0:
+ dependencies:
+ babel-runtime: 6.26.0
+
babel-plugin-define-var@0.1.0: {}
babel-plugin-istanbul@6.1.1:
@@ -16910,12 +17089,62 @@ snapshots:
babel-plugin-transform-flow-enums@0.0.2(@babel/core@7.24.7):
dependencies:
- '@babel/plugin-syntax-flow': 7.24.1(@babel/core@7.24.7)
+ '@babel/plugin-syntax-flow': 7.24.7(@babel/core@7.24.7)
transitivePeerDependencies:
- '@babel/core'
babel-plugin-transform-react-remove-prop-types@0.4.24: {}
+ babel-register@6.26.0:
+ dependencies:
+ babel-core: 6.26.3
+ babel-runtime: 6.26.0
+ core-js: 2.6.12
+ home-or-tmp: 2.0.0
+ lodash: 4.17.21
+ mkdirp: 0.5.6
+ source-map-support: 0.4.18
+ transitivePeerDependencies:
+ - supports-color
+
+ babel-runtime@6.26.0:
+ dependencies:
+ core-js: 2.6.12
+ regenerator-runtime: 0.11.1
+
+ babel-template@6.26.0:
+ dependencies:
+ babel-runtime: 6.26.0
+ babel-traverse: 6.26.0
+ babel-types: 6.26.0
+ babylon: 6.18.0
+ lodash: 4.17.21
+ transitivePeerDependencies:
+ - supports-color
+
+ babel-traverse@6.26.0:
+ dependencies:
+ babel-code-frame: 6.26.0
+ babel-messages: 6.23.0
+ babel-runtime: 6.26.0
+ babel-types: 6.26.0
+ babylon: 6.18.0
+ debug: 2.6.9
+ globals: 9.18.0
+ invariant: 2.2.4
+ lodash: 4.17.21
+ transitivePeerDependencies:
+ - supports-color
+
+ babel-types@6.26.0:
+ dependencies:
+ babel-runtime: 6.26.0
+ esutils: 2.0.3
+ lodash: 4.17.21
+ to-fast-properties: 1.0.3
+
+ babylon@6.18.0: {}
+
bail@1.0.5: {}
balanced-match@1.0.2: {}
@@ -16991,9 +17220,9 @@ snapshots:
dependencies:
balanced-match: 1.0.2
- braces@3.0.2:
+ braces@3.0.3:
dependencies:
- fill-range: 7.0.1
+ fill-range: 7.1.1
browser-stdout@1.3.1: {}
@@ -17196,6 +17425,14 @@ snapshots:
dependencies:
chalk: 4.1.2
+ chalk@1.1.3:
+ dependencies:
+ ansi-styles: 2.2.1
+ escape-string-regexp: 1.0.5
+ has-ansi: 2.0.0
+ strip-ansi: 3.0.1
+ supports-color: 2.0.0
+
chalk@2.4.2:
dependencies:
ansi-styles: 3.2.1
@@ -17252,7 +17489,7 @@ snapshots:
chokidar@3.5.3:
dependencies:
anymatch: 3.1.3
- braces: 3.0.2
+ braces: 3.0.3
glob-parent: 5.1.2
is-binary-path: 2.1.0
is-glob: 4.0.3
@@ -17264,7 +17501,7 @@ snapshots:
chokidar@3.6.0:
dependencies:
anymatch: 3.1.3
- braces: 3.0.2
+ braces: 3.0.3
glob-parent: 5.1.2
is-binary-path: 2.1.0
is-glob: 4.0.3
@@ -17660,7 +17897,7 @@ snapshots:
cp-file: 10.0.0
globby: 13.2.2
junk: 4.0.1
- micromatch: 4.0.5
+ micromatch: 4.0.7
nested-error-stacks: 2.1.1
p-filter: 3.0.0
p-map: 6.0.0
@@ -17849,7 +18086,7 @@ snapshots:
lodash.mapvalues: 4.6.0
lodash.memoize: 4.1.2
memfs-or-file-map-to-github-branch: 1.2.1(encoding@0.1.13)
- micromatch: 4.0.5
+ micromatch: 4.0.7
node-cleanup: 2.1.2
node-fetch: 2.7.0(encoding@0.1.13)
override-require: 1.1.1
@@ -18019,6 +18256,10 @@ snapshots:
destroy@1.2.0: {}
+ detect-indent@4.0.0:
+ dependencies:
+ repeating: 2.0.1
+
detect-indent@5.0.0: {}
detect-libc@2.0.3: {}
@@ -18834,7 +19075,7 @@ snapshots:
'@nodelib/fs.walk': 1.2.8
glob-parent: 5.1.2
merge2: 1.4.1
- micromatch: 4.0.5
+ micromatch: 4.0.7
fast-json-patch@3.1.1: {}
@@ -18886,7 +19127,7 @@ snapshots:
dependencies:
minimatch: 5.1.0
- fill-range@7.0.1:
+ fill-range@7.1.1:
dependencies:
to-regex-range: 5.0.1
@@ -19270,6 +19511,8 @@ snapshots:
dependencies:
type-fest: 0.20.2
+ globals@9.18.0: {}
+
globalthis@1.0.3:
dependencies:
define-properties: 1.2.1
@@ -19388,6 +19631,10 @@ snapshots:
hard-rejection@2.1.0: {}
+ has-ansi@2.0.0:
+ dependencies:
+ ansi-regex: 2.1.1
+
has-bigints@1.0.2: {}
has-flag@2.0.0: {}
@@ -19445,6 +19692,11 @@ snapshots:
dependencies:
react-is: 16.13.1
+ home-or-tmp@2.0.0:
+ dependencies:
+ os-homedir: 1.0.2
+ os-tmpdir: 1.0.2
+
homedir-polyfill@1.0.3:
dependencies:
parse-passwd: 1.0.0
@@ -19780,6 +20032,8 @@ snapshots:
dependencies:
call-bind: 1.0.7
+ is-finite@1.1.0: {}
+
is-fullwidth-code-point@2.0.0: {}
is-fullwidth-code-point@3.0.0: {}
@@ -20038,7 +20292,7 @@ snapshots:
'@types/stack-utils': 2.0.3
chalk: 4.1.2
graceful-fs: 4.2.11
- micromatch: 4.0.5
+ micromatch: 4.0.7
pretty-format: 29.7.0
slash: 3.0.0
stack-utils: 2.0.6
@@ -20092,6 +20346,8 @@ snapshots:
'@sideway/formula': 3.0.1
'@sideway/pinpoint': 2.0.0
+ js-tokens@3.0.2: {}
+
js-tokens@4.0.0: {}
js-yaml@3.14.1:
@@ -20107,17 +20363,17 @@ snapshots:
jsc-safe-url@0.2.4: {}
- jscodeshift-add-imports@1.0.10(jscodeshift@0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7))):
+ jscodeshift-add-imports@1.0.10(jscodeshift@0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7))):
dependencies:
'@babel/traverse': 7.24.7
- jscodeshift: 0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7))
- jscodeshift-find-imports: 2.0.4(jscodeshift@0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7)))
+ jscodeshift: 0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7))
+ jscodeshift-find-imports: 2.0.4(jscodeshift@0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7)))
transitivePeerDependencies:
- supports-color
- jscodeshift-find-imports@2.0.4(jscodeshift@0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7))):
+ jscodeshift-find-imports@2.0.4(jscodeshift@0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7))):
dependencies:
- jscodeshift: 0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7))
+ jscodeshift: 0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7))
jscodeshift@0.14.0(@babel/preset-env@7.24.7(@babel/core@7.24.7)):
dependencies:
@@ -20128,14 +20384,14 @@ snapshots:
'@babel/plugin-proposal-optional-chaining': 7.21.0(@babel/core@7.24.7)
'@babel/plugin-transform-modules-commonjs': 7.24.7(@babel/core@7.24.7)
'@babel/preset-env': 7.24.7(@babel/core@7.24.7)
- '@babel/preset-flow': 7.24.1(@babel/core@7.24.7)
+ '@babel/preset-flow': 7.24.7(@babel/core@7.24.7)
'@babel/preset-typescript': 7.24.7(@babel/core@7.24.7)
'@babel/register': 7.24.6(@babel/core@7.24.7)
babel-core: 7.0.0-bridge.0(@babel/core@7.24.7)
chalk: 4.1.2
flow-parser: 0.206.0
graceful-fs: 4.2.11
- micromatch: 4.0.5
+ micromatch: 4.0.7
neo-async: 2.6.2
node-dir: 0.1.17
recast: 0.21.5
@@ -20144,7 +20400,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
- jscodeshift@0.15.2(@babel/preset-env@7.24.7(@babel/core@7.24.7)):
+ jscodeshift@0.16.0(@babel/preset-env@7.24.7(@babel/core@7.24.7)):
dependencies:
'@babel/core': 7.24.7
'@babel/parser': 7.24.7
@@ -20153,19 +20409,19 @@ snapshots:
'@babel/plugin-transform-nullish-coalescing-operator': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-optional-chaining': 7.24.7(@babel/core@7.24.7)
'@babel/plugin-transform-private-methods': 7.24.7(@babel/core@7.24.7)
- '@babel/preset-flow': 7.24.1(@babel/core@7.24.7)
+ '@babel/preset-flow': 7.24.7(@babel/core@7.24.7)
'@babel/preset-typescript': 7.24.7(@babel/core@7.24.7)
'@babel/register': 7.24.6(@babel/core@7.24.7)
- babel-core: 7.0.0-bridge.0(@babel/core@7.24.7)
+ babel-core: 6.26.3
chalk: 4.1.2
flow-parser: 0.206.0
graceful-fs: 4.2.11
- micromatch: 4.0.5
+ micromatch: 4.0.7
neo-async: 2.6.2
node-dir: 0.1.17
recast: 0.23.9
- temp: 0.8.4
- write-file-atomic: 2.4.3
+ temp: 0.9.4
+ write-file-atomic: 5.0.1
optionalDependencies:
'@babel/preset-env': 7.24.7(@babel/core@7.24.7)
transitivePeerDependencies:
@@ -20201,6 +20457,8 @@ snapshots:
jsesc@0.5.0: {}
+ jsesc@1.3.0: {}
+
jsesc@2.5.2: {}
json-bigint@1.0.0:
@@ -20227,6 +20485,8 @@ snapshots:
dependencies:
string-convert: 0.2.1
+ json5@0.5.1: {}
+
json5@1.0.2:
dependencies:
minimist: 1.2.6
@@ -20440,7 +20700,7 @@ snapshots:
dependencies:
'@colors/colors': 1.5.0
body-parser: 1.20.2
- braces: 3.0.2
+ braces: 3.0.3
chokidar: 3.6.0
connect: 3.7.0
di: 0.0.1
@@ -21024,7 +21284,7 @@ snapshots:
graceful-fs: 4.2.11
invariant: 2.2.4
jest-worker: 29.7.0
- micromatch: 4.0.5
+ micromatch: 4.0.7
node-abort-controller: 3.1.1
nullthrows: 1.1.1
walker: 1.0.8
@@ -21157,7 +21417,12 @@ snapshots:
micromatch@4.0.5:
dependencies:
- braces: 3.0.2
+ braces: 3.0.3
+ picomatch: 2.3.1
+
+ micromatch@4.0.7:
+ dependencies:
+ braces: 3.0.3
picomatch: 2.3.1
mime-db@1.33.0: {}
@@ -21857,6 +22122,8 @@ snapshots:
strip-ansi: 6.0.1
wcwidth: 1.0.1
+ os-homedir@1.0.2: {}
+
os-tmpdir@1.0.2: {}
override-require@1.1.1: {}
@@ -22345,6 +22612,8 @@ snapshots:
prismjs@1.29.0: {}
+ private@0.1.8: {}
+
proc-log@3.0.0: {}
process-nextick-args@2.0.1: {}
@@ -22963,6 +23232,8 @@ snapshots:
regenerate@1.4.2: {}
+ regenerator-runtime@0.11.1: {}
+
regenerator-runtime@0.13.11: {}
regenerator-runtime@0.14.0: {}
@@ -23036,6 +23307,10 @@ snapshots:
repeat-string@1.6.1: {}
+ repeating@2.0.1:
+ dependencies:
+ is-finite: 1.1.0
+
require-directory@2.1.1: {}
require-from-string@2.0.2: {}
@@ -23416,6 +23691,8 @@ snapshots:
sisteransi@1.0.5: {}
+ slash@1.0.0: {}
+
slash@2.0.0: {}
slash@3.0.0: {}
@@ -23495,6 +23772,10 @@ snapshots:
source-map-js@1.2.0: {}
+ source-map-support@0.4.18:
+ dependencies:
+ source-map: 0.5.7
+
source-map-support@0.5.21:
dependencies:
buffer-from: 1.1.2
@@ -23645,6 +23926,10 @@ snapshots:
dependencies:
safe-buffer: 5.2.1
+ strip-ansi@3.0.1:
+ dependencies:
+ ansi-regex: 2.1.1
+
strip-ansi@5.2.0:
dependencies:
ansi-regex: 4.1.1
@@ -23738,7 +24023,7 @@ snapshots:
dependencies:
'@babel/parser': 7.24.7
'@babel/traverse': 7.24.7
- micromatch: 4.0.5
+ micromatch: 4.0.7
postcss: 7.0.39
transitivePeerDependencies:
- supports-color
@@ -23769,7 +24054,7 @@ snapshots:
known-css-properties: 0.29.0
mathml-tag-names: 2.1.3
meow: 10.1.5
- micromatch: 4.0.5
+ micromatch: 4.0.7
normalize-path: 3.0.0
picocolors: 1.0.1
postcss: 8.4.38
@@ -23819,6 +24104,8 @@ snapshots:
sudo-prompt@9.2.1: {}
+ supports-color@2.0.0: {}
+
supports-color@5.5.0:
dependencies:
has-flag: 3.0.0
@@ -23883,7 +24170,7 @@ snapshots:
is-glob: 4.0.3
jiti: 1.21.0
lilconfig: 2.1.0
- micromatch: 4.0.5
+ micromatch: 4.0.7
normalize-path: 3.0.0
object-hash: 3.0.0
picocolors: 1.0.1
@@ -23938,6 +24225,11 @@ snapshots:
dependencies:
rimraf: 2.6.3
+ temp@0.9.4:
+ dependencies:
+ mkdirp: 0.5.6
+ rimraf: 2.6.3
+
terser-webpack-plugin@5.3.10(webpack@5.92.1(webpack-cli@5.1.4(webpack-bundle-analyzer@4.10.2)(webpack@5.92.1))):
dependencies:
'@jridgewell/trace-mapping': 0.3.25
@@ -24030,6 +24322,8 @@ snapshots:
tmpl@1.0.5: {}
+ to-fast-properties@1.0.3: {}
+
to-fast-properties@2.0.0: {}
to-regex-range@5.0.1:
@@ -24061,6 +24355,8 @@ snapshots:
trim-newlines@4.0.2: {}
+ trim-right@1.0.1: {}
+
trough@1.0.5: {}
ts-api-utils@1.0.1(typescript@5.4.5):
From 24e8c39d6bcf06b9b677d12b02e1a7db65ef71b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:33:51 +0530
Subject: [PATCH 37/65] Bump @netlify/functions to ^2.8.0 (#42726)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 448 ++++++++++++++++++++++++++++++++++++++++---------
2 files changed, 366 insertions(+), 84 deletions(-)
diff --git a/package.json b/package.json
index c041616f018f75..41b866d566993c 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
},
"dependencies": {
"@googleapis/sheets": "^8.0.0",
- "@netlify/functions": "^2.7.0",
+ "@netlify/functions": "^2.8.0",
"@slack/bolt": "^3.19.0",
"execa": "^9.2.0",
"google-auth-library": "^9.11.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 14a5777aa3eb0c..6b07296bda41eb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -29,8 +29,8 @@ importers:
specifier: ^8.0.0
version: 8.0.0(encoding@0.1.13)
'@netlify/functions':
- specifier: ^2.7.0
- version: 2.7.0(@opentelemetry/api@1.8.0)
+ specifier: ^2.8.0
+ version: 2.8.0(@opentelemetry/api@1.8.0)
'@slack/bolt':
specifier: ^3.19.0
version: 3.19.0
@@ -3604,6 +3604,15 @@ packages:
resolution: {integrity: sha512-EwLC+bMLTz3n2EDJMhMdrNR+aTxDBPpcq3k6Ibc4eKrp8UbytNAEB0VgfQFOGJN7+BTCcjiojt08O/cwn+YnHg==}
engines: {node: '>=12.0.0'}
+ '@grpc/grpc-js@1.10.9':
+ resolution: {integrity: sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==}
+ engines: {node: '>=12.10.0'}
+
+ '@grpc/proto-loader@0.7.13':
+ resolution: {integrity: sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==}
+ engines: {node: '>=6'}
+ hasBin: true
+
'@hapi/hoek@9.3.0':
resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
@@ -3801,6 +3810,9 @@ packages:
'@jridgewell/trace-mapping@0.3.25':
resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+ '@js-sdsl/ordered-map@4.4.2':
+ resolution: {integrity: sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==}
+
'@lerna/create@8.1.3':
resolution: {integrity: sha512-JFvIYrlvR8Txa8h7VZx8VIQDltukEKOKaZL/muGO7Q/5aE2vjOKHsD/jkWYe/2uFy1xv37ubdx17O1UXQNadPg==}
engines: {node: '>=18.0.0'}
@@ -4123,16 +4135,16 @@ packages:
react: ^17.0.0 || ^18.0.0
react-dom: ^17.0.0 || ^18.0.0
- '@netlify/functions@2.7.0':
- resolution: {integrity: sha512-4pXC/fuj3eGQ86wbgPiM4zY8+AsNrdz6vcv6FEdUJnZW+LqF8IWjQcY3S0d1hLeLKODYOqq4CkrzGyCpce63Nw==}
+ '@netlify/functions@2.8.0':
+ resolution: {integrity: sha512-kHInQKtMuFlqD7vxaJ8tjd7spv6DTrRuTovvWNDmvwTfkubVfF7KYiypsPR5wkKvSz76GHv86RBCLkjIxvwgDg==}
engines: {node: '>=14.0.0'}
'@netlify/node-cookies@0.1.0':
resolution: {integrity: sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==}
engines: {node: ^14.16.0 || >=16.0.0}
- '@netlify/serverless-functions-api@1.18.1':
- resolution: {integrity: sha512-DrSvivchuwsuQW03zbVPT3nxCQa5tn7m4aoPOsQKibuJXIuSbfxzCBxPLz0+LchU5ds7YyOaCc9872Y32ngYzg==}
+ '@netlify/serverless-functions-api@1.18.4':
+ resolution: {integrity: sha512-5R0kOKrOqhlFFrA7oduzJS+LQRjnX2CX8kJaYI9PQKIpNvzF18n+LNGWTS42YxPfIpAE64yaHbppeAigms2QTw==}
engines: {node: '>=18.0.0'}
'@next/env@13.5.1':
@@ -4523,75 +4535,124 @@ packages:
'@octokit/types@9.3.2':
resolution: {integrity: sha512-D4iHGTdAnEEVsB8fl95m1hiz7D5YiRdQ9b/OEb3BYRVwbLsGHcRVPz+u+BgRLNk0Q0/4iZCBqDN96j2XNxfXrA==}
- '@opentelemetry/api-logs@0.50.0':
- resolution: {integrity: sha512-JdZuKrhOYggqOpUljAq4WWNi5nB10PmgoF0y2CvedLGXd0kSawb/UBnWT8gg1ND3bHCNHStAIVT0ELlxJJRqrA==}
+ '@opentelemetry/api-logs@0.52.1':
+ resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
engines: {node: '>=14'}
'@opentelemetry/api@1.8.0':
resolution: {integrity: sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==}
engines: {node: '>=8.0.0'}
- '@opentelemetry/core@1.23.0':
- resolution: {integrity: sha512-hdQ/a9TMzMQF/BO8Cz1juA43/L5YGtCSiKoOHmrTEf7VMDAZgy8ucpWx3eQTnQ3gBloRcWtzvcrMZABC3PTSKQ==}
+ '@opentelemetry/context-async-hooks@1.25.1':
+ resolution: {integrity: sha512-UW/ge9zjvAEmRWVapOP0qyCvPulWU6cQxGxDbWEFfGOj1VBBZAuOqTo3X6yWmDTD3Xe15ysCZChHncr2xFMIfQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+ '@opentelemetry/core@1.25.1':
+ resolution: {integrity: sha512-GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+ '@opentelemetry/exporter-trace-otlp-grpc@0.52.1':
+ resolution: {integrity: sha512-pVkSH20crBwMTqB3nIN4jpQKUEoB0Z94drIHpYyEqs7UBr+I0cpYyOR3bqjA/UasQUMROb3GX8ZX4/9cVRqGBQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.0.0
+
+ '@opentelemetry/exporter-trace-otlp-http@0.52.1':
+ resolution: {integrity: sha512-05HcNizx0BxcFKKnS5rwOV+2GevLTVIRA0tRgWYyw4yCgR53Ic/xk83toYKts7kbzcI+dswInUg/4s8oyA+tqg==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.0.0
+
+ '@opentelemetry/exporter-trace-otlp-proto@0.52.1':
+ resolution: {integrity: sha512-pt6uX0noTQReHXNeEslQv7x311/F1gJzMnp1HD2qgypLRPbXDeMzzeTngRTUaUbP6hqWNtPxuLr4DEoZG+TcEQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.0.0
+
+ '@opentelemetry/exporter-zipkin@1.25.1':
+ resolution: {integrity: sha512-RmOwSvkimg7ETwJbUOPTMhJm9A9bG1U8s7Zo3ajDh4zM7eYcycQ0dM7FbLD6NXWbI2yj7UY4q8BKinKYBQksyw==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': ^1.0.0
+
+ '@opentelemetry/instrumentation@0.52.1':
+ resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': ^1.3.0
- '@opentelemetry/core@1.24.1':
- resolution: {integrity: sha512-wMSGfsdmibI88K9wB498zXY04yThPexo8jvwNNlm542HZB7XrrMRBbAyKJqG8qDRJwIBdBrPMi4V9ZPW/sqrcg==}
+ '@opentelemetry/otlp-exporter-base@0.52.1':
+ resolution: {integrity: sha512-z175NXOtX5ihdlshtYBe5RpGeBoTXVCKPPLiQlD6FHvpM4Ch+p2B0yWKYSrBfLH24H9zjJiBdTrtD+hLlfnXEQ==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': ^1.0.0
- '@opentelemetry/otlp-transformer@0.50.0':
- resolution: {integrity: sha512-s0sl1Yfqd5q1Kjrf6DqXPWzErL+XHhrXOfejh4Vc/SMTNqC902xDsC8JQxbjuramWt/+hibfguIvi7Ns8VLolA==}
+ '@opentelemetry/otlp-grpc-exporter-base@0.52.1':
+ resolution: {integrity: sha512-zo/YrSDmKMjG+vPeA9aBBrsQM9Q/f2zo6N04WMB3yNldJRsgpRBeLLwvAt/Ba7dpehDLOEFBd1i2JCoaFtpCoQ==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.3.0 <1.9.0'
+ '@opentelemetry/api': ^1.0.0
- '@opentelemetry/resources@1.23.0':
- resolution: {integrity: sha512-iPRLfVfcEQynYGo7e4Di+ti+YQTAY0h5mQEUJcHlU9JOqpb4x965O6PZ+wMcwYVY63G96KtdS86YCM1BF1vQZg==}
+ '@opentelemetry/otlp-transformer@0.52.1':
+ resolution: {integrity: sha512-I88uCZSZZtVa0XniRqQWKbjAUm73I8tpEy/uJYPPYw5d7BRdVk0RfTBQw8kSUl01oVWEuqxLDa802222MYyWHg==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': '>=1.3.0 <1.10.0'
- '@opentelemetry/resources@1.24.1':
- resolution: {integrity: sha512-cyv0MwAaPF7O86x5hk3NNgenMObeejZFLJJDVuSeSMIsknlsj3oOZzRv3qSzlwYomXsICfBeFFlxwHQte5mGXQ==}
+ '@opentelemetry/propagator-b3@1.25.1':
+ resolution: {integrity: sha512-p6HFscpjrv7//kE+7L+3Vn00VEDUJB0n6ZrjkTYHrJ58QZ8B3ajSJhRbCcY6guQ3PDjTbxWklyvIN2ojVbIb1A==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
- '@opentelemetry/sdk-logs@0.50.0':
- resolution: {integrity: sha512-PeUEupBB29p9nlPNqXoa1PUWNLsZnxG0DCDj3sHqzae+8y76B/A5hvZjg03ulWdnvBLYpnJslqzylG9E0IL87g==}
+ '@opentelemetry/propagator-jaeger@1.25.1':
+ resolution: {integrity: sha512-nBprRf0+jlgxks78G/xq72PipVK+4or9Ypntw0gVZYNTCSK8rg5SeaGV19tV920CMqBD/9UIOiFr23Li/Q8tiA==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.4.0 <1.9.0'
- '@opentelemetry/api-logs': '>=0.39.1'
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
- '@opentelemetry/sdk-metrics@1.23.0':
- resolution: {integrity: sha512-4OkvW6+wST4h6LFG23rXSTf6nmTf201h9dzq7bE0z5R9ESEVLERZz6WXwE7PSgg1gdjlaznm1jLJf8GttypFDg==}
+ '@opentelemetry/resources@1.25.1':
+ resolution: {integrity: sha512-pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.3.0 <1.9.0'
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
- '@opentelemetry/sdk-trace-base@1.23.0':
- resolution: {integrity: sha512-PzBmZM8hBomUqvCddF/5Olyyviayka44O5nDWq673np3ctnvwMOvNrsUORZjKja1zJbwEuD9niAGbnVrz3jwRQ==}
+ '@opentelemetry/sdk-logs@0.52.1':
+ resolution: {integrity: sha512-MBYh+WcPPsN8YpRHRmK1Hsca9pVlyyKd4BxOC4SsgHACnl/bPp4Cri9hWhVm5+2tiQ9Zf4qSc1Jshw9tOLGWQA==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': '>=1.4.0 <1.10.0'
- '@opentelemetry/sdk-trace-base@1.24.1':
- resolution: {integrity: sha512-zz+N423IcySgjihl2NfjBf0qw1RWe11XIAWVrTNOSSI6dtSPJiVom2zipFB2AEEtJWpv0Iz6DY6+TjnyTV5pWg==}
+ '@opentelemetry/sdk-metrics@1.25.1':
+ resolution: {integrity: sha512-9Mb7q5ioFL4E4dDrc4wC/A3NTHDat44v4I3p2pLPSxRvqUbDIQyMVr9uK+EU69+HWhlET1VaSrRzwdckWqY15Q==}
engines: {node: '>=14'}
peerDependencies:
- '@opentelemetry/api': '>=1.0.0 <1.9.0'
+ '@opentelemetry/api': '>=1.3.0 <1.10.0'
- '@opentelemetry/semantic-conventions@1.23.0':
- resolution: {integrity: sha512-MiqFvfOzfR31t8cc74CTP1OZfz7MbqpAnLCra8NqQoaHJX6ncIRTdYOQYBDQ2uFISDq0WY8Y9dDTWvsgzzBYRg==}
+ '@opentelemetry/sdk-node@0.52.1':
+ resolution: {integrity: sha512-uEG+gtEr6eKd8CVWeKMhH2olcCHM9dEK68pe0qE0be32BcCRsvYURhHaD1Srngh1SQcnQzZ4TP324euxqtBOJA==}
engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.3.0 <1.10.0'
+
+ '@opentelemetry/sdk-trace-base@1.25.1':
+ resolution: {integrity: sha512-C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+ '@opentelemetry/sdk-trace-node@1.25.1':
+ resolution: {integrity: sha512-nMcjFIKxnFqoez4gUmihdBrbpsEnAX/Xj16sGvZm+guceYE0NE00vLhpDVK6f3q8Q4VFI5xG8JjlXKMB/SkTTQ==}
+ engines: {node: '>=14'}
+ peerDependencies:
+ '@opentelemetry/api': '>=1.0.0 <1.10.0'
- '@opentelemetry/semantic-conventions@1.24.1':
- resolution: {integrity: sha512-VkliWlS4/+GHLLW7J/rVBA00uXus1SWvwFvcUDxDwmFxYfg/2VI6ekwdXS28cjI8Qz2ky2BzG8OUHo+WeYIWqw==}
+ '@opentelemetry/semantic-conventions@1.25.1':
+ resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==}
engines: {node: '>=14'}
'@pigment-css/nextjs-plugin@0.0.14':
@@ -4627,6 +4688,36 @@ packages:
'@popperjs/core@2.11.8':
resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
+ '@protobufjs/aspromise@1.1.2':
+ resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+
+ '@protobufjs/base64@1.1.2':
+ resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+
+ '@protobufjs/codegen@2.0.4':
+ resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+
+ '@protobufjs/eventemitter@1.1.0':
+ resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+
+ '@protobufjs/fetch@1.1.0':
+ resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+
+ '@protobufjs/float@1.0.2':
+ resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+
+ '@protobufjs/inquire@1.1.0':
+ resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+
+ '@protobufjs/path@1.1.2':
+ resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+
+ '@protobufjs/pool@1.1.0':
+ resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+
+ '@protobufjs/utf8@1.1.0':
+ resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+
'@react-native-community/cli-clean@12.3.6':
resolution: {integrity: sha512-gUU29ep8xM0BbnZjwz9MyID74KKwutq9x5iv4BCr2im6nly4UMf1B1D+V225wR7VcDGzbgWjaezsJShLLhC5ig==}
@@ -5308,6 +5399,9 @@ packages:
'@types/serve-static@1.15.2':
resolution: {integrity: sha512-J2LqtvFYCzaj8pVYKw8klQXrLLk7TBZmQ4ShlcdkELFKGwGMfevMLneMMRkMgZxotOD9wg497LpC7O8PcvAmfw==}
+ '@types/shimmer@1.0.5':
+ resolution: {integrity: sha512-9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==}
+
'@types/sinon@17.0.3':
resolution: {integrity: sha512-j3uovdn8ewky9kRBG19bOwaZbexJu/XjtkHyjvUgt4xfPFz18dcORIMqnYh66Fx3Powhcr85NT5+er3+oViapw==}
@@ -6284,6 +6378,9 @@ packages:
resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
engines: {node: '>=8'}
+ cjs-module-lexer@1.3.1:
+ resolution: {integrity: sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==}
+
classnames@2.3.2:
resolution: {integrity: sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==}
@@ -8174,6 +8271,9 @@ packages:
resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
engines: {node: '>=6'}
+ import-in-the-middle@1.8.1:
+ resolution: {integrity: sha512-yhRwoHtiLGvmSozNOALgjRPFI6uYsds60EoMqqnXyyv+JOIW/BrrLejuTGBt+bq0T5tLzOHrN0T7xYTm4Qt/ng==}
+
import-lazy@4.0.0:
resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
engines: {node: '>=8'}
@@ -9104,6 +9204,9 @@ packages:
resolution: {integrity: sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==}
hasBin: true
+ long@5.2.3:
+ resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+
longest-streak@2.0.4:
resolution: {integrity: sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==}
@@ -9482,6 +9585,9 @@ packages:
resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==}
engines: {node: '>=0.10.0'}
+ module-details-from-path@1.0.3:
+ resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+
moo@0.5.1:
resolution: {integrity: sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==}
@@ -10454,6 +10560,10 @@ packages:
prop-types@15.8.1:
resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
+ protobufjs@7.3.2:
+ resolution: {integrity: sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==}
+ engines: {node: '>=12.0.0'}
+
protocols@2.0.1:
resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}
@@ -10975,6 +11085,10 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
+ require-in-the-middle@7.3.0:
+ resolution: {integrity: sha512-nQFEv9gRw6SJAwWD2LrL0NmQvAcO7FBwJbwmr2ttPAacfy0xuiOjE5zt+zM4xDyuyvUaxBi/9gb2SoCyNEVJcw==}
+ engines: {node: '>=8.6.0'}
+
require-main-filename@2.0.0:
resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
@@ -11242,6 +11356,9 @@ packages:
engines: {node: '>=4'}
hasBin: true
+ shimmer@1.2.1:
+ resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
shx@0.3.4:
resolution: {integrity: sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g==}
engines: {node: '>=6'}
@@ -14089,6 +14206,18 @@ snapshots:
- encoding
- supports-color
+ '@grpc/grpc-js@1.10.9':
+ dependencies:
+ '@grpc/proto-loader': 0.7.13
+ '@js-sdsl/ordered-map': 4.4.2
+
+ '@grpc/proto-loader@0.7.13':
+ dependencies:
+ lodash.camelcase: 4.3.0
+ long: 5.2.3
+ protobufjs: 7.3.2
+ yargs: 17.7.2
+
'@hapi/hoek@9.3.0': {}
'@hapi/topo@5.1.0':
@@ -14268,6 +14397,8 @@ snapshots:
'@jridgewell/resolve-uri': 3.1.2
'@jridgewell/sourcemap-codec': 1.4.15
+ '@js-sdsl/ordered-map@4.4.2': {}
+
'@lerna/create@8.1.3(encoding@0.1.13)':
dependencies:
'@npmcli/run-script': 7.0.2
@@ -14704,25 +14835,27 @@ snapshots:
transitivePeerDependencies:
- '@types/react'
- '@netlify/functions@2.7.0(@opentelemetry/api@1.8.0)':
+ '@netlify/functions@2.8.0(@opentelemetry/api@1.8.0)':
dependencies:
- '@netlify/serverless-functions-api': 1.18.1(@opentelemetry/api@1.8.0)
+ '@netlify/serverless-functions-api': 1.18.4(@opentelemetry/api@1.8.0)
transitivePeerDependencies:
- '@opentelemetry/api'
+ - supports-color
'@netlify/node-cookies@0.1.0': {}
- '@netlify/serverless-functions-api@1.18.1(@opentelemetry/api@1.8.0)':
+ '@netlify/serverless-functions-api@1.18.4(@opentelemetry/api@1.8.0)':
dependencies:
'@netlify/node-cookies': 0.1.0
- '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/otlp-transformer': 0.50.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/sdk-trace-base': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-node': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-node': 1.25.1(@opentelemetry/api@1.8.0)
urlpattern-polyfill: 8.0.2
transitivePeerDependencies:
- '@opentelemetry/api'
+ - supports-color
'@next/env@13.5.1': {}
@@ -15136,75 +15269,161 @@ snapshots:
dependencies:
'@octokit/openapi-types': 18.0.0
- '@opentelemetry/api-logs@0.50.0':
+ '@opentelemetry/api-logs@0.52.1':
dependencies:
'@opentelemetry/api': 1.8.0
'@opentelemetry/api@1.8.0': {}
- '@opentelemetry/core@1.23.0(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/context-async-hooks@1.25.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/semantic-conventions': 1.23.0
- '@opentelemetry/core@1.24.1(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/core@1.25.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/semantic-conventions': 1.25.1
- '@opentelemetry/otlp-transformer@0.50.0(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/exporter-trace-otlp-grpc@0.52.1(@opentelemetry/api@1.8.0)':
dependencies:
+ '@grpc/grpc-js': 1.10.9
'@opentelemetry/api': 1.8.0
- '@opentelemetry/api-logs': 0.50.0
- '@opentelemetry/core': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/sdk-logs': 0.50.0(@opentelemetry/api-logs@0.50.0)(@opentelemetry/api@1.8.0)
- '@opentelemetry/sdk-metrics': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/sdk-trace-base': 1.23.0(@opentelemetry/api@1.8.0)
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-grpc-exporter-base': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources@1.23.0(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/exporter-trace-otlp-http@0.52.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/core': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/semantic-conventions': 1.23.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources@1.24.1(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/exporter-trace-otlp-proto@0.52.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/sdk-logs@0.50.0(@opentelemetry/api-logs@0.50.0)(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/exporter-zipkin@1.25.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/api-logs': 0.50.0
- '@opentelemetry/core': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.23.0(@opentelemetry/api@1.8.0)
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/semantic-conventions': 1.25.1
- '@opentelemetry/sdk-metrics@1.23.0(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/core': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.23.0(@opentelemetry/api@1.8.0)
+ '@opentelemetry/api-logs': 0.52.1
+ '@types/shimmer': 1.0.5
+ import-in-the-middle: 1.8.1
+ require-in-the-middle: 7.3.0
+ semver: 7.6.0
+ shimmer: 1.2.1
+ transitivePeerDependencies:
+ - supports-color
+
+ '@opentelemetry/otlp-exporter-base@0.52.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+
+ '@opentelemetry/otlp-grpc-exporter-base@0.52.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@grpc/grpc-js': 1.10.9
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-exporter-base': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/otlp-transformer': 0.52.1(@opentelemetry/api@1.8.0)
+
+ '@opentelemetry/otlp-transformer@0.52.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/api-logs': 0.52.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
+ protobufjs: 7.3.2
+
+ '@opentelemetry/propagator-b3@1.25.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+
+ '@opentelemetry/propagator-jaeger@1.25.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+
+ '@opentelemetry/resources@1.25.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/semantic-conventions': 1.25.1
+
+ '@opentelemetry/sdk-logs@0.52.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/api-logs': 0.52.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+
+ '@opentelemetry/sdk-metrics@1.25.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
lodash.merge: 4.6.2
- '@opentelemetry/sdk-trace-base@1.23.0(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/sdk-node@0.52.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/core': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.23.0(@opentelemetry/api@1.8.0)
- '@opentelemetry/semantic-conventions': 1.23.0
+ '@opentelemetry/api-logs': 0.52.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/exporter-trace-otlp-grpc': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/exporter-trace-otlp-http': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/exporter-trace-otlp-proto': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/exporter-zipkin': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-logs': 0.52.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-metrics': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-node': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/semantic-conventions': 1.25.1
+ transitivePeerDependencies:
+ - supports-color
- '@opentelemetry/sdk-trace-base@1.24.1(@opentelemetry/api@1.8.0)':
+ '@opentelemetry/sdk-trace-base@1.25.1(@opentelemetry/api@1.8.0)':
dependencies:
'@opentelemetry/api': 1.8.0
- '@opentelemetry/core': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/resources': 1.24.1(@opentelemetry/api@1.8.0)
- '@opentelemetry/semantic-conventions': 1.24.1
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/resources': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/semantic-conventions': 1.25.1
- '@opentelemetry/semantic-conventions@1.23.0': {}
+ '@opentelemetry/sdk-trace-node@1.25.1(@opentelemetry/api@1.8.0)':
+ dependencies:
+ '@opentelemetry/api': 1.8.0
+ '@opentelemetry/context-async-hooks': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/core': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/propagator-b3': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/propagator-jaeger': 1.25.1(@opentelemetry/api@1.8.0)
+ '@opentelemetry/sdk-trace-base': 1.25.1(@opentelemetry/api@1.8.0)
+ semver: 7.6.0
- '@opentelemetry/semantic-conventions@1.24.1': {}
+ '@opentelemetry/semantic-conventions@1.25.1': {}
'@pigment-css/nextjs-plugin@0.0.14(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)':
dependencies:
@@ -15281,6 +15500,29 @@ snapshots:
'@popperjs/core@2.11.8': {}
+ '@protobufjs/aspromise@1.1.2': {}
+
+ '@protobufjs/base64@1.1.2': {}
+
+ '@protobufjs/codegen@2.0.4': {}
+
+ '@protobufjs/eventemitter@1.1.0': {}
+
+ '@protobufjs/fetch@1.1.0':
+ dependencies:
+ '@protobufjs/aspromise': 1.1.2
+ '@protobufjs/inquire': 1.1.0
+
+ '@protobufjs/float@1.0.2': {}
+
+ '@protobufjs/inquire@1.1.0': {}
+
+ '@protobufjs/path@1.1.2': {}
+
+ '@protobufjs/pool@1.1.0': {}
+
+ '@protobufjs/utf8@1.1.0': {}
+
'@react-native-community/cli-clean@12.3.6(encoding@0.1.13)':
dependencies:
'@react-native-community/cli-tools': 12.3.6(encoding@0.1.13)
@@ -16231,6 +16473,8 @@ snapshots:
'@types/mime': 3.0.1
'@types/node': 18.19.39
+ '@types/shimmer@1.0.5': {}
+
'@types/sinon@17.0.3':
dependencies:
'@types/sinonjs__fake-timers': 8.1.2
@@ -17540,6 +17784,8 @@ snapshots:
ci-info@3.9.0: {}
+ cjs-module-lexer@1.3.1: {}
+
classnames@2.3.2: {}
claudia-api-builder@4.1.2: {}
@@ -19882,6 +20128,13 @@ snapshots:
parent-module: 1.0.1
resolve-from: 4.0.0
+ import-in-the-middle@1.8.1:
+ dependencies:
+ acorn: 8.11.3
+ acorn-import-attributes: 1.9.5(acorn@8.11.3)
+ cjs-module-lexer: 1.3.1
+ module-details-from-path: 1.0.3
+
import-lazy@4.0.0: {}
import-local@3.1.0:
@@ -21022,6 +21275,8 @@ snapshots:
dayjs: 1.11.11
yargs: 15.4.1
+ long@5.2.3: {}
+
longest-streak@2.0.4: {}
loose-envify@1.4.0:
@@ -21567,6 +21822,8 @@ snapshots:
modify-values@1.0.1: {}
+ module-details-from-path@1.0.3: {}
+
moo@0.5.1: {}
mri@1.2.0: {}
@@ -22665,6 +22922,21 @@ snapshots:
object-assign: 4.1.1
react-is: 16.13.1
+ protobufjs@7.3.2:
+ dependencies:
+ '@protobufjs/aspromise': 1.1.2
+ '@protobufjs/base64': 1.1.2
+ '@protobufjs/codegen': 2.0.4
+ '@protobufjs/eventemitter': 1.1.0
+ '@protobufjs/fetch': 1.1.0
+ '@protobufjs/float': 1.0.2
+ '@protobufjs/inquire': 1.1.0
+ '@protobufjs/path': 1.1.2
+ '@protobufjs/pool': 1.1.0
+ '@protobufjs/utf8': 1.1.0
+ '@types/node': 18.19.39
+ long: 5.2.3
+
protocols@2.0.1: {}
proxy-addr@2.0.7:
@@ -23315,6 +23587,14 @@ snapshots:
require-from-string@2.0.2: {}
+ require-in-the-middle@7.3.0:
+ dependencies:
+ debug: 4.3.4(supports-color@8.1.1)
+ module-details-from-path: 1.0.3
+ resolve: 1.22.8
+ transitivePeerDependencies:
+ - supports-color
+
require-main-filename@2.0.0: {}
requires-port@1.0.0: {}
@@ -23636,6 +23916,8 @@ snapshots:
interpret: 1.4.0
rechoir: 0.6.2
+ shimmer@1.2.1: {}
+
shx@0.3.4:
dependencies:
minimist: 1.2.6
From d06966882c2b149a0d1f12841eeb4c4fad51a5e4 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 23 Jun 2024 18:40:47 +0530
Subject: [PATCH 38/65] Bump execa to ^9.3.0 (#42729)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/package.json b/package.json
index 41b866d566993c..889b8013ec4e5d 100644
--- a/package.json
+++ b/package.json
@@ -93,7 +93,7 @@
"@googleapis/sheets": "^8.0.0",
"@netlify/functions": "^2.8.0",
"@slack/bolt": "^3.19.0",
- "execa": "^9.2.0",
+ "execa": "^9.3.0",
"google-auth-library": "^9.11.0"
},
"devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6b07296bda41eb..ac55e4b6b11299 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,8 +35,8 @@ importers:
specifier: ^3.19.0
version: 3.19.0
execa:
- specifier: ^9.2.0
- version: 9.2.0
+ specifier: ^9.3.0
+ version: 9.3.0
google-auth-library:
specifier: ^9.11.0
version: 9.11.0(encoding@0.1.13)
@@ -7536,8 +7536,8 @@ packages:
resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==}
engines: {node: '>=10'}
- execa@9.2.0:
- resolution: {integrity: sha512-vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg==}
+ execa@9.3.0:
+ resolution: {integrity: sha512-l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==}
engines: {node: ^18.19.0 || >=20.5.0}
expand-tilde@2.0.2:
@@ -19234,7 +19234,7 @@ snapshots:
signal-exit: 3.0.7
strip-final-newline: 2.0.0
- execa@9.2.0:
+ execa@9.3.0:
dependencies:
'@sindresorhus/merge-streams': 4.0.0
cross-spawn: 7.0.3
From 2ef685d19ec53aafcddf15f67364a4974a86eaf2 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari
Date: Sun, 23 Jun 2024 22:44:25 +0200
Subject: [PATCH 39/65] [infra] Add support donation button (#42499)
Signed-off-by: Olivier Tassinari
Co-authored-by: Sycamore <71297412+samuelsycamore@users.noreply.github.com>
---
.github/ISSUE_TEMPLATE/1.bug.yml | 6 ++++++
.github/ISSUE_TEMPLATE/2.feature.yml | 6 ++++++
.github/ISSUE_TEMPLATE/4.docs-feedback.yml | 6 ++++++
3 files changed, 18 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/1.bug.yml b/.github/ISSUE_TEMPLATE/1.bug.yml
index f1b828fc6d3db3..c8c7c2d05eb11c 100644
--- a/.github/ISSUE_TEMPLATE/1.bug.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug.yml
@@ -59,3 +59,9 @@ body:
Output from `npx @mui/envinfo` goes here.
```
+ - type: markdown
+ attributes:
+ value: |
+ ## :heart: Love Material UI?
+
+ Consider donating $10 to sustain our open-source work: [https://opencollective.com/mui-org](https://opencollective.com/mui-org).
diff --git a/.github/ISSUE_TEMPLATE/2.feature.yml b/.github/ISSUE_TEMPLATE/2.feature.yml
index 054d5527f7e13a..444adc3e659eda 100644
--- a/.github/ISSUE_TEMPLATE/2.feature.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature.yml
@@ -32,3 +32,9 @@ body:
attributes:
label: Motivation
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
+ - type: markdown
+ attributes:
+ value: |
+ ## :heart: Love Material UI?
+
+ Consider donating $10 to sustain our open-source work: [https://opencollective.com/mui-org](https://opencollective.com/mui-org).
diff --git a/.github/ISSUE_TEMPLATE/4.docs-feedback.yml b/.github/ISSUE_TEMPLATE/4.docs-feedback.yml
index 21f9ae7ba38356..49593ef995cc9c 100644
--- a/.github/ISSUE_TEMPLATE/4.docs-feedback.yml
+++ b/.github/ISSUE_TEMPLATE/4.docs-feedback.yml
@@ -42,3 +42,9 @@ body:
attributes:
label: Context
description: What are you trying to accomplish? Providing context helps us come up with a solution that is more useful in the real world.
+ - type: markdown
+ attributes:
+ value: |
+ ## :heart: Love Material UI?
+
+ Consider donating $10 to sustain our open-source work: [https://opencollective.com/mui-org](https://opencollective.com/mui-org).
From f4f199b86fbbe8d8370c8ec93cccd54bb14e8532 Mon Sep 17 00:00:00 2001
From: Siriwat K
Date: Mon, 24 Jun 2024 17:46:38 +0700
Subject: [PATCH 40/65] [material-ui] Support Pigment CSS for `CssBaseline`,
`ScopedCssBaseline` and `Popper` (#42640)
---
apps/pigment-css-next-app/src/app/layout.tsx | 17 +-
.../material-ui/react-css-baseline/page.tsx | 24 +++
.../src/app/material-ui/react-popper/page.tsx | 51 ++++++
.../app/material-ui/react-text-field/page.tsx | 163 +++++++++++++++++
.../pages/material-ui/react-css-baseline.tsx | 24 +++
.../src/pages/material-ui/react-popper.tsx | 52 ++++++
.../pages/material-ui/react-text-field.tsx | 164 ++++++++++++++++++
.../src/CssBaseline/CssBaseline.js | 72 +++++++-
packages/mui-material/src/Popper/Popper.tsx | 14 +-
.../ScopedCssBaseline/ScopedCssBaseline.js | 32 ++--
.../mui-material/src/zero-styled/index.tsx | 17 +-
11 files changed, 589 insertions(+), 41 deletions(-)
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-css-baseline/page.tsx
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-popper/page.tsx
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-text-field/page.tsx
create mode 100644 apps/pigment-css-vite-app/src/pages/material-ui/react-css-baseline.tsx
create mode 100644 apps/pigment-css-vite-app/src/pages/material-ui/react-popper.tsx
create mode 100644 apps/pigment-css-vite-app/src/pages/material-ui/react-text-field.tsx
diff --git a/apps/pigment-css-next-app/src/app/layout.tsx b/apps/pigment-css-next-app/src/app/layout.tsx
index 77126c9b714539..b232ba291a9f28 100644
--- a/apps/pigment-css-next-app/src/app/layout.tsx
+++ b/apps/pigment-css-next-app/src/app/layout.tsx
@@ -1,9 +1,7 @@
import type { Metadata } from 'next';
-import { css } from '@pigment-css/react';
import { Inter } from 'next/font/google';
import { AppRouterCacheProvider } from '@mui/material-nextjs/v14-appRouter';
import { ThemeProvider } from '@mui/material/styles';
-import CssBaseline from '@mui/material/CssBaseline';
import '@pigment-css/react/styles.css';
import theme from './theme';
@@ -19,20 +17,9 @@ export const metadata: Metadata = {
export default function RootLayout(props: { children: React.ReactNode }) {
return (
- t.vars.palette.background.default};
- color: ${({ theme: t }) => t.vars.palette.text.primary};
- background-image: url('@/assets/mui.svg');
- background-repeat: no-repeat;
- background-position: 1rem 1rem;
- `}`}
- >
+
-
-
- {props.children}
-
+ {props.children}
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-css-baseline/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-css-baseline/page.tsx
new file mode 100644
index 00000000000000..ba513ac0612826
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-css-baseline/page.tsx
@@ -0,0 +1,24 @@
+'use client';
+import * as React from 'react';
+import CssBaseline from '@mui/material/CssBaseline';
+import ScopedCssBaseline from '@mui/material/ScopedCssBaseline';
+
+export default function CssBaselinePage() {
+ return (
+
+
+
+
+ Positioned Popper
+
+ Hello world
+
+
+
+ );
+}
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-popper/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-popper/page.tsx
new file mode 100644
index 00000000000000..99197dba12699d
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-popper/page.tsx
@@ -0,0 +1,51 @@
+'use client';
+import * as React from 'react';
+import PopperPopupState from '../../../../../../docs/data/material/components/popper/PopperPopupState';
+import PositionedPopper from '../../../../../../docs/data/material/components/popper/PositionedPopper';
+import SimplePopper from '../../../../../../docs/data/material/components/popper/SimplePopper';
+import SpringPopper from '../../../../../../docs/data/material/components/popper/SpringPopper';
+import TransitionsPopper from '../../../../../../docs/data/material/components/popper/TransitionsPopper';
+import VirtualElementPopper from '../../../../../../docs/data/material/components/popper/VirtualElementPopper';
+
+export default function Popper() {
+ return (
+
+
+
+
+
+
+ Transitions Popper
+
+
+
+
+
+ Virtual Element Popper
+
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-text-field/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-text-field/page.tsx
new file mode 100644
index 00000000000000..f3d627bd2944ce
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-text-field/page.tsx
@@ -0,0 +1,163 @@
+'use client';
+import * as React from 'react';
+import BasicTextFields from '../../../../../../docs/data/material/components/text-fields/BasicTextFields';
+import ColorTextFields from '../../../../../../docs/data/material/components/text-fields/ColorTextFields';
+import ComposedTextField from '../../../../../../docs/data/material/components/text-fields/ComposedTextField';
+import CustomizedInputBase from '../../../../../../docs/data/material/components/text-fields/CustomizedInputBase';
+import CustomizedInputsStyleOverrides from '../../../../../../docs/data/material/components/text-fields/CustomizedInputsStyleOverrides';
+import CustomizedInputsStyled from '../../../../../../docs/data/material/components/text-fields/CustomizedInputsStyled';
+import FormPropsTextFields from '../../../../../../docs/data/material/components/text-fields/FormPropsTextFields';
+import FormattedInputs from '../../../../../../docs/data/material/components/text-fields/FormattedInputs';
+import FullWidthTextField from '../../../../../../docs/data/material/components/text-fields/FullWidthTextField';
+import HelperTextAligned from '../../../../../../docs/data/material/components/text-fields/HelperTextAligned';
+import HelperTextMisaligned from '../../../../../../docs/data/material/components/text-fields/HelperTextMisaligned';
+import InputAdornments from '../../../../../../docs/data/material/components/text-fields/InputAdornments';
+import InputWithIcon from '../../../../../../docs/data/material/components/text-fields/InputWithIcon';
+import Inputs from '../../../../../../docs/data/material/components/text-fields/Inputs';
+import LayoutTextFields from '../../../../../../docs/data/material/components/text-fields/LayoutTextFields';
+import MultilineTextFields from '../../../../../../docs/data/material/components/text-fields/MultilineTextFields';
+import SelectTextFields from '../../../../../../docs/data/material/components/text-fields/SelectTextFields';
+import StateTextFields from '../../../../../../docs/data/material/components/text-fields/StateTextFields';
+import TextFieldHiddenLabel from '../../../../../../docs/data/material/components/text-fields/TextFieldHiddenLabel';
+import TextFieldSizes from '../../../../../../docs/data/material/components/text-fields/TextFieldSizes';
+import UseFormControl from '../../../../../../docs/data/material/components/text-fields/UseFormControl';
+import ValidationTextFields from '../../../../../../docs/data/material/components/text-fields/ValidationTextFields';
+
+export default function TextFields() {
+ return (
+
+
+ Basic Text Fields
+
+
+
+
+
+ Color Text Fields
+
+
+
+
+
+ Composed Text Field
+
+
+
+
+
+ Customized Input Base
+
+
+
+
+
+ Customized Inputs Style Overrides
+
+
+
+
+
+ Customized Inputs Styled
+
+
+
+
+
+ Form Props Text Fields
+
+
+
+
+
+ Formatted Inputs
+
+
+
+
+
+ Full Width Text Field
+
+
+
+
+
+ Helper Text Aligned
+
+
+
+
+
+ Helper Text Misaligned
+
+
+
+
+
+ Input Adornments
+
+
+
+
+
+ Input With Icon
+
+
+
+
+
+
+ Layout Text Fields
+
+
+
+
+
+ Multiline Text Fields
+
+
+
+
+
+ Select Text Fields
+
+
+
+
+
+ State Text Fields
+
+
+
+
+
+ Text Field Hidden Label
+
+
+
+
+
+ Text Field Sizes
+
+
+
+
+
+ Use Form Control
+
+
+
+
+
+ Validation Text Fields
+
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-vite-app/src/pages/material-ui/react-css-baseline.tsx b/apps/pigment-css-vite-app/src/pages/material-ui/react-css-baseline.tsx
new file mode 100644
index 00000000000000..14caca148fca49
--- /dev/null
+++ b/apps/pigment-css-vite-app/src/pages/material-ui/react-css-baseline.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import CssBaseline from '@mui/material/CssBaseline';
+import ScopedCssBaseline from '@mui/material/ScopedCssBaseline';
+import MaterialUILayout from '../../Layout';
+
+export default function CssBaselinePage() {
+ return (
+
+
+
+
+ Positioned Popper
+
+ Hello world
+
+
+
+ );
+}
diff --git a/apps/pigment-css-vite-app/src/pages/material-ui/react-popper.tsx b/apps/pigment-css-vite-app/src/pages/material-ui/react-popper.tsx
new file mode 100644
index 00000000000000..29dccd4a30a793
--- /dev/null
+++ b/apps/pigment-css-vite-app/src/pages/material-ui/react-popper.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react';
+import MaterialUILayout from '../../Layout';
+import PopperPopupState from '../../../../../docs/data/material/components/popper/PopperPopupState.tsx';
+import PositionedPopper from '../../../../../docs/data/material/components/popper/PositionedPopper.tsx';
+import SimplePopper from '../../../../../docs/data/material/components/popper/SimplePopper.tsx';
+import SpringPopper from '../../../../../docs/data/material/components/popper/SpringPopper.tsx';
+import TransitionsPopper from '../../../../../docs/data/material/components/popper/TransitionsPopper.tsx';
+import VirtualElementPopper from '../../../../../docs/data/material/components/popper/VirtualElementPopper.tsx';
+
+export default function Popper() {
+ return (
+
+ Popper
+
+
+
+
+
+ Transitions Popper
+
+
+
+
+
+ Virtual Element Popper
+
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-vite-app/src/pages/material-ui/react-text-field.tsx b/apps/pigment-css-vite-app/src/pages/material-ui/react-text-field.tsx
new file mode 100644
index 00000000000000..bdd998a45605f0
--- /dev/null
+++ b/apps/pigment-css-vite-app/src/pages/material-ui/react-text-field.tsx
@@ -0,0 +1,164 @@
+import * as React from 'react';
+import MaterialUILayout from '../../Layout';
+import BasicTextFields from '../../../../../docs/data/material/components/text-fields/BasicTextFields.tsx';
+import ColorTextFields from '../../../../../docs/data/material/components/text-fields/ColorTextFields.tsx';
+import ComposedTextField from '../../../../../docs/data/material/components/text-fields/ComposedTextField.tsx';
+import CustomizedInputBase from '../../../../../docs/data/material/components/text-fields/CustomizedInputBase.tsx';
+import CustomizedInputsStyleOverrides from '../../../../../docs/data/material/components/text-fields/CustomizedInputsStyleOverrides.tsx';
+import CustomizedInputsStyled from '../../../../../docs/data/material/components/text-fields/CustomizedInputsStyled.tsx';
+import FormPropsTextFields from '../../../../../docs/data/material/components/text-fields/FormPropsTextFields.tsx';
+import FormattedInputs from '../../../../../docs/data/material/components/text-fields/FormattedInputs.tsx';
+import FullWidthTextField from '../../../../../docs/data/material/components/text-fields/FullWidthTextField.tsx';
+import HelperTextAligned from '../../../../../docs/data/material/components/text-fields/HelperTextAligned.tsx';
+import HelperTextMisaligned from '../../../../../docs/data/material/components/text-fields/HelperTextMisaligned.tsx';
+import InputAdornments from '../../../../../docs/data/material/components/text-fields/InputAdornments.tsx';
+import InputWithIcon from '../../../../../docs/data/material/components/text-fields/InputWithIcon.tsx';
+import Inputs from '../../../../../docs/data/material/components/text-fields/Inputs.tsx';
+import LayoutTextFields from '../../../../../docs/data/material/components/text-fields/LayoutTextFields.tsx';
+import MultilineTextFields from '../../../../../docs/data/material/components/text-fields/MultilineTextFields.tsx';
+import SelectTextFields from '../../../../../docs/data/material/components/text-fields/SelectTextFields.tsx';
+import StateTextFields from '../../../../../docs/data/material/components/text-fields/StateTextFields.tsx';
+import TextFieldHiddenLabel from '../../../../../docs/data/material/components/text-fields/TextFieldHiddenLabel.tsx';
+import TextFieldSizes from '../../../../../docs/data/material/components/text-fields/TextFieldSizes.tsx';
+import UseFormControl from '../../../../../docs/data/material/components/text-fields/UseFormControl.tsx';
+import ValidationTextFields from '../../../../../docs/data/material/components/text-fields/ValidationTextFields.tsx';
+
+export default function TextFields() {
+ return (
+
+ TextFields
+
+ Basic Text Fields
+
+
+
+
+
+ Color Text Fields
+
+
+
+
+
+ Composed Text Field
+
+
+
+
+
+ Customized Input Base
+
+
+
+
+
+ Customized Inputs Style Overrides
+
+
+
+
+
+ Customized Inputs Styled
+
+
+
+
+
+ Form Props Text Fields
+
+
+
+
+
+ Formatted Inputs
+
+
+
+
+
+ Full Width Text Field
+
+
+
+
+
+ Helper Text Aligned
+
+
+
+
+
+ Helper Text Misaligned
+
+
+
+
+
+ Input Adornments
+
+
+
+
+
+ Input With Icon
+
+
+
+
+
+
+ Layout Text Fields
+
+
+
+
+
+ Multiline Text Fields
+
+
+
+
+
+ Select Text Fields
+
+
+
+
+
+ State Text Fields
+
+
+
+
+
+ Text Field Hidden Label
+
+
+
+
+
+ Text Field Sizes
+
+
+
+
+
+ Use Form Control
+
+
+
+
+
+ Validation Text Fields
+
+
+
+
+
+ );
+}
diff --git a/packages/mui-material/src/CssBaseline/CssBaseline.js b/packages/mui-material/src/CssBaseline/CssBaseline.js
index 12d16875e3f984..9caadb2ba5efb3 100644
--- a/packages/mui-material/src/CssBaseline/CssBaseline.js
+++ b/packages/mui-material/src/CssBaseline/CssBaseline.js
@@ -1,8 +1,11 @@
'use client';
import * as React from 'react';
import PropTypes from 'prop-types';
-import useThemeProps from '../styles/useThemeProps';
-import GlobalStyles from '../GlobalStyles';
+import { globalCss } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
+
+// to determine if the global styles are static or dynamic
+const isDynamicSupport = typeof globalCss({}) === 'function';
export const html = (theme, enableColorScheme) => ({
WebkitFontSmoothing: 'antialiased', // Antialiasing.
@@ -30,9 +33,20 @@ export const styles = (theme, enableColorScheme = false) => {
const colorSchemeStyles = {};
if (enableColorScheme && theme.colorSchemes) {
Object.entries(theme.colorSchemes).forEach(([key, scheme]) => {
- colorSchemeStyles[theme.getColorSchemeSelector(key).replace(/\s*&/, '')] = {
- colorScheme: scheme.palette?.mode,
- };
+ const selector = theme.getColorSchemeSelector(key);
+ if (selector.startsWith('@')) {
+ // for @media (prefers-color-scheme), we need to target :root
+ colorSchemeStyles[selector] = {
+ ':root': {
+ colorScheme: scheme.palette?.mode,
+ },
+ };
+ } else {
+ // else, it's likely that the selector already target an element with a class or data attribute
+ colorSchemeStyles[selector.replace(/\s*&/, '')] = {
+ colorScheme: scheme.palette?.mode,
+ };
+ }
});
}
let defaultStyles = {
@@ -63,15 +77,59 @@ export const styles = (theme, enableColorScheme = false) => {
return defaultStyles;
};
+// `ecs` stands for enableColorScheme. This is internal logic to make it work with Pigment CSS, so shorter is better.
+const SELECTOR = 'mui-ecs';
+const staticStyles = (theme) => {
+ const result = styles(theme, false);
+ const baseStyles = Array.isArray(result) ? result[0] : result;
+ if (!theme.vars && baseStyles) {
+ baseStyles.html[`:root:has(${SELECTOR})`] = { colorScheme: theme.palette.mode };
+ }
+ if (theme.colorSchemes) {
+ Object.entries(theme.colorSchemes).forEach(([key, scheme]) => {
+ const selector = theme.getColorSchemeSelector(key);
+ if (selector.startsWith('@')) {
+ // for @media (prefers-color-scheme), we need to target :root
+ baseStyles[selector] = {
+ [`:root:not(:has(.${SELECTOR}))`]: {
+ colorScheme: scheme.palette?.mode,
+ },
+ };
+ } else {
+ // else, it's likely that the selector already target an element with a class or data attribute
+ baseStyles[selector.replace(/\s*&/, '')] = {
+ [`&:not(:has(.${SELECTOR}))`]: {
+ colorScheme: scheme.palette?.mode,
+ },
+ };
+ }
+ });
+ }
+ return result;
+};
+
+const GlobalStyles = globalCss(
+ isDynamicSupport
+ ? ({ theme, enableColorScheme }) => styles(theme, enableColorScheme)
+ : ({ theme }) => staticStyles(theme),
+);
+
/**
* Kickstart an elegant, consistent, and simple baseline to build upon.
*/
function CssBaseline(inProps) {
- const props = useThemeProps({ props: inProps, name: 'MuiCssBaseline' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiCssBaseline' });
const { children, enableColorScheme = false } = props;
return (
- styles(theme, enableColorScheme)} />
+ {/* Emotion */}
+ {isDynamicSupport && }
+
+ {/* Pigment CSS */}
+ {!isDynamicSupport && !enableColorScheme && (
+
+ )}
+
{children}
);
diff --git a/packages/mui-material/src/Popper/Popper.tsx b/packages/mui-material/src/Popper/Popper.tsx
index ea1ee028a96a75..565559630ff4b8 100644
--- a/packages/mui-material/src/Popper/Popper.tsx
+++ b/packages/mui-material/src/Popper/Popper.tsx
@@ -1,12 +1,14 @@
'use client';
import { Popper as BasePopper, PopperProps as BasePopperProps } from '@mui/base/Popper';
-import { Direction, SxProps } from '@mui/system';
-import useTheme from '@mui/system/useThemeWithoutDefault';
+import { SxProps } from '@mui/system';
+import { useRtl } from '@mui/system/RtlProvider';
import refType from '@mui/utils/refType';
import HTMLElementType from '@mui/utils/HTMLElementType';
import PropTypes from 'prop-types';
import * as React from 'react';
-import { styled, Theme, useThemeProps } from '../styles';
+import { Theme } from '../styles';
+import { styled } from '../zero-styled';
+import { useDefaultProps } from '../DefaultPropsProvider';
export interface PopperProps extends Omit {
/**
@@ -59,8 +61,8 @@ const Popper = React.forwardRef(function Popper(
inProps: PopperProps,
ref: React.ForwardedRef,
) {
- const theme = useTheme<{ direction?: Direction }>();
- const props = useThemeProps({
+ const isRtl = useRtl();
+ const props = useDefaultProps({
props: inProps,
name: 'MuiPopper',
});
@@ -101,7 +103,7 @@ const Popper = React.forwardRef(function Popper(
return (
styles.root,
-})(({ theme, ownerState }) => {
+})(({ theme }) => {
const colorSchemeStyles = {};
- if (ownerState.enableColorScheme && theme.colorSchemes) {
+ if (theme.colorSchemes) {
Object.entries(theme.colorSchemes).forEach(([key, scheme]) => {
- colorSchemeStyles[`&${theme.getColorSchemeSelector(key).replace(/\s*&/, '')}`] = {
- colorScheme: scheme.palette?.mode,
- };
+ const selector = theme.getColorSchemeSelector(key);
+ if (selector.startsWith('@')) {
+ colorSchemeStyles[selector] = {
+ colorScheme: scheme.palette?.mode,
+ };
+ } else {
+ colorSchemeStyles[`&${selector.replace(/\s*&/, '')}`] = {
+ colorScheme: scheme.palette?.mode,
+ };
+ }
});
}
return {
- ...html(theme, ownerState.enableColorScheme),
+ ...html(theme, false),
...body(theme),
'& *, & *::before, & *::after': {
boxSizing: 'inherit',
@@ -40,12 +47,17 @@ const ScopedCssBaselineRoot = styled('div', {
'& strong, & b': {
fontWeight: theme.typography.fontWeightBold,
},
- ...colorSchemeStyles,
+ variants: [
+ {
+ props: { enableColorScheme: true },
+ style: theme.vars ? colorSchemeStyles : { colorScheme: theme.palette.mode },
+ },
+ ],
};
});
const ScopedCssBaseline = React.forwardRef(function ScopedCssBaseline(inProps, ref) {
- const props = useThemeProps({ props: inProps, name: 'MuiScopedCssBaseline' });
+ const props = useDefaultProps({ props: inProps, name: 'MuiScopedCssBaseline' });
const { className, component = 'div', enableColorScheme, ...other } = props;
const ownerState = {
diff --git a/packages/mui-material/src/zero-styled/index.tsx b/packages/mui-material/src/zero-styled/index.tsx
index e56c98cf9182d1..159973f48008a3 100644
--- a/packages/mui-material/src/zero-styled/index.tsx
+++ b/packages/mui-material/src/zero-styled/index.tsx
@@ -1,5 +1,7 @@
import * as React from 'react';
+import { Interpolation } from '@mui/system';
import { extendSxProp } from '@mui/system/styleFunctionSx';
+import { Theme } from '../styles/createTheme';
import useTheme from '../styles/useTheme';
import GlobalStyles, { GlobalStylesProps } from '../GlobalStyles';
@@ -7,9 +9,18 @@ export { css, keyframes } from '@mui/system';
export { default as styled } from '../styles/styled';
-export function globalCss(styles: GlobalStylesProps['styles']) {
- return function GlobalStylesWrapper() {
- return ;
+export function globalCss(styles: Interpolation<{ theme: Theme }>) {
+ return function GlobalStylesWrapper(props: Record) {
+ return (
+ // Pigment CSS `globalCss` support callback with theme inside an object but `GlobalStyles` support theme as a callback value.
+ styles({ theme, ...props })
+ : styles) as GlobalStylesProps['styles']
+ }
+ />
+ );
};
}
From 280c2fa9f60b24e31f0df4c082182ed3eb6a184a Mon Sep 17 00:00:00 2001
From: Olivier Tassinari
Date: Mon, 24 Jun 2024 17:39:12 +0200
Subject: [PATCH 41/65] [docs-infra] Fix visual look of in-house ad (#42735)
---
docs/src/modules/components/Ad.js | 2 +-
docs/src/modules/components/AdDisplay.js | 8 +-
.../src/MarkdownElement/MarkdownElement.tsx | 109 ++++++++----------
3 files changed, 57 insertions(+), 62 deletions(-)
diff --git a/docs/src/modules/components/Ad.js b/docs/src/modules/components/Ad.js
index 40d16785476bb4..42a5ba21e9bf72 100644
--- a/docs/src/modules/components/Ad.js
+++ b/docs/src/modules/components/Ad.js
@@ -25,7 +25,7 @@ function PleaseDisableAdblock(props) {
{t('adblock')}
-
+
{t('thanks')}{' '}
❤️
diff --git a/docs/src/modules/components/AdDisplay.js b/docs/src/modules/components/AdDisplay.js
index 08af4e6afb733c..3b67cec3e5e529 100644
--- a/docs/src/modules/components/AdDisplay.js
+++ b/docs/src/modules/components/AdDisplay.js
@@ -1,6 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { styled } from '@mui/material/styles';
+import { adShape } from 'docs/src/modules/components/AdManager';
import { GA_ADS_DISPLAY_RATIO } from 'docs/src/modules/constants';
import { adStylesObject } from 'docs/src/modules/components/ad.styles';
@@ -31,7 +32,7 @@ const ImageShape = styled('span')(({ theme }) => {
});
export default function AdDisplay(props) {
- const { ad, className, shape = 'auto' } = props;
+ const { ad, className, shape: shapeProp = 'auto' } = props;
React.useEffect(() => {
// Avoid an exceed on the Google Analytics quotas.
@@ -45,13 +46,16 @@ export default function AdDisplay(props) {
});
}, [ad.label]);
- let Root = 'span';
+ const shape = shapeProp === 'auto' ? adShape : shapeProp;
+
+ let Root;
if (shape === 'inline') {
Root = InlineShape;
}
if (shape === 'image') {
Root = ImageShape;
}
+
/* eslint-disable material-ui/no-hardcoded-labels, react/no-danger */
return (
diff --git a/packages/mui-docs/src/MarkdownElement/MarkdownElement.tsx b/packages/mui-docs/src/MarkdownElement/MarkdownElement.tsx
index 2c5c4dce602253..04387747bc51b6 100644
--- a/packages/mui-docs/src/MarkdownElement/MarkdownElement.tsx
+++ b/packages/mui-docs/src/MarkdownElement/MarkdownElement.tsx
@@ -121,6 +121,43 @@ const Root = styled('div')(
marginBottom: 6,
},
},
+ '& a[target="_blank"]::after': {
+ content: '""',
+ maskImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' focusable='false' aria-hidden='true' viewBox='0 0 24 24' fill='currentColor'%3E%3Cpath d='M6 6v2h8.59L5 17.59 6.41 19 16 9.41V18h2V6z'%3E%3C/path%3E%3C/svg%3E")`,
+ display: 'inline-flex',
+ width: '1em',
+ height: '1em',
+ color: 'inherit',
+ backgroundColor: 'currentColor',
+ transform: 'translate(0, 2px)',
+ transition: 'transform 0.3s cubic-bezier(0.1, 0.8, 0.3, 1)', // bounce effect
+ opacity: 0.8,
+ },
+ '& a[target="_blank"]:hover::after': {
+ opacity: 1,
+ transform: 'translate(1px, 0)',
+ },
+ '& a.remove-link-arrow::after': {
+ // Allows to remove link arrows for images
+ display: 'none',
+ },
+ '& .Ad-root a::after': {
+ // Remove link arrow for ads
+ display: 'none',
+ },
+ '& a': {
+ // Style taken from the Link component
+ color: `var(--muidocs-palette-primary-600, ${lightTheme.palette.primary[600]})`,
+ fontWeight: theme.typography.fontWeightMedium,
+ textDecoration: 'underline',
+ textDecorationColor: alpha(lightTheme.palette.primary.main, 0.4),
+ '&:hover': {
+ textDecorationColor: 'inherit',
+ },
+ },
+ '& a code': {
+ color: darken(lightTheme.palette.primary.main, 0.2),
+ },
'& h1, & h2, & h3, & h4': {
display: 'flex',
alignItems: 'center',
@@ -134,6 +171,8 @@ const Root = styled('div')(
'& .title-link-to-anchor': {
color: 'inherit',
textDecoration: 'none',
+ boxShadow: 'none',
+ fontWeight: 'inherit',
position: 'relative',
display: 'flex',
alignItems: 'center',
@@ -145,12 +184,6 @@ const Root = styled('div')(
alignItems: 'center',
visibility: 'hidden',
},
- '& a:not(.title-link-to-anchor):hover': {
- color: 'currentColor',
- border: 'none',
- boxShadow: '0 1px 0 0 currentColor',
- textDecoration: 'none',
- },
'& .anchor-icon, & .comment-link': {
padding: 0,
cursor: 'pointer',
@@ -409,46 +442,6 @@ const Root = styled('div')(
},
},
},
- '& a[target="_blank"]::after': {
- content: '""',
- maskImage: `url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' focusable='false' aria-hidden='true' viewBox='0 0 24 24' fill='currentColor'%3E%3Cpath d='M6 6v2h8.59L5 17.59 6.41 19 16 9.41V18h2V6z'%3E%3C/path%3E%3C/svg%3E")`,
- display: 'inline-flex',
- width: '1em',
- height: '1em',
- color: 'inherit',
- backgroundColor: 'currentColor',
- transform: 'translate(0, 2px)',
- transition: 'transform 0.3s cubic-bezier(0.1, 0.8, 0.3, 1)', // bounce effect
- opacity: 0.8,
- },
- '& a[target="_blank"]:hover::after': {
- opacity: 1,
- transform: 'translate(1px, 0)',
- },
- '& a.remove-link-arrow::after': {
- // Allows to remove link arrows for images
- display: 'none',
- },
- '& .Ad-root a::after': {
- // Remove link arrow for ads
- display: 'none',
- },
- '& a:not(.title-link-to-anchor), & a:not(.title-link-to-anchor) code': {
- // Style taken from the Link component
- color: `var(--muidocs-palette-primary-600, ${lightTheme.palette.primary[600]})`,
- fontWeight: theme.typography.fontWeightMedium,
- textDecoration: 'underline',
- textDecorationColor: alpha(lightTheme.palette.primary.main, 0.4),
- '&:hover': {
- textDecorationColor: 'inherit',
- },
- },
- '& a code': {
- color: darken(lightTheme.palette.primary.main, 0.04),
- },
- '& a:not(.title-link-to-anchor) code': {
- color: darken(lightTheme.palette.primary.main, 0.2),
- },
'& img, & video': {
// Use !important so that inline style on or can't win.
// This avoid horizontal overflows on mobile.
@@ -676,24 +669,28 @@ const Root = styled('div')(
'& hr': {
backgroundColor: `var(--muidocs-palette-divider, ${darkTheme.palette.divider})`,
},
- '& h1, & h2, & h3, & h4, & h5': {
- color: `var(--muidocs-palette-grey-50, ${darkTheme.palette.grey[50]})`,
+ '& a': {
+ color: `var(--muidocs-palette-primary-300, ${darkTheme.palette.primary[300]})`,
},
- '& p, & ul, & ol': {
- color: `var(--muidocs-palette-grey-400, ${darkTheme.palette.grey[400]})`,
+ '& a code': {
+ color: `var(--muidocs-palette-primary-light, ${darkTheme.palette.primary.light})`,
},
- '& h1, & h2, & h3, & h4': {
- '&:hover .anchor-icon, & .comment-link': {
+ '& h1, & h2, & h3, & h4, & h5': {
+ color: `var(--muidocs-palette-grey-50, ${darkTheme.palette.grey[50]})`,
+ '& .anchor-icon, & .comment-link': {
color: `var(--muidocs-palette-primary-300, ${darkTheme.palette.primaryDark[300]})`,
borderColor: `var(--muidocs-palette-divider, ${darkTheme.palette.divider})`,
backgroundColor: alpha(darkTheme.palette.primaryDark[700], 0.5),
'&:hover': {
+ color: `var(--muidocs-palette-primary-100, ${darkTheme.palette.primary[100]})`,
borderColor: `var(--muidocs-palette-primary-900, ${darkTheme.palette.primary[900]})`,
backgroundColor: alpha(darkTheme.palette.primary[900], 0.6),
- color: `var(--muidocs-palette-primary-100, ${darkTheme.palette.primary[100]})`,
},
},
},
+ '& p, & ul, & ol': {
+ color: `var(--muidocs-palette-grey-400, ${darkTheme.palette.grey[400]})`,
+ },
'& h1 code, & h2 code, & h3 code': {
color: `var(--muidocs-palette-grey-100, ${darkTheme.palette.grey[100]})`,
},
@@ -785,12 +782,6 @@ const Root = styled('div')(
},
},
},
- '& a:not(.title-link-to-anchor), & a:not(.title-link-to-anchor) code': {
- color: `var(--muidocs-palette-primary-300, ${darkTheme.palette.primary[300]})`,
- },
- '& a:not(.title-link-to-anchor) code': {
- color: `var(--muidocs-palette-primary-light, ${darkTheme.palette.primary.light})`,
- },
'& kbd.key': {
color: `var(--muidocs-palette-text-primary, ${darkTheme.palette.text.primary})`,
backgroundColor: `var(--muidocs-palette-primaryDark-800, ${darkTheme.palette.primaryDark[800]})`,
From 3d10564ab5967436f259cc4016d5212c93043872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Mon, 24 Jun 2024 18:02:02 +0200
Subject: [PATCH 42/65] [joy-ui][Autocomplete] Fix React spread key warning
(#42741)
---
packages/mui-joy/src/Autocomplete/Autocomplete.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/mui-joy/src/Autocomplete/Autocomplete.tsx b/packages/mui-joy/src/Autocomplete/Autocomplete.tsx
index 3601284ec7eeaa..96bbf5621d67ef 100644
--- a/packages/mui-joy/src/Autocomplete/Autocomplete.tsx
+++ b/packages/mui-joy/src/Autocomplete/Autocomplete.tsx
@@ -409,13 +409,14 @@ const Autocomplete = React.forwardRef(function Autocomplete(
selectedOptions = renderTags(value as Array, getCustomizedTagProps, ownerState);
} else {
selectedOptions = (value as Array).map((option, index) => {
+ const { key: endDecoratorKey, ...endDecoratorProps } = getCustomizedTagProps({ index });
return (
}
+ endDecorator={ }
sx={{ minWidth: 0 }}
>
{getOptionLabel(option)}
From 7a47eddef1f9435fd40439b734f0e299d886de72 Mon Sep 17 00:00:00 2001
From: Olivier Tassinari
Date: Mon, 24 Jun 2024 18:09:56 +0200
Subject: [PATCH 43/65] [docs-infra] Fix layout shift demo toolbar (#42743)
---
docs/src/modules/components/Demo.js | 2 +-
docs/src/modules/components/DemoToolbar.js | 2 +-
docs/src/modules/components/DemoToolbarRoot.ts | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/docs/src/modules/components/Demo.js b/docs/src/modules/components/Demo.js
index 8eb17dfc4e32b3..5481f40a43f62a 100644
--- a/docs/src/modules/components/Demo.js
+++ b/docs/src/modules/components/Demo.js
@@ -45,7 +45,7 @@ function DemoToolbarFallback() {
const t = useTranslate();
// Sync with styles from DemoToolbar, we can't import the styles
- return ;
+ return ;
}
function getDemoName(location) {
diff --git a/docs/src/modules/components/DemoToolbar.js b/docs/src/modules/components/DemoToolbar.js
index cdde2d59b89655..45e82309ee3be8 100644
--- a/docs/src/modules/components/DemoToolbar.js
+++ b/docs/src/modules/components/DemoToolbar.js
@@ -60,7 +60,7 @@ const Root = styled('div')(({ theme }) => [
function DemoTooltip(props) {
return (
theme.zIndex.appBar - 1,
diff --git a/docs/src/modules/components/DemoToolbarRoot.ts b/docs/src/modules/components/DemoToolbarRoot.ts
index d6be2527a0ac39..b9966acf23f525 100644
--- a/docs/src/modules/components/DemoToolbarRoot.ts
+++ b/docs/src/modules/components/DemoToolbarRoot.ts
@@ -15,7 +15,7 @@ const DemoToolbarRoot = styled('div', {
maxHeight: 50,
display: 'block',
marginTop: -1,
- padding: theme.spacing(0.5, 1),
+ padding: theme.spacing('2px', 1),
border: `1px solid ${(theme.vars || theme).palette.divider}`,
borderTopWidth: 0,
backgroundColor: alpha(theme.palette.grey[50], 0.2),
@@ -54,4 +54,5 @@ const DemoToolbarRoot = styled('div', {
},
}),
]);
+
export default DemoToolbarRoot;
From 968a40079ca555183d892672f73967c83426607b Mon Sep 17 00:00:00 2001
From: Marija Najdova
Date: Mon, 24 Jun 2024 18:36:57 +0200
Subject: [PATCH 44/65] [release] v6.0.0-alpha.12 (#42740)
---
CHANGELOG.md | 69 +++++++++++++++++++
packages-internal/scripts/package.json | 2 +-
packages-internal/test-utils/package.json | 2 +-
packages/markdown/package.json | 2 +-
packages/mui-babel-macros/package.json | 2 +-
packages/mui-base/package.json | 2 +-
packages/mui-codemod/package.json | 2 +-
.../mui-core-downloads-tracker/package.json | 2 +-
packages/mui-docs/package.json | 2 +-
packages/mui-icons-material/package.json | 2 +-
packages/mui-joy/package.json | 2 +-
packages/mui-lab/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 +-
19 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80651467905857..2027048bc5eb6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,74 @@
# [Versions](https://mui.com/versions/)
+## v6.0.0-alpha.12
+
+
+
+_Jun 24, 2024_
+
+A big thanks to the 17 contributors who made this release possible.
+
+### `@mui/material@6.0.0-alpha.12`
+
+- Add `InitColorSchemeScript` for Next.js App Router (#42247) @siriwatknp
+- [Autocomplete] Fix renderOption props type (#42689) @DiegoAndai
+- [Autocomplete] Fix React 18.3 key spread warnings in Autocomplete demos (#42691) @aarongarciah
+- Support Pigment CSS for `CssBaseline`, `ScopedCssBaseline` and `Popper` (#42640) @siriwatknp
+- Add `DefaultPropsProvider` for Pigment CSS integration (#42638) @siriwatknp
+- [Stepper] Generate class for nonLinear prop (#42620) @alexismo
+- [Tab] Fix failing test (#42686) @aarongarciah
+- [Tab] Deprecate iconWrapper class for icon class (#42647) @sai6855
+- [TableSortLabel] Deprecate composed classes (#42281) @sai6855
+- [usePagination] Update pagination `siblingsEnd` calculation logic (#42667) @Mini-ghost
+
+### `@mui/codemod@6.0.0-alpha.12`
+
+- Support dynamic props styled transformation (#42683) @siriwatknp
+
+### `@mui/system@6.0.0-alpha.12`
+
+- Fix issues reported by react compiler in `mui-system` package (#42637) @sai6855
+- [useMediaQuery] Remove deprecated types (#42560) @aarongarciah
+
+### `@mui/joy@5.0.0-beta.45`
+
+- Fix issues reported by the React Compiler (#42671) @anuujj
+- [Autocomplete] Fix React spread key warning (#42741) @aarongarciah
+
+### `@mui/lab@6.0.0-alpha.12`
+
+- [LoadingButton] Apply wrapping element to prevent React crash on Google page translation (#35198) @BartJanvanAssen
+
+### Docs
+
+- Fix git diff format in migration to v6 (#42711) @oliviertassinari
+- Use new email for sponsoring @oliviertassinari
+- Fix 301 links (#42697) @alexfauquette
+- Normalize the capitalization of Design Kit @oliviertassinari
+- Recommend setting HTML attribute instead of DOM property for RTL (#42599) @aarongarciah
+- [material-ui][Select] Fix the `SelectAutoWidth` demo menu item value (#42648) @Danielkhakbaz
+
+### Core
+
+- [code-infra] Try disabling animations when taking screenshots (#42537) @Janpot
+- [code-infra] Fix benchmark package (#42553) @Janpot
+- [core] Replace enzyme in describeConformance (#42447) @DiegoAndai
+- [docs-infra] Fix layout shift demo toolbar (#42743) @oliviertassinari
+- [docs-infra] Fix visual look of in-house ad (#42735) @oliviertassinari
+- [docs-infra] Add stray design polish (#42646) @danilo-leal
+- [docs-infra] Fix wrong migration (#42675) @siriwatknp
+- [docs-infra] Fine tune markdown elements design (#42643) @danilo-leal
+- [docs-infra] Revamp the product switcher design (#42603) @danilo-leal
+- [docs-infra] Allow Link component to receive the `role` attribute (#42629) @danilo-leal
+- [infra] Add support donation button (#42499) @oliviertassinari
+- [infra] Raise `tsconfig`/`tsc` target to `es2022` (#42645) @LukasTy
+- [test] Fix tests on CI (#42670) @michaldudak
+- [test] Fix issues reported by react-compiler in test packages (#42626) @sai6855
+- [website] Add Armin to the team members (#42679) @arminmeh
+- [website] Open Staff Engineer role for Pigment CSS (#42531) @mnajdova
+
+All contributors of this release in alphabetical order: @aarongarciah, @alexfauquette, @alexismo, @anuujj, @arminmeh, @BartJanvanAssen, @Danielkhakbaz, @danilo-leal, @DiegoAndai, @Janpot, @LukasTy, @michaldudak, @Mini-ghost, @mnajdova, @oliviertassinari, @sai6855, @siriwatknp
+
## v6.0.0-alpha.11
diff --git a/packages-internal/scripts/package.json b/packages-internal/scripts/package.json
index c0886d29005233..9c583c1687693b 100644
--- a/packages-internal/scripts/package.json
+++ b/packages-internal/scripts/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-scripts",
- "version": "1.0.10",
+ "version": "1.0.11",
"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 516cc35228a51c..0e2e8e27bd4b4a 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.1",
+ "version": "1.0.2",
"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 643f36fccae791..90be2386975590 100644
--- a/packages/markdown/package.json
+++ b/packages/markdown/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-markdown",
- "version": "1.0.5",
+ "version": "1.0.6",
"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-babel-macros/package.json b/packages/mui-babel-macros/package.json
index dcbfb1f8044c0e..5d5348a73b5a09 100644
--- a/packages/mui-babel-macros/package.json
+++ b/packages/mui-babel-macros/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-babel-macros",
- "version": "1.0.5",
+ "version": "1.0.6",
"author": "MUI Team",
"description": "MUI Babel macros. This is an internal package not meant for general use.",
"main": "./MuiError.macro.js",
diff --git a/packages/mui-base/package.json b/packages/mui-base/package.json
index 564a1ef02307c3..8eae07e0e44470 100644
--- a/packages/mui-base/package.json
+++ b/packages/mui-base/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/base",
- "version": "5.0.0-beta.49",
+ "version": "5.0.0-beta.50",
"private": false,
"author": "MUI Team",
"description": "Base UI is a library of headless ('unstyled') React components and low-level hooks. You gain complete control over your app's CSS and accessibility features.",
diff --git a/packages/mui-codemod/package.json b/packages/mui-codemod/package.json
index b17022668676f6..ed35068b3728c5 100644
--- a/packages/mui-codemod/package.json
+++ b/packages/mui-codemod/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/codemod",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 183959f550ee19..538ddd2901b44c 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.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 6fc9f6ff331d8c..e828a2174463c0 100644
--- a/packages/mui-docs/package.json
+++ b/packages/mui-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/docs",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"private": false,
"author": "MUI Team",
"description": "MUI Docs - Documentation building blocks.",
diff --git a/packages/mui-icons-material/package.json b/packages/mui-icons-material/package.json
index fe6e3963582b98..ff4cecaa7965f6 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.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"private": false,
"author": "MUI Team",
"description": "Material Design icons distributed as SVG React components.",
diff --git a/packages/mui-joy/package.json b/packages/mui-joy/package.json
index 5938eee7288de7..2aee1438be450f 100644
--- a/packages/mui-joy/package.json
+++ b/packages/mui-joy/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/joy",
- "version": "5.0.0-beta.44",
+ "version": "5.0.0-beta.45",
"private": false,
"author": "MUI Team",
"description": "Joy UI is an open-source React component library that implements MUI's own design principles. It's comprehensive and can be used in production out of the box.",
diff --git a/packages/mui-lab/package.json b/packages/mui-lab/package.json
index 3bc5f430583489..4d6e80ed97c109 100644
--- a/packages/mui-lab/package.json
+++ b/packages/mui-lab/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/lab",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"private": false,
"author": "MUI Team",
"description": "Laboratory for new MUI modules.",
diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json
index 6363fa4dee06e0..4f34ee48e82a28 100644
--- a/packages/mui-material/package.json
+++ b/packages/mui-material/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/material",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 62382eaa515d20..06aaa3b17afdda 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.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 f45d8eecfc2e41..dab4f7221f9588 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.0-alpha.26",
+ "version": "6.0.0-alpha.27",
"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 659812018d407d..bdd36fb3e97691 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.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 0ffe81938b33b6..bade247e86b980 100644
--- a/packages/mui-styles/package.json
+++ b/packages/mui-styles/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/styles",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 fe91b8bb4c448e..d62bad67bcca12 100644
--- a/packages/mui-system/package.json
+++ b/packages/mui-system/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/system",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"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 5b37484eedef98..1c3b2ef815de7a 100644
--- a/packages/mui-utils/package.json
+++ b/packages/mui-utils/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/utils",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"private": false,
"author": "MUI Team",
"description": "Utility functions for React components.",
From 00c1b90b6ae2fc9d65117af3e477cf5201daa33b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Mon, 24 Jun 2024 18:43:48 +0200
Subject: [PATCH 45/65] [base-ui] Fix React spread key warning in test (#42744)
---
.../mui-base/src/useAutocomplete/useAutocomplete.test.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/packages/mui-base/src/useAutocomplete/useAutocomplete.test.js b/packages/mui-base/src/useAutocomplete/useAutocomplete.test.js
index 7058e9b6562699..72ac62297340d0 100644
--- a/packages/mui-base/src/useAutocomplete/useAutocomplete.test.js
+++ b/packages/mui-base/src/useAutocomplete/useAutocomplete.test.js
@@ -263,7 +263,12 @@ describe('useAutocomplete', () => {
{groupedOptions.length > 0 ? (
{groupedOptions.map((option, index) => {
- return {option} ;
+ const { key, ...optionProps } = getOptionProps({ option, index });
+ return (
+
+ {option}
+
+ );
})}
) : null}
From fb476c6c18b850e8400d03afb7447802afbfd357 Mon Sep 17 00:00:00 2001
From: Marija Najdova
Date: Mon, 24 Jun 2024 19:11:21 +0200
Subject: [PATCH 46/65] [core] Update root's package.json (#42746)
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 889b8013ec4e5d..5b02c2c11513a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "@mui/monorepo",
- "version": "6.0.0-alpha.11",
+ "version": "6.0.0-alpha.12",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
From 37e9dee0c4dde92e08e6e7c9d8b62d10e7810471 Mon Sep 17 00:00:00 2001
From: Siriwat K
Date: Tue, 25 Jun 2024 16:13:08 +0700
Subject: [PATCH 47/65] [material-ui][docs] Add first batch of v6 migration
(#42242)
---
.../migrating-to-v6/migrating-to-v6.md | 293 ++++++++++++++++++
.../migration-css-theme-variables.md | 0
.../migration/migration-v5/migration-v5.md | 135 --------
docs/data/material/pages.ts | 12 +-
.../migrating-to-v6.md} | 0
docs/data/system/pages.ts | 2 +-
.../{migration-v5.js => migrating-to-v6.js} | 2 +-
.../migration-css-theme-variables.js | 2 +-
.../{migration-v5.js => migrating-to-v6.js} | 2 +-
docs/translations/translations.json | 6 +-
10 files changed, 306 insertions(+), 148 deletions(-)
create mode 100644 docs/data/material/migration/migrating-to-v6/migrating-to-v6.md
rename docs/data/material/migration/{migration-v5 => migrating-to-v6}/migration-css-theme-variables.md (100%)
delete mode 100644 docs/data/material/migration/migration-v5/migration-v5.md
rename docs/data/system/migration/{migration-v5/migration-v5.md => migrating-to-v6/migrating-to-v6.md} (100%)
rename docs/pages/material-ui/migration/{migration-v5.js => migrating-to-v6.js} (85%)
rename docs/pages/system/migration/{migration-v5.js => migrating-to-v6.js} (63%)
diff --git a/docs/data/material/migration/migrating-to-v6/migrating-to-v6.md b/docs/data/material/migration/migrating-to-v6/migrating-to-v6.md
new file mode 100644
index 00000000000000..958c2f3652c85a
--- /dev/null
+++ b/docs/data/material/migration/migrating-to-v6/migrating-to-v6.md
@@ -0,0 +1,293 @@
+# Migrating to v6
+
+This guide explains how and why to migrate from Material UI v5 to v6.
+
+## Start using the alpha release
+
+In your `package.json` file, change the package version from `latest` to `next`.
+
+```diff title="package.json"
+-"@mui/material": "latest",
++"@mui/material": "next",
+```
+
+Optionally, if you are using one of these packages, you can also change their version to `next`:
+
+- `@mui/icons-material`
+- `@mui/system`
+- `@mui/lab`
+- `@mui/material-nextjs`
+- `@mui/styled-engine-sc`
+- `@mui/utils`
+
+Using `next` ensures your project always uses the latest v6 alpha release.
+Alternatively, you can also target and fix it to a specific version, for example, `6.0.0-alpha.0`.
+
+## Why you should migrate
+
+Material UI v6's biggest highlight is the introduction of Pigment CSS, a next-gen zero-runtime CSS-in-JS library, as an opt-in styling engine.
+Using it will make your project compatible with React Server Components, as well as help reduce its bundle size due to styles being extracted at build time, avoiding client-side recalculation.
+
+As a lesson learned from v5, this major release introduces minimal breaking changes.
+Namely, browser support updates, a Node.js version bump, and the removal of the UMD bundle.
+These updates reduced the Material UI package size by 2.5MB, 25% of the total size, and can be, for the most part, migrated automatically via codemods.
+
+Aside from that, v6 also includes a few quality-of-life improvements regarding styling:
+
+- The `CssVarsProvider` API is now stable. That enables you to rely on CSS variables, allowing for more intricate and performant customization possibilities, along with improved overall developer experience.
+- Support for container queries within the theme.
+- A new theme utility for adding styles to specific color modes.
+
+## Supported browsers and Node versions
+
+The targets of the default bundle have changed in v6.
+
+The exact versions will be pinned on release from the browserslist query `"> 0.5%, last 2 versions, Firefox ESR, not dead, safari >= 15.4, iOS >= 15.4"`.
+
+
+
+- Node.js 18 (up from 12)
+- Chrome 109 (up from 90)
+- Edge 121 (up from 91)
+- Firefox 115 (up from 78)
+- Safari 15.4 in both macOS and iOS (up from 14 in macOS and 12.5 in iOS)
+- and more (see [.browserslistrc (`stable` entry)](https://github.com/mui/material-ui/blob/v6.0.0/.browserslistrc#L11))
+
+### Removed support for IE 11
+
+Support for IE 11 is completely removed, by dropping the legacy bundle and all IE 11 related code.
+This allows us to decrease bundle size and keep the scope manageable.
+If you need to support IE 11, you can use Material UI v5's [legacy bundle](https://v5.mui.com/material-ui/guides/minimizing-bundle-size/#legacy-bundle), but it won't get updates or bug fixes.
+
+## Update React & TypeScript version
+
+### Update React
+
+The minimum supported version of React is v17.0.0 (the same as v5).
+Use the snippet below to update your project (replace the `` with the one you want):
+
+
+
+```bash npm
+npm install react@ react-dom@
+```
+
+```bash yarn
+yarn add react@ react-dom@
+```
+
+```bash pnpm
+pnpm add react@ react-dom@
+```
+
+
+
+### Update TypeScript
+
+The minimum supported version of TypeScript has been increased from v3.5 to 4.1.
+
+:::info
+We align with types released by [DefinitelyTyped](https://github.com/DefinitelyTyped/DefinitelyTyped) (published on npm under the `@types` namespace).
+
+We will not change the minimum supported version in a minor version of Material UI.
+However, we recommend not using a TypeScript version older than the lowest supported version by DefinitelyTyped.
+:::
+
+If your project includes these packages, you'll need to update them:
+
+- `@types/react`
+- `@types/react-dom`
+
+:::warning
+Make sure that your application is still running without errors, and commit the changes before continuing to the next step.
+:::
+
+## Breaking changes
+
+:::info
+This list is a work in progress.
+Expect updates as new breaking changes are introduced.
+:::
+
+### UMD bundle was removed
+
+To align with React 19's removal of UMD builds, Material UI has also removed its UMD bundle.
+This results in a reduction of the `@mui/material` package size by 2.5MB or 25% of the total package size.
+
+Instead, using ESM-based CDNs such as [esm.sh](https://esm.sh/) is recommended.
+For alternative installation methods, refer to the [CDN documentation](/material-ui/getting-started/installation/#cdn).
+
+### Chip
+
+Previously, the Chip component lost focus when the escape button was pressed, which differed from how other button-like components work.
+This issue has been resolved, and the Chip now retains focus as expected.
+
+If you want to keep the previous behavior, add a custom `onKeyUp` handler, as shown below:
+
+```js
+import * as React from 'react';
+import Chip from '@mui/material/Chip';
+
+export default function ChipExample() {
+ const chipRef = React.useRef(null);
+ const keyUpHandler = (event) => {
+ if (event.key === 'Escape' && chipRef.current) {
+ chipRef.current.blur();
+ }
+ };
+ return (
+
+ );
+}
+```
+
+### Loading Button
+
+The `children` passed to the Loading Button component is now wrapped in a `` tag to avoid [issues](https://github.com/mui/material-ui/issues/27853) when using tools to translate websites.
+
+### Grid v2 (Unstable_Grid)
+
+The spacing mechanism was reworked to use the `gap` CSS property.
+This maps better with current layout practices and removes the need for using React Context.
+It brings some breaking changes described in the following sections.
+
+#### Removal of the disableEqualOverflow prop
+
+Previously, the Grid overflowed its parent.
+In v6, this is fixed, with the Grid being contained inside its parent's padding:
+
+
+
+This removes the need for the `disableEqualOverflow` prop:
+
+```diff
+-
++
+```
+
+#### Spacing is no longer considered inside the Grid item's box
+
+Previously, Grid items included spacing in their boxes.
+In v6, this is fixed:
+
+
+
+:::warning
+Both of these changes might slightly affect your layout.
+Note that the items' position doesn't change.
+We recommend adopting this new behavior and **not trying to replicate the old one**, as this is a more predictable and modern approach.
+:::
+
+### useMediaQuery
+
+The following deprecated types were removed:
+
+- `MuiMediaQueryList`: use `MediaQueryList` (from lib.dom.d.ts) instead.
+- `MuiMediaQueryListEvent`: use `MediaQueryListEvent` (from lib.dom.d.ts) instead.
+- `MuiMediaQueryListListener`: use `(event: MediaQueryListEvent) => void` instead.
+
+## Stabilized APIs
+
+### CssVarsProvider and extendTheme
+
+The `CssVarsProvider` and `extendTheme` APIs are now stable.
+If you already use them in v5, you can now drop the experimental prefix.
+
+```diff
+- import { experimental_extendTheme as extendTheme, Experimental_CssVarsProvider as CssVarsProvider } from '@mui/material/styles';
++ import { extendTheme, CssVarsProvider } from '@mui/material/styles';
+```
+
+Check out the [CSS theme variables page](/material-ui/customization/css-theme-variables/overview/) to learn more about it.
+
+### Add styles for specific color modes
+
+Material UI v6 introduces a new utility for adding styles to specific color modes called `theme.applyStyles`.
+It's designed to replace `theme.palette.mode` when applying light or dark styles.
+
+```diff
+ const MyComponent = styled('button')(({ theme }) => ({
+ padding: '0.5rem 1rem',
+ border: '1px solid,
+- borderColor: theme.palette.mode === 'dark' ? '#fff' : '#000',
++ borderColor: '#000',
++ ...theme.applyStyles('dark', {
++ borderColor: '#fff',
++ })
+ }))
+```
+
+Use these codemods to migrate your project to `theme.applyStyles`:
+
+```bash
+npx @mui/codemod@next v6.0.0/styled
+npx @mui/codemod@next v6.0.0/sx-prop
+npx @mui/codemod@next v6.0.0/theme-v6
+```
+
+:::info
+Run `v6.0.0/theme-v6` against the file that contains the custom `styleOverrides`. Ignore this codemod if you don't have a custom theme.
+:::
+
+## Deprecations
+
+### Components props
+
+The `components` and `componentsProps` props have been deprecated in favor of `slots` and `slotProps`, making the API surface of the components more consistent.
+
+Check out the [deprecations page](/material-ui/migration/migrating-from-deprecated-apis/) to learn which component no longer has these props.
+
+### System props
+
+System props, such as `mt={*}`, `bgcolor={*}`, and others, are deprecated in the Box, Typography, Link, Grid, and Stack components.
+Move all system props into the `sx` prop by using the codemod below:
+
+```bash
+npx @mui/codemod@next v6.0.0/system-props
+```
+
+Or do it manually like the example below:
+
+```diff
+- ...
++ ...
+```
+
+### Theme component variants
+
+Custom component variants defined in the theme are now merged with the theme style overrides, defined within the `root` slot of the component.
+Update the theme file using the codemod:
+
+```bash
+npx @mui/codemod@next v6.0.0/theme-v6
+```
+
+Or do it manually like the example below:
+
+```diff
+ createTheme({
+ components: {
+ MuiButton: {
+- variants: [ ... ],
++ styleOverrides: {
++ root: {
++ variants: [ ... ]
++ }
++ }
+ }
+ }
+ })
+```
+
+This reduces the API surface and lets you define variants in other slots of the component.
+
+## Pigment CSS integration (optional)
+
+:::info
+⏳ This section is under construction
+:::
diff --git a/docs/data/material/migration/migration-v5/migration-css-theme-variables.md b/docs/data/material/migration/migrating-to-v6/migration-css-theme-variables.md
similarity index 100%
rename from docs/data/material/migration/migration-v5/migration-css-theme-variables.md
rename to docs/data/material/migration/migrating-to-v6/migration-css-theme-variables.md
diff --git a/docs/data/material/migration/migration-v5/migration-v5.md b/docs/data/material/migration/migration-v5/migration-v5.md
deleted file mode 100644
index 0d9607f8c54b5b..00000000000000
--- a/docs/data/material/migration/migration-v5/migration-v5.md
+++ /dev/null
@@ -1,135 +0,0 @@
-# Migrating to v6
-
-This guide explains how and why to migrate from Material UI v5 to v6.
-
-## Start using the alpha release
-
-In the `package.json` file, change the package version from `latest` to `next`.
-
-```diff title="package.json"
--"@mui/material": "latest",
-+"@mui/material": "next",
-```
-
-Using `next` ensures your project always uses the latest v6 alpha release.
-Alternatively, you can also target and fix it to a specific version, for example, `6.0.0-alpha.0`.
-
-## Supported browsers
-
-The targets of the default bundle have changed in v6.
-
-The exact versions will be pinned on release from the browserslist query `"> 0.5%, last 2 versions, Firefox ESR, not dead, safari >= 15.4, iOS >= 15.4"`.
-
-The stable bundle supports the following minimum versions:
-
-
-
-- Chrome 109 (up from 90)
-- Edge 121 (up from 91)
-- Firefox 115 (up from 78)
-- Safari 15.4 in both macOS and iOS (up from 14 in macOS and 12.5 in iOS)
-- and more (see [.browserslistrc (`stable` entry)](https://github.com/mui/material-ui/blob/v6.0.0/.browserslistrc#L16))
-
-### Removed support for IE 11
-
-Support for IE 11 is completely removed, by dropping the legacy bundle and all IE 11 related code.
-This allows us to decrease bundle size and keep the scope manageable.
-If you need to support IE 11, you can use Material UI v5's [legacy bundle](https://v5.mui.com/material-ui/guides/minimizing-bundle-size/#legacy-bundle), but it won't get updates or bug fixes.
-
-## Breaking changes
-
-Since v6 is a new major release, it contains some changes that affect the public API.
-The steps you need to take to migrate from Material UI v5 to v6 are described below.
-
-:::info
-This list is a work in progress.
-Expect updates as new breaking changes are introduced.
-:::
-
-### UMD bundle was removed
-
-To align with React 19's removal of UMD builds, Material UI has also removed its UMD bundle.
-This results in a reduction of the `@mui/material` package size by 2.5MB or 25% of the total package size.
-
-Instead, using ESM-based CDNs such as [esm.sh](https://esm.sh/) is recommended.
-For alternative installation methods, refer to the [CDN documentation](/material-ui/getting-started/installation/#cdn).
-
-### Chip
-
-The Chip component's behavior has been updated to match the standard behavior of other components like buttons.
-Previously, the Chip component lost focus when the escape button was pressed, which differed from how other button-like components work.
-This issue has been resolved, and the chip component retains focus as expected.
-
-You can provide a custom `onKeyUp` handler to implement the previous behavior.
-
-```js
-import * as React from 'react';
-import Chip from '@mui/material/Chip';
-
-export default function ChipExample() {
- const chipRef = React.useRef(null);
- const keyUpHandler = (event) => {
- if (event.key === 'Escape') {
- chipRef.current!.blur();
- }
- };
- return (
-
- );
-}
-```
-
-### Grid v2 (Unstable_Grid)
-
-The spacing mechanism was reworked to use the `gap` CSS property.
-This maps better with current layout practices and removes the need for using React Context.
-It brings some breaking changes described in the following sections.
-
-#### The Grid is contained inside parent's padding
-
-Previously, the Grid overflowed its parent.
-In v6, this is fixed:
-
-
-
-This removes the need for the `disableEqualOverflow` prop, so you can remove it:
-
-```diff
-
-```
-
-#### Spacing is no longer considered inside the Grid item's box
-
-Previously, the Grid items included spacing in it's box.
-In v6, this is fixed:
-
-
-
-:::warning
-Both of these changes might slightly affect your layout.
-Note that the items' position doesn't change.
-We recommend adopting this new behavior and **not trying to replicate the old one**, as this is a more predictable and modern approach.
-:::
-
-### LoadingButton
-
-#### Contents wrapped in a
-
-The `children` passed to the LoadingButton component is now wrapped in a `` tag to avoid [issues](https://github.com/mui/material-ui/issues/27853) when using tools to translate websites.
-
-### useMediaQuery
-
-#### Removed types
-
-The following deprecated types were removed:
-
-- `MuiMediaQueryList`: use `MediaQueryList` (from lib.dom.d.ts) instead.
-- `MuiMediaQueryListEvent`: use `MediaQueryListEvent` (from lib.dom.d.ts) instead.
-- `MuiMediaQueryListListener`: use `(event: MediaQueryListEvent) => void` instead.
diff --git a/docs/data/material/pages.ts b/docs/data/material/pages.ts
index e267ae483f729d..37711a12ab4cb2 100644
--- a/docs/data/material/pages.ts
+++ b/docs/data/material/pages.ts
@@ -259,10 +259,6 @@ const pages: MuiPage[] = [
pathname: '/material-ui/migration',
title: 'Migration',
children: [
- {
- pathname: '/material-ui/migration/migrating-from-deprecated-apis',
- title: 'Migrating from deprecated APIs',
- },
{
pathname: '/material-ui/migration/migration-grid-v2',
title: 'Migrating to Grid v2',
@@ -276,8 +272,12 @@ const pages: MuiPage[] = [
subheader: 'Upgrade to v6',
children: [
{
- pathname: '/material-ui/migration/migration-v5',
- title: 'Migrating to v6',
+ pathname: '/material-ui/migration/migrating-to-v6',
+ title: 'Migrating to v6: getting started',
+ },
+ {
+ pathname: '/material-ui/migration/migrating-from-deprecated-apis',
+ title: 'Migrating from deprecated APIs',
},
{
pathname: '/material-ui/migration/migration-css-theme-variables',
diff --git a/docs/data/system/migration/migration-v5/migration-v5.md b/docs/data/system/migration/migrating-to-v6/migrating-to-v6.md
similarity index 100%
rename from docs/data/system/migration/migration-v5/migration-v5.md
rename to docs/data/system/migration/migrating-to-v6/migrating-to-v6.md
diff --git a/docs/data/system/pages.ts b/docs/data/system/pages.ts
index d55ef46cced61c..67d5508f82b52e 100644
--- a/docs/data/system/pages.ts
+++ b/docs/data/system/pages.ts
@@ -47,7 +47,7 @@ const pages: readonly MuiPage[] = [
title: 'Migration',
children: [
{
- pathname: '/system/migration/migration-v5',
+ pathname: '/system/migration/migrating-to-v6',
title: 'Migrating to v6',
},
],
diff --git a/docs/pages/material-ui/migration/migration-v5.js b/docs/pages/material-ui/migration/migrating-to-v6.js
similarity index 85%
rename from docs/pages/material-ui/migration/migration-v5.js
rename to docs/pages/material-ui/migration/migrating-to-v6.js
index abd12b1320853c..350cdb5ad0cedb 100644
--- a/docs/pages/material-ui/migration/migration-v5.js
+++ b/docs/pages/material-ui/migration/migrating-to-v6.js
@@ -1,6 +1,6 @@
import * as React from 'react';
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
-import * as pageProps from 'docs/data/material/migration/migration-v5/migration-v5.md?muiMarkdown';
+import * as pageProps from 'docs/data/material/migration/migrating-to-v6/migrating-to-v6.md?muiMarkdown';
export default function Page() {
return ;
diff --git a/docs/pages/material-ui/migration/migration-css-theme-variables.js b/docs/pages/material-ui/migration/migration-css-theme-variables.js
index 83ceb99d825d1e..3a59ea771728b8 100644
--- a/docs/pages/material-ui/migration/migration-css-theme-variables.js
+++ b/docs/pages/material-ui/migration/migration-css-theme-variables.js
@@ -4,7 +4,7 @@ import {
demos,
docs,
demoComponents,
-} from 'docs/data/material/migration/migration-v5/migration-css-theme-variables.md?muiMarkdown';
+} from 'docs/data/material/migration/migrating-to-v6/migration-css-theme-variables.md?muiMarkdown';
export default function Page() {
return ;
diff --git a/docs/pages/system/migration/migration-v5.js b/docs/pages/system/migration/migrating-to-v6.js
similarity index 63%
rename from docs/pages/system/migration/migration-v5.js
rename to docs/pages/system/migration/migrating-to-v6.js
index 12a51489d3bcef..1f35624a12f6fb 100644
--- a/docs/pages/system/migration/migration-v5.js
+++ b/docs/pages/system/migration/migrating-to-v6.js
@@ -1,6 +1,6 @@
import * as React from 'react';
import MarkdownDocs from 'docs/src/modules/components/MarkdownDocs';
-import * as pageProps from 'docs/data/system/migration/migration-v5/migration-v5.md?muiMarkdown';
+import * as pageProps from 'docs/data/system/migration/migrating-to-v6/migrating-to-v6.md?muiMarkdown';
export default function Page() {
return ;
diff --git a/docs/translations/translations.json b/docs/translations/translations.json
index 53a33e9e67f1c0..20c0fa939afd37 100644
--- a/docs/translations/translations.json
+++ b/docs/translations/translations.json
@@ -27,7 +27,7 @@
"/system/react-grid": "Grid",
"/system/react-stack": "Stack",
"/system/migration": "Migration",
- "/system/migration/migration-v5": "Migrating to v6",
+ "/system/migration/migrating-to-v6": "Migrating to v6",
"/system/experimental-api": "Experimental APIs",
"/system/experimental-api/configure-the-sx-prop": "Configure the sx prop",
"/system/experimental-api/css-theme-variables": "CSS Theme Variables",
@@ -259,11 +259,11 @@
"/material-ui/experimental-api": "Experimental APIs",
"/material-ui/experimental-api/classname-generator": "ClassName generator",
"/material-ui/migration": "Migration",
- "/material-ui/migration/migrating-from-deprecated-apis": "Migrating from deprecated APIs",
"/material-ui/migration/migration-grid-v2": "Migrating to Grid v2",
"/material-ui/migration/pickers-migration": "Migration from @material-ui/pickers",
"Upgrade to v6": "Upgrade to v6",
- "/material-ui/migration/migration-v5": "Migrating to v6",
+ "/material-ui/migration/migrating-to-v6": "Migrating to v6: getting started",
+ "/material-ui/migration/migrating-from-deprecated-apis": "Migrating from deprecated APIs",
"/material-ui/migration/migration-css-theme-variables": "Migrating to CSS theme variables",
"Upgrade to v5": "Upgrade to v5",
"/material-ui/migration/migration-v4": "Migrating to v5: getting started",
From a7f4b1ac64d38ea6762e6125362c64ece6b45255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Wed, 26 Jun 2024 09:32:04 +0200
Subject: [PATCH 48/65] [styles][withStyles] Expect React defaultProps warning
in test (#42752)
---
.../src/withStyles/withStyles.test.js | 50 +++++++++++++------
1 file changed, 34 insertions(+), 16 deletions(-)
diff --git a/packages/mui-styles/src/withStyles/withStyles.test.js b/packages/mui-styles/src/withStyles/withStyles.test.js
index 7684f4c65a7be4..aab0aa46b2976a 100644
--- a/packages/mui-styles/src/withStyles/withStyles.test.js
+++ b/packages/mui-styles/src/withStyles/withStyles.test.js
@@ -136,7 +136,16 @@ describe('withStyles', () => {
const jssCallbackStub = stub().returns({});
const styles = { root: jssCallbackStub };
const StyledComponent = withStyles(styles)(MyComp);
- render( );
+ const renderCb = () => render( );
+
+ // React 18.3.0 started warning for deprecated defaultProps for function components
+ if (React.version.startsWith('18.3')) {
+ expect(renderCb).toErrorDev([
+ 'Warning: MyComp: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.',
+ ]);
+ } else {
+ renderCb();
+ }
expect(jssCallbackStub.callCount).to.equal(1);
expect(jssCallbackStub.args[0][0]).to.deep.equal({
@@ -179,24 +188,33 @@ describe('withStyles', () => {
const styles = { root: { display: 'flex' } };
const StyledComponent = withStyles(styles, { name: 'MuiFoo' })(MuiFoo);
-
- const { container } = render(
-
+ render(
+
-
- ,
- );
+ })}
+ >
+
+ ,
+ );
- expect(container).to.have.text('bar');
+ // React 18.3.0 started warning for deprecated defaultProps for function components
+ if (React.version.startsWith('18.3')) {
+ expect(renderCb).toErrorDev([
+ 'Warning: MuiFoo: Support for defaultProps will be removed from function components in a future major release. Use JavaScript default parameters instead.',
+ ]);
+ } else {
+ renderCb();
+ }
+
+ expect(screen.getByText('bar')).not.to.equal(null);
});
it('should work when depending on a theme', () => {
From 786c82fdf2ff1beeba4ba46dc507989b543dd04f Mon Sep 17 00:00:00 2001
From: Lukas
Date: Wed, 26 Jun 2024 13:47:39 +0300
Subject: [PATCH 49/65] [code-infra] Refactor eslint `import/no-cycle` rule
(#42705)
Signed-off-by: Lukas
---
.eslintrc.js | 5 +-
.../baseUi/generateApiLinks.ts | 3 +-
.../ApiBuilders/ComponentApiBuilder.ts | 113 +++-----------
.../ApiBuilders/HookApiBuilder.ts | 93 ++----------
packages/api-docs-builder/ProjectSettings.ts | 6 +-
packages/api-docs-builder/buildApi.ts | 5 +-
packages/api-docs-builder/buildApiUtils.ts | 66 +--------
packages/api-docs-builder/index.ts | 1 +
.../types/ApiBuilder.types.ts | 138 ++++++++++++++++++
.../api-docs-builder/types/utils.types.ts | 72 +++++++++
.../utils/generatePropDescription.ts | 2 +-
.../utils/parseSlotsAndClasses.ts | 8 +-
12 files changed, 256 insertions(+), 256 deletions(-)
create mode 100644 packages/api-docs-builder/types/ApiBuilder.types.ts
create mode 100644 packages/api-docs-builder/types/utils.types.ts
diff --git a/.eslintrc.js b/.eslintrc.js
index 4528c57ccae7e0..b19da2f56b682b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -436,7 +436,10 @@ module.exports = {
],
},
],
- 'import/no-cycle': ['error', { ignoreExternal: true }],
+ // TODO: Consider setting back to `ignoreExternal: true` when the expected behavior is fixed:
+ // https://github.com/import-js/eslint-plugin-import/issues/2348#issuecomment-1587320057
+ // Reevaluate when https://github.com/import-js/eslint-plugin-import/pull/2998 is released.
+ 'import/no-cycle': ['error', { ignoreExternal: false }],
},
},
{
diff --git a/packages/api-docs-builder-core/baseUi/generateApiLinks.ts b/packages/api-docs-builder-core/baseUi/generateApiLinks.ts
index 31ecd2feb32ee4..664d973f60ce6c 100644
--- a/packages/api-docs-builder-core/baseUi/generateApiLinks.ts
+++ b/packages/api-docs-builder-core/baseUi/generateApiLinks.ts
@@ -1,6 +1,5 @@
import kebabCase from 'lodash/kebabCase';
-import { ReactApi as ComponentReactApi } from '@mui-internal/api-docs-builder/ApiBuilders/ComponentApiBuilder';
-import { ReactApi as HookReactApi } from '@mui-internal/api-docs-builder/ApiBuilders/HookApiBuilder';
+import { ComponentReactApi, HookReactApi } from '@mui-internal/api-docs-builder';
/**
* Generates the api links, in a format that would point to the appropriate API tab
diff --git a/packages/api-docs-builder/ApiBuilders/ComponentApiBuilder.ts b/packages/api-docs-builder/ApiBuilders/ComponentApiBuilder.ts
index db2abf548a1630..c4279fd99407d8 100644
--- a/packages/api-docs-builder/ApiBuilders/ComponentApiBuilder.ts
+++ b/packages/api-docs-builder/ApiBuilders/ComponentApiBuilder.ts
@@ -8,12 +8,11 @@ import kebabCase from 'lodash/kebabCase';
import remark from 'remark';
import remarkVisit from 'unist-util-visit';
import type { Link } from 'mdast';
-import { defaultHandlers, parse as docgenParse, ReactDocgenApi } from 'react-docgen';
+import { defaultHandlers, parse as docgenParse } from 'react-docgen';
import { renderMarkdown } from '@mui/internal-markdown';
-import { ComponentClassDefinition } from '@mui/internal-docs-utils';
import { parse as parseDoctrine, Annotation } from 'doctrine';
import { ProjectSettings, SortingStrategiesType } from '../ProjectSettings';
-import { ComponentInfo, toGitHubPath, writePrettifiedFile } from '../buildApiUtils';
+import { toGitHubPath, writePrettifiedFile } from '../buildApiUtils';
import muiDefaultPropsHandler from '../utils/defaultPropsHandler';
import parseTest from '../utils/parseTest';
import generatePropTypeDescription, { getChained } from '../utils/generatePropTypeDescription';
@@ -23,90 +22,11 @@ import createDescribeableProp, {
} from '../utils/createDescribeableProp';
import generatePropDescription from '../utils/generatePropDescription';
import { TypeScriptProject } from '../utils/createTypeScriptProject';
-import parseSlotsAndClasses, { Slot } from '../utils/parseSlotsAndClasses';
+import parseSlotsAndClasses from '../utils/parseSlotsAndClasses';
import generateApiTranslations from '../utils/generateApiTranslation';
import { sortAlphabetical } from '../utils/sortObjects';
-
-export type AdditionalPropsInfo = {
- cssApi?: boolean;
- sx?: boolean;
- slotsApi?: boolean;
- 'joy-size'?: boolean;
- 'joy-color'?: boolean;
- 'joy-variant'?: boolean;
-};
-
-export type SeeMore = { description: string; link: { text: string; url: string } };
-
-export interface ReactApi extends ReactDocgenApi {
- demos: ReturnType;
- EOL: string;
- filename: string;
- apiPathname: string;
- forwardsRefTo: string | undefined;
- inheritance: ReturnType;
- /**
- * react component name
- * @example 'Accordion'
- */
- name: string;
- muiName: string;
- description: string;
- spread: boolean | undefined;
- /**
- * If `true`, the component supports theme default props customization.
- * If `null`, we couldn't infer this information.
- * If `undefined`, it's not applicable in this context, for example Base UI components.
- */
- themeDefaultProps: boolean | undefined | null;
- /**
- * result of path.readFileSync from the `filename` in utf-8
- */
- src: string;
- classes: ComponentClassDefinition[];
- slots: Slot[];
- propsTable: _.Dictionary<{
- default: string | undefined;
- required: boolean | undefined;
- type: { name: string | undefined; description: string | undefined };
- deprecated: true | undefined;
- deprecationInfo: string | undefined;
- signature: undefined | { type: string; describedArgs?: string[]; returned?: string };
- additionalInfo?: AdditionalPropsInfo;
- seeMoreLink?: SeeMore['link'];
- }>;
- /**
- * Different ways to import components
- */
- imports: string[];
- translations: {
- componentDescription: string;
- deprecationInfo: string | undefined;
- propDescriptions: {
- [key: string]: {
- description: string;
- requiresRef?: boolean;
- deprecated?: string;
- typeDescriptions?: { [t: string]: string };
- seeMoreText?: string;
- };
- };
- classDescriptions: {
- [key: string]: {
- description: string;
- conditions?: string;
- nodeName?: string;
- deprecationInfo?: string;
- };
- };
- slotDescriptions?: { [key: string]: string };
- };
- /**
- * The folder used to store the API translation.
- */
- apiDocsTranslationFolder?: string;
- deprecated: true | undefined;
-}
+import { AdditionalPropsInfo, ComponentReactApi } from '../types/ApiBuilder.types';
+import { Slot, ComponentInfo } from '../types/utils.types';
const cssComponents = ['Box', 'Grid', 'Typography', 'Stack'];
@@ -118,7 +38,7 @@ const cssComponents = ['Box', 'Grid', 'Typography', 'Stack'];
* this method.
*/
export async function computeApiDescription(
- api: { description: ReactApi['description'] },
+ api: { description: ComponentReactApi['description'] },
options: { host: string },
): Promise {
const { host } = options;
@@ -151,7 +71,7 @@ export async function computeApiDescription(
* * - [Icon API](https://mui.com/api/icon/)
*/
async function annotateComponentDefinition(
- api: ReactApi,
+ api: ComponentReactApi,
componentJsdoc: Annotation,
projectSettings: ProjectSettings,
) {
@@ -372,7 +292,7 @@ function extractClassCondition(description: string) {
const generateApiPage = async (
apiPagesDirectory: string,
importTranslationPagesDirectory: string,
- reactApi: ReactApi,
+ reactApi: ComponentReactApi,
sortingStrategies?: SortingStrategiesType,
onlyJsonFile: boolean = false,
layoutConfigPath: string = '',
@@ -471,11 +391,11 @@ const generateApiPage = async (
};
const attachTranslations = (
- reactApi: ReactApi,
+ reactApi: ComponentReactApi,
deprecationInfo: string | undefined,
settings?: CreateDescribeablePropSettings,
) => {
- const translations: ReactApi['translations'] = {
+ const translations: ComponentReactApi['translations'] = {
componentDescription: reactApi.description,
deprecationInfo: deprecationInfo ? renderMarkdown(deprecationInfo) : undefined,
propDescriptions: {},
@@ -539,10 +459,13 @@ const attachTranslations = (
reactApi.translations = translations;
};
-const attachPropsTable = (reactApi: ReactApi, settings?: CreateDescribeablePropSettings) => {
+const attachPropsTable = (
+ reactApi: ComponentReactApi,
+ settings?: CreateDescribeablePropSettings,
+) => {
const propErrors: Array<[propName: string, error: Error]> = [];
- type Pair = [string, ReactApi['propsTable'][string]];
- const componentProps: ReactApi['propsTable'] = _.fromPairs(
+ type Pair = [string, ComponentReactApi['propsTable'][string]];
+ const componentProps: ComponentReactApi['propsTable'] = _.fromPairs(
Object.entries(reactApi.props!).map(([propName, propDescriptor]): Pair => {
let prop: DescribeablePropDescriptor | null;
try {
@@ -599,7 +522,7 @@ const attachPropsTable = (reactApi: ReactApi, settings?: CreateDescribeablePropS
}
}
- let signature: ReactApi['propsTable'][string]['signature'];
+ let signature: ComponentReactApi['propsTable'][string]['signature'];
if (signatureType !== undefined) {
signature = {
type: signatureType,
@@ -699,7 +622,7 @@ export default async function generateComponentApi(
}
const filename = componentInfo.filename;
- let reactApi: ReactApi;
+ let reactApi: ComponentReactApi;
if (componentInfo.isSystemComponent) {
try {
diff --git a/packages/api-docs-builder/ApiBuilders/HookApiBuilder.ts b/packages/api-docs-builder/ApiBuilders/HookApiBuilder.ts
index a04cf42a19c112..e2555d53cb8896 100644
--- a/packages/api-docs-builder/ApiBuilders/HookApiBuilder.ts
+++ b/packages/api-docs-builder/ApiBuilders/HookApiBuilder.ts
@@ -1,11 +1,11 @@
import { readFileSync, writeFileSync } from 'fs';
import path from 'path';
-import * as ts from 'typescript';
+import { Symbol, isPropertySignature } from 'typescript';
import * as astTypes from 'ast-types';
import * as _ from 'lodash';
import * as babel from '@babel/core';
import traverse from '@babel/traverse';
-import { defaultHandlers, parse as docgenParse, ReactDocgenApi } from 'react-docgen';
+import { defaultHandlers, parse as docgenParse } from 'react-docgen';
import kebabCase from 'lodash/kebabCase';
import upperFirst from 'lodash/upperFirst';
import { parse as parseDoctrine, Annotation } from 'doctrine';
@@ -15,91 +15,26 @@ import { computeApiDescription } from './ComponentApiBuilder';
import {
getSymbolDescription,
getSymbolJSDocTags,
- HookInfo,
stringifySymbol,
toGitHubPath,
writePrettifiedFile,
} from '../buildApiUtils';
import { TypeScriptProject } from '../utils/createTypeScriptProject';
import generateApiTranslations from '../utils/generateApiTranslation';
-
-interface ParsedProperty {
- name: string;
- description: string;
- tags: { [tagName: string]: ts.JSDocTagInfo };
- required: boolean;
- typeStr: string;
-}
+import { HookReactApi, ParsedProperty } from '../types/ApiBuilder.types';
+import { HookInfo } from '../types/utils.types';
const parseProperty = async (
- propertySymbol: ts.Symbol,
+ propertySymbol: Symbol,
project: TypeScriptProject,
): Promise => ({
name: propertySymbol.name,
description: getSymbolDescription(propertySymbol, project),
tags: getSymbolJSDocTags(propertySymbol),
- required: !propertySymbol.declarations?.find(ts.isPropertySignature)?.questionToken,
+ required: !propertySymbol.declarations?.find(isPropertySignature)?.questionToken,
typeStr: await stringifySymbol(propertySymbol, project),
});
-export interface ReactApi extends ReactDocgenApi {
- demos: ReturnType;
- EOL: string;
- filename: string;
- apiPathname: string;
- parameters?: ParsedProperty[];
- returnValue?: ParsedProperty[];
- /**
- * hook name
- * @example 'useButton'
- */
- name: string;
- description: string;
- /**
- * Different ways to import components
- */
- imports: string[];
- /**
- * result of path.readFileSync from the `filename` in utf-8
- */
- src: string;
- parametersTable: _.Dictionary<{
- default: string | undefined;
- required: boolean | undefined;
- type: { name: string | undefined; description: string | undefined };
- deprecated: true | undefined;
- deprecationInfo: string | undefined;
- }>;
- returnValueTable: _.Dictionary<{
- default: string | undefined;
- required: boolean | undefined;
- type: { name: string | undefined; description: string | undefined };
- deprecated: true | undefined;
- deprecationInfo: string | undefined;
- }>;
- translations: {
- hookDescription: string;
- deprecationInfo: string | undefined;
- parametersDescriptions: {
- [key: string]: {
- description: string;
- deprecated?: string;
- };
- };
- returnValueDescriptions: {
- [key: string]: {
- description: string;
- deprecated?: string;
- };
- };
- };
- /**
- * The folder used to store the API translation.
- */
- apiDocsTranslationFolder?: string;
- deprecated: true | undefined;
-}
-
/**
* Add demos & API comment block to type definitions, e.g.:
* /**
@@ -112,7 +47,7 @@ export interface ReactApi extends ReactDocgenApi {
* * - [useButton API](https://mui.com/base-ui/api/use-button/)
*/
async function annotateHookDefinition(
- api: ReactApi,
+ api: HookReactApi,
hookJsdoc: Annotation,
projectSettings: ProjectSettings,
) {
@@ -308,12 +243,12 @@ async function annotateHookDefinition(
}
const attachTable = (
- reactApi: ReactApi,
+ reactApi: HookReactApi,
params: ParsedProperty[],
tableName: 'parametersTable' | 'returnValueTable',
) => {
const propErrors: Array<[propName: string, error: Error]> = [];
- const parameters: ReactApi[typeof tableName] = params
+ const parameters: HookReactApi[typeof tableName] = params
.map((p) => {
const { name: propName, ...propDescriptor } = p;
let prop: Omit | null;
@@ -355,7 +290,7 @@ const attachTable = (
},
};
})
- .reduce((acc, curr) => ({ ...acc, ...curr }), {}) as unknown as ReactApi['parametersTable'];
+ .reduce((acc, curr) => ({ ...acc, ...curr }), {}) as unknown as HookReactApi['parametersTable'];
if (propErrors.length > 0) {
throw new Error(
`There were errors creating prop descriptions:\n${propErrors
@@ -376,8 +311,8 @@ const generateTranslationDescription = (description: string) => {
return renderMarkdown(description.replace(/\n@default.*$/, ''));
};
-const attachTranslations = (reactApi: ReactApi, deprecationInfo: string | undefined) => {
- const translations: ReactApi['translations'] = {
+const attachTranslations = (reactApi: HookReactApi, deprecationInfo: string | undefined) => {
+ const translations: HookReactApi['translations'] = {
hookDescription: reactApi.description,
deprecationInfo: deprecationInfo ? renderMarkdown(deprecationInfo).trim() : undefined,
parametersDescriptions: {},
@@ -413,7 +348,7 @@ const attachTranslations = (reactApi: ReactApi, deprecationInfo: string | undefi
reactApi.translations = translations;
};
-const generateApiJson = async (outputDirectory: string, reactApi: ReactApi) => {
+const generateApiJson = async (outputDirectory: string, reactApi: HookReactApi) => {
/**
* Gather the metadata needed for the component's API page.
*/
@@ -543,7 +478,7 @@ export default async function generateHookApi(
return null;
}
- const reactApi: ReactApi = docgenParse(
+ const reactApi: HookReactApi = docgenParse(
src,
(ast) => {
let node;
diff --git a/packages/api-docs-builder/ProjectSettings.ts b/packages/api-docs-builder/ProjectSettings.ts
index 5f142dc1ad3db1..4844b59a7cc289 100644
--- a/packages/api-docs-builder/ProjectSettings.ts
+++ b/packages/api-docs-builder/ProjectSettings.ts
@@ -1,10 +1,8 @@
import { ComponentClassDefinition } from '@mui/internal-docs-utils';
-import { ComponentInfo, HookInfo } from './buildApiUtils';
import { CreateTypeScriptProjectOptions } from './utils/createTypeScriptProject';
import { CreateDescribeablePropSettings } from './utils/createDescribeableProp';
-import { ReactApi as ComponentReactApi } from './ApiBuilders/ComponentApiBuilder';
-import { ReactApi as HookReactApi } from './ApiBuilders/HookApiBuilder';
-import { Slot } from './utils/parseSlotsAndClasses';
+import { ComponentReactApi, HookReactApi } from './types/ApiBuilder.types';
+import { Slot, ComponentInfo, HookInfo } from './types/utils.types';
export type SortingStrategiesType = {
/**
diff --git a/packages/api-docs-builder/buildApi.ts b/packages/api-docs-builder/buildApi.ts
index 886b04f2e02f07..fd8d324599377b 100644
--- a/packages/api-docs-builder/buildApi.ts
+++ b/packages/api-docs-builder/buildApi.ts
@@ -4,9 +4,7 @@ import * as fse from 'fs-extra';
import findComponents from './utils/findComponents';
import findHooks from './utils/findHooks';
import { writePrettifiedFile } from './buildApiUtils';
-import generateComponentApi, {
- ReactApi as ComponentReactApi,
-} from './ApiBuilders/ComponentApiBuilder';
+import generateComponentApi from './ApiBuilders/ComponentApiBuilder';
import generateHookApi from './ApiBuilders/HookApiBuilder';
import {
CreateTypeScriptProjectOptions,
@@ -14,6 +12,7 @@ import {
createTypeScriptProjectBuilder,
} from './utils/createTypeScriptProject';
import { ProjectSettings } from './ProjectSettings';
+import { ComponentReactApi } from './types/ApiBuilder.types';
async function removeOutdatedApiDocsTranslations(
components: readonly ComponentReactApi[],
diff --git a/packages/api-docs-builder/buildApiUtils.ts b/packages/api-docs-builder/buildApiUtils.ts
index 726e47069ff899..0cdbe1ccf7c9a7 100644
--- a/packages/api-docs-builder/buildApiUtils.ts
+++ b/packages/api-docs-builder/buildApiUtils.ts
@@ -7,6 +7,8 @@ import { getLineFeed } from '@mui/internal-docs-utils';
import { replaceComponentLinks } from './utils/replaceUrl';
import { TypeScriptProject } from './utils/createTypeScriptProject';
+export type { ComponentInfo, HookInfo } from './types/utils.types';
+
/**
* TODO: this should really be fixed in findPagesMarkdown().
* Plus replaceComponentLinks() shouldn't exist in the first place,
@@ -105,70 +107,6 @@ export function parseFile(filename: string) {
};
}
-export type ComponentInfo = {
- /**
- * Full path to the source file.
- */
- filename: string;
- /**
- * Component name as imported in the docs, in the global MUI namespace.
- */
- name: string;
- /**
- * Component name with `Mui` prefix, in the global HTML page namespace.
- */
- muiName: string;
- /**
- * The name of the slots interface. By default we consider `${componentName}Slots`.
- */
- slotInterfaceName?: string;
- apiPathname: string;
- readFile: () => {
- src: string;
- spread: boolean;
- shouldSkip: boolean;
- EOL: string;
- inheritedComponent?: string;
- };
- getInheritance: (inheritedComponent?: string) => null | {
- /**
- * Component name
- */
- name: string;
- /**
- * API pathname
- */
- apiPathname: string;
- };
- getDemos: () => Array<{ demoPageTitle: string; demoPathname: string }>;
- apiPagesDirectory: string;
- /**
- * The path to import specific layout config of the page if needed.
- */
- layoutConfigPath?: string;
- skipApiGeneration?: boolean;
- /**
- * If `true`, the component's name match one of the MUI System components.
- */
- isSystemComponent?: boolean;
-};
-
-export type HookInfo = {
- /**
- * Full path to the source file.
- */
- filename: string;
- /**
- * Hook name as imported in the docs, in the global MUI namespace.
- */
- name: string;
- apiPathname: string;
- readFile: ComponentInfo['readFile'];
- getDemos: ComponentInfo['getDemos'];
- apiPagesDirectory: string;
- skipApiGeneration?: boolean;
-};
-
export function getApiPath(
demos: Array<{ demoPageTitle: string; demoPathname: string }>,
name: string,
diff --git a/packages/api-docs-builder/index.ts b/packages/api-docs-builder/index.ts
index 68dfc47dc79ad9..cef8251e51f4bf 100644
--- a/packages/api-docs-builder/index.ts
+++ b/packages/api-docs-builder/index.ts
@@ -1,2 +1,3 @@
export { buildApi } from './buildApi';
export type { ProjectSettings } from './ProjectSettings';
+export type { ComponentReactApi, HookReactApi } from './types/ApiBuilder.types';
diff --git a/packages/api-docs-builder/types/ApiBuilder.types.ts b/packages/api-docs-builder/types/ApiBuilder.types.ts
new file mode 100644
index 00000000000000..cd77289cde5777
--- /dev/null
+++ b/packages/api-docs-builder/types/ApiBuilder.types.ts
@@ -0,0 +1,138 @@
+import { ReactDocgenApi } from 'react-docgen';
+import { JSDocTagInfo } from 'typescript';
+import { ComponentClassDefinition } from '@mui/internal-docs-utils';
+import { ComponentInfo, Slot, HookInfo, SeeMore } from './utils.types';
+
+export type AdditionalPropsInfo = {
+ cssApi?: boolean;
+ sx?: boolean;
+ slotsApi?: boolean;
+ 'joy-size'?: boolean;
+ 'joy-color'?: boolean;
+ 'joy-variant'?: boolean;
+};
+
+/**
+ * Common interface for both Component and Hook API builders.
+ */
+interface CommonReactApi extends ReactDocgenApi {
+ demos: ReturnType;
+ EOL: string;
+ filename: string;
+ apiPathname: string;
+ description: string;
+ /**
+ * Different ways to import components
+ */
+ imports: string[];
+ /**
+ * result of path.readFileSync from the `filename` in utf-8
+ */
+ src: string;
+ /**
+ * The folder used to store the API translation.
+ */
+ apiDocsTranslationFolder?: string;
+ deprecated: true | undefined;
+}
+
+export interface ComponentReactApi extends CommonReactApi {
+ forwardsRefTo: string | undefined;
+ inheritance: ReturnType;
+ /**
+ * react component name
+ * @example 'Accordion'
+ */
+ name: string;
+ muiName: string;
+ spread: boolean | undefined;
+ /**
+ * If `true`, the component supports theme default props customization.
+ * If `null`, we couldn't infer this information.
+ * If `undefined`, it's not applicable in this context, for example Base UI components.
+ */
+ themeDefaultProps: boolean | undefined | null;
+ classes: ComponentClassDefinition[];
+ slots: Slot[];
+ propsTable: _.Dictionary<{
+ default: string | undefined;
+ required: boolean | undefined;
+ type: { name: string | undefined; description: string | undefined };
+ deprecated: true | undefined;
+ deprecationInfo: string | undefined;
+ signature: undefined | { type: string; describedArgs?: string[]; returned?: string };
+ additionalInfo?: AdditionalPropsInfo;
+ seeMoreLink?: SeeMore['link'];
+ }>;
+ translations: {
+ componentDescription: string;
+ deprecationInfo: string | undefined;
+ propDescriptions: {
+ [key: string]: {
+ description: string;
+ requiresRef?: boolean;
+ deprecated?: string;
+ typeDescriptions?: { [t: string]: string };
+ seeMoreText?: string;
+ };
+ };
+ classDescriptions: {
+ [key: string]: {
+ description: string;
+ conditions?: string;
+ nodeName?: string;
+ deprecationInfo?: string;
+ };
+ };
+ slotDescriptions?: { [key: string]: string };
+ };
+}
+
+export interface ParsedProperty {
+ name: string;
+ description: string;
+ tags: { [tagName: string]: JSDocTagInfo };
+ required: boolean;
+ typeStr: string;
+}
+
+export interface HookReactApi extends CommonReactApi {
+ parameters?: ParsedProperty[];
+ returnValue?: ParsedProperty[];
+ /**
+ * hook name
+ * @example 'useButton'
+ */
+ name: string;
+
+ parametersTable: _.Dictionary<{
+ default: string | undefined;
+ required: boolean | undefined;
+ type: { name: string | undefined; description: string | undefined };
+ deprecated: true | undefined;
+ deprecationInfo: string | undefined;
+ }>;
+ returnValueTable: _.Dictionary<{
+ default: string | undefined;
+ required: boolean | undefined;
+ type: { name: string | undefined; description: string | undefined };
+ deprecated: true | undefined;
+ deprecationInfo: string | undefined;
+ }>;
+ translations: {
+ hookDescription: string;
+ deprecationInfo: string | undefined;
+ parametersDescriptions: {
+ [key: string]: {
+ description: string;
+ deprecated?: string;
+ };
+ };
+ returnValueDescriptions: {
+ [key: string]: {
+ description: string;
+ deprecated?: string;
+ };
+ };
+ };
+}
diff --git a/packages/api-docs-builder/types/utils.types.ts b/packages/api-docs-builder/types/utils.types.ts
new file mode 100644
index 00000000000000..5af05c3cb52752
--- /dev/null
+++ b/packages/api-docs-builder/types/utils.types.ts
@@ -0,0 +1,72 @@
+export type SeeMore = { description: string; link: { text: string; url: string } };
+
+export interface Slot {
+ class: string | null;
+ name: string;
+ description: string;
+ default?: string;
+}
+
+export type ComponentInfo = {
+ /**
+ * Full path to the source file.
+ */
+ filename: string;
+ /**
+ * Component name as imported in the docs, in the global MUI namespace.
+ */
+ name: string;
+ /**
+ * Component name with `Mui` prefix, in the global HTML page namespace.
+ */
+ muiName: string;
+ /**
+ * The name of the slots interface. By default we consider `${componentName}Slots`.
+ */
+ slotInterfaceName?: string;
+ apiPathname: string;
+ readFile: () => {
+ src: string;
+ spread: boolean;
+ shouldSkip: boolean;
+ EOL: string;
+ inheritedComponent?: string;
+ };
+ getInheritance: (inheritedComponent?: string) => null | {
+ /**
+ * Component name
+ */
+ name: string;
+ /**
+ * API pathname
+ */
+ apiPathname: string;
+ };
+ getDemos: () => Array<{ demoPageTitle: string; demoPathname: string }>;
+ apiPagesDirectory: string;
+ /**
+ * The path to import specific layout config of the page if needed.
+ */
+ layoutConfigPath?: string;
+ skipApiGeneration?: boolean;
+ /**
+ * If `true`, the component's name match one of the MUI System components.
+ */
+ isSystemComponent?: boolean;
+};
+
+export type HookInfo = {
+ /**
+ * Full path to the source file.
+ */
+ filename: string;
+ /**
+ * Hook name as imported in the docs, in the global MUI namespace.
+ */
+ name: string;
+ apiPathname: string;
+ readFile: ComponentInfo['readFile'];
+ getDemos: ComponentInfo['getDemos'];
+ apiPagesDirectory: string;
+ skipApiGeneration?: boolean;
+};
diff --git a/packages/api-docs-builder/utils/generatePropDescription.ts b/packages/api-docs-builder/utils/generatePropDescription.ts
index 29a6f33010cb58..e8214e67f31d7e 100644
--- a/packages/api-docs-builder/utils/generatePropDescription.ts
+++ b/packages/api-docs-builder/utils/generatePropDescription.ts
@@ -7,7 +7,7 @@ import {
} from './generatePropTypeDescription';
import { DescribeablePropDescriptor } from './createDescribeableProp';
import escapeCell from './escapeCell';
-import { SeeMore } from '../ApiBuilders/ComponentApiBuilder';
+import { SeeMore } from '../types/utils.types';
function resolveType(type: NonNullable): string {
if (type.type === 'AllLiteral') {
diff --git a/packages/api-docs-builder/utils/parseSlotsAndClasses.ts b/packages/api-docs-builder/utils/parseSlotsAndClasses.ts
index 64a27b69b8dc4a..5379c8c7e3daf5 100644
--- a/packages/api-docs-builder/utils/parseSlotsAndClasses.ts
+++ b/packages/api-docs-builder/utils/parseSlotsAndClasses.ts
@@ -6,6 +6,7 @@ import { TypeScriptProject } from './createTypeScriptProject';
import { getPropsFromComponentNode } from './getPropsFromComponentNode';
import resolveExportSpecifier from './resolveExportSpecifier';
import { ProjectSettings } from '../ProjectSettings';
+import { Slot } from '../types/utils.types';
interface ClassInfo {
description: string;
@@ -13,13 +14,6 @@ interface ClassInfo {
deprecationInfo?: string;
}
-export interface Slot {
- class: string | null;
- name: string;
- description: string;
- default?: string;
-}
-
/**
* Gets the deprecation information for a given symbol.
* @param symbol - The TypeScript symbol.
From 4699194eb29c054be9515853efa9def6437183fa Mon Sep 17 00:00:00 2001
From: joe tats
Date: Wed, 26 Jun 2024 08:40:49 -0400
Subject: [PATCH 50/65] [material-ui] Fix quotes on font-family dedeclaration
in the Landing Page template theme (#42748)
Co-authored-by: zanivan
---
.../getting-started/templates/landing-page/getLPTheme.js | 2 +-
.../getting-started/templates/landing-page/getLPTheme.tsx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/data/material/getting-started/templates/landing-page/getLPTheme.js b/docs/data/material/getting-started/templates/landing-page/getLPTheme.js
index ee5fe72b1a3def..069d596eaef30f 100644
--- a/docs/data/material/getting-started/templates/landing-page/getLPTheme.js
+++ b/docs/data/material/getting-started/templates/landing-page/getLPTheme.js
@@ -146,7 +146,7 @@ const getDesignTokens = (mode) => ({
},
},
typography: {
- fontFamily: ['"Inter", "sans-serif"'].join(','),
+ fontFamily: ['Inter', 'sans-serif'].join(','),
h1: {
fontSize: customTheme.typography.pxToRem(60),
fontWeight: 600,
diff --git a/docs/data/material/getting-started/templates/landing-page/getLPTheme.tsx b/docs/data/material/getting-started/templates/landing-page/getLPTheme.tsx
index 9aede559b0d583..0354fc9a749004 100644
--- a/docs/data/material/getting-started/templates/landing-page/getLPTheme.tsx
+++ b/docs/data/material/getting-started/templates/landing-page/getLPTheme.tsx
@@ -165,7 +165,7 @@ const getDesignTokens = (mode: PaletteMode) => ({
},
},
typography: {
- fontFamily: ['"Inter", "sans-serif"'].join(','),
+ fontFamily: ['Inter', 'sans-serif'].join(','),
h1: {
fontSize: customTheme.typography.pxToRem(60),
fontWeight: 600,
From 53899d7fceffe8f7b925632a642f0bb16895c3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Wed, 26 Jun 2024 18:34:05 +0200
Subject: [PATCH 51/65] [test] Remove createMount test util (#42703)
---
.../test-utils/src/createMount.tsx | 136 -----------
.../src/findOutermostIntrinsic.test.js | 68 ------
.../test-utils/src/findOutermostIntrinsic.ts | 19 --
packages-internal/test-utils/src/index.ts | 2 -
packages/mui-base/src/Badge/Badge.test.tsx | 4 +-
packages/mui-base/src/Button/Button.test.tsx | 4 +-
.../src/FormControl/FormControl.test.tsx | 4 +-
packages/mui-base/src/Input/Input.test.tsx | 4 +-
packages/mui-base/src/Menu/Menu.test.tsx | 8 -
.../src/MenuButton/MenuButton.test.tsx | 9 +-
.../mui-base/src/MenuItem/MenuItem.test.tsx | 7 +-
packages/mui-base/src/Modal/Modal.test.tsx | 4 +-
packages/mui-base/src/Option/Option.test.tsx | 19 +-
.../src/OptionGroup/OptionGroup.test.tsx | 4 +-
packages/mui-base/src/Popper/Popper.test.tsx | 4 +-
packages/mui-base/src/Select/Select.test.tsx | 3 -
packages/mui-base/src/Slider/Slider.test.tsx | 4 +-
.../mui-base/src/Snackbar/Snackbar.test.tsx | 5 +-
packages/mui-base/src/Switch/Switch.test.tsx | 4 +-
packages/mui-base/src/Tab/Tab.test.tsx | 19 +-
.../mui-base/src/TabPanel/TabPanel.test.tsx | 7 +-
.../TablePagination/TablePagination.test.tsx | 13 +-
packages/mui-base/src/Tabs/Tabs.test.tsx | 4 +-
.../mui-base/src/TabsList/TabsList.test.tsx | 19 +-
.../TextareaAutosize.test.tsx | 11 +-
.../Unstable_NumberInput/NumberInput.test.tsx | 4 +-
.../src/Unstable_Popup/Popup.test.tsx | 4 +-
packages/mui-joy/src/Table/Table.test.tsx | 1 -
packages/mui-material/src/Menu/Menu.test.js | 36 ++-
.../mui-material/src/Popover/Popover.test.js | 61 +++--
.../src/StylesProvider/StylesProvider.test.js | 53 +++--
.../src/makeStyles/makeStyles.test.js | 215 +++++++++---------
32 files changed, 202 insertions(+), 557 deletions(-)
delete mode 100644 packages-internal/test-utils/src/createMount.tsx
delete mode 100644 packages-internal/test-utils/src/findOutermostIntrinsic.test.js
delete mode 100644 packages-internal/test-utils/src/findOutermostIntrinsic.ts
diff --git a/packages-internal/test-utils/src/createMount.tsx b/packages-internal/test-utils/src/createMount.tsx
deleted file mode 100644
index f690f03a7bb327..00000000000000
--- a/packages-internal/test-utils/src/createMount.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-/* eslint-env mocha */
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import * as ReactDOMTestUtils from 'react-dom/test-utils';
-import { Test, Suite } from 'mocha';
-import { mount as enzymeMount, MountRendererProps } from 'enzyme';
-
-interface ModeProps {
- /**
- * this is essentially children. However, we can't use children because then
- * using `wrapper.setProps({ children })` would work differently if this component
- * would be the root.
- */
- __element: React.ReactElement;
- __strict: boolean;
-}
-
-/**
- * Can't just mount {node}
- * because that swallows wrapper.setProps
- *
- * why class component:
- * https://github.com/airbnb/enzyme/issues/2043
- */
-// eslint-disable-next-line react/prefer-stateless-function
-class Mode extends React.Component {
- render() {
- // Excess props will come from e.g. enzyme setProps
- // eslint-disable-next-line @typescript-eslint/naming-convention
- const { __element, __strict, ...other } = this.props;
- const Component = __strict ? React.StrictMode : React.Fragment;
-
- return {React.cloneElement(__element, other)} ;
- }
-}
-
-interface CreateMountOptions extends MountRendererProps {
- mount?: typeof enzymeMount;
- strict?: boolean;
-}
-// Generate an enhanced mount function.
-export default function createMount(options: CreateMountOptions = {}) {
- const { mount = enzymeMount, strict: globalStrict = true, ...globalEnzymeOptions } = options;
-
- let container: HTMLElement | null = null;
-
- function computeTestName(test: Test | undefined) {
- let current: Test | Suite | undefined = test;
- const titles: string[] = [];
- while (current != null) {
- titles.push(current.title);
- current = current.parent;
- }
-
- return titles.filter(Boolean).reverse().join(' -> ');
- }
-
- // save stack to re-use in test-hooks
- const { stack: createMountStack } = new Error();
-
- /**
- * Flag whether `createMount` was called in a suite i.e. describe() block.
- * For legacy reasons `createMount` might accidentally be called in a before(Each) hook.
- */
- let wasCalledInSuite = false;
- before(() => {
- wasCalledInSuite = true;
- });
-
- beforeEach(() => {
- if (!wasCalledInSuite) {
- const error = new Error(
- 'Unable to run `before` hook for `createMount`. This usually indicates that `createMount` was called in a `before` hook instead of in a `describe()` block.',
- );
- error.stack = createMountStack;
- throw error;
- }
- });
-
- beforeEach(function beforeEachMountTest() {
- container = document.createElement('div');
- container.setAttribute('data-test', computeTestName(this.currentTest));
- document.body.insertBefore(container, document.body.firstChild);
- });
-
- afterEach(() => {
- ReactDOMTestUtils.act(() => {
- // eslint-disable-next-line react/no-deprecated
- ReactDOM.unmountComponentAtNode(container!);
- });
- container!.parentElement!.removeChild(container!);
- container = null;
- });
-
- const mountWithContext = function mountWithContext(
- node: React.ReactElement,
- localOptions: Omit = {},
- ) {
- const { strict = globalStrict, ...localEnzymeOptions } = localOptions;
-
- if (container === null) {
- throw new Error(
- `Tried to mount without setup. Mounting inside before() is not allowed. Try mounting in beforeEach or better: in each test`,
- );
- }
- ReactDOMTestUtils.act(() => {
- // eslint-disable-next-line react/no-deprecated
- ReactDOM.unmountComponentAtNode(container!);
- });
-
- // some tests require that no other components are in the tree
- // for example when doing .instance(), .state() etc.
- const wrapper = mount(
- strict == null ? node : ,
- {
- attachTo: container,
- ...globalEnzymeOptions,
- ...localEnzymeOptions,
- },
- );
- const originalUnmount = wrapper.unmount;
-
- wrapper.unmount = () => {
- // flush effect cleanup functions
- ReactDOMTestUtils.act(() => {
- originalUnmount.call(wrapper);
- });
-
- return wrapper;
- };
-
- return wrapper;
- };
-
- return mountWithContext;
-}
diff --git a/packages-internal/test-utils/src/findOutermostIntrinsic.test.js b/packages-internal/test-utils/src/findOutermostIntrinsic.test.js
deleted file mode 100644
index f5d9b21e4c6cb6..00000000000000
--- a/packages-internal/test-utils/src/findOutermostIntrinsic.test.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import * as React from 'react';
-import { expect } from 'chai';
-import createMount from './createMount';
-import findOutermostIntrinsic from './findOutermostIntrinsic';
-
-describe('findOutermostIntrinsic', () => {
- const mount = createMount({ strict: null });
- const expectIntrinsic = (node, expected) => {
- const wrapper = mount(node);
- const outermostIntrinsic = findOutermostIntrinsic(wrapper);
-
- if (expected === null) {
- expect(outermostIntrinsic.exists()).to.equal(false);
- } else {
- expect(outermostIntrinsic.type()).to.equal(expected);
- expect(outermostIntrinsic.type()).to.equal(
- outermostIntrinsic.getDOMNode().nodeName.toLowerCase(),
- );
- }
- };
- const Headless = ({ children }) => children;
-
- it('returns immediate DOM nodes', () => {
- expectIntrinsic(Hello, World!
, 'div');
- });
-
- it('only returns the outermost', () => {
- expectIntrinsic(
-
- Hello, World!
- ,
- 'span',
- );
- });
-
- it('ignores components', () => {
- expectIntrinsic(
-
- Hello, World!
- ,
- 'div',
- );
- expectIntrinsic(
-
-
- Hello, World!
-
- ,
- 'div',
- );
- expectIntrinsic(
-
-
-
-
- Hello, World!
-
-
-
- ,
- 'div',
- );
- });
-
- it('can handle that no DOM node is rendered', () => {
- expectIntrinsic({false && } , null);
- });
-});
diff --git a/packages-internal/test-utils/src/findOutermostIntrinsic.ts b/packages-internal/test-utils/src/findOutermostIntrinsic.ts
deleted file mode 100644
index ed1c1372d9bd39..00000000000000
--- a/packages-internal/test-utils/src/findOutermostIntrinsic.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { ReactWrapper } from 'enzyme';
-
-/**
- * checks if a given react wrapper wraps an intrinsic element i.e. a DOM node
- * @param {import('enzyme').ReactWrapper} reactWrapper
- * @returns {boolean} true if the given reactWrapper wraps an intrinsic element
- */
-export function wrapsIntrinsicElement(reactWrapper: ReactWrapper): boolean {
- return typeof reactWrapper.type() === 'string';
-}
-
-/**
- * like ReactWrapper#getDOMNode() but returns a ReactWrapper
- * @param {import('enzyme').ReactWrapper} reactWrapper
- * @returns {import('enzyme').ReactWrapper} the wrapper for the outermost DOM node
- */
-export default function findOutermostIntrinsic(reactWrapper: ReactWrapper): ReactWrapper {
- return reactWrapper.findWhere((n) => n.exists() && wrapsIntrinsicElement(n)).first();
-}
diff --git a/packages-internal/test-utils/src/index.ts b/packages-internal/test-utils/src/index.ts
index 6f0e1527448056..e80fc539833170 100644
--- a/packages-internal/test-utils/src/index.ts
+++ b/packages-internal/test-utils/src/index.ts
@@ -5,8 +5,6 @@ export { default as describeConformance } from './describeConformance';
export * from './describeConformance';
export { default as createDescribe } from './createDescribe';
export * from './createRenderer';
-export { default as createMount } from './createMount';
-export { default as findOutermostIntrinsic, wrapsIntrinsicElement } from './findOutermostIntrinsic';
export {
default as focusVisible,
simulatePointerDevice,
diff --git a/packages/mui-base/src/Badge/Badge.test.tsx b/packages/mui-base/src/Badge/Badge.test.tsx
index 57a1e60771a831..2d81bc5290296d 100644
--- a/packages/mui-base/src/Badge/Badge.test.tsx
+++ b/packages/mui-base/src/Badge/Badge.test.tsx
@@ -1,11 +1,10 @@
import * as React from 'react';
-import { createRenderer, createMount } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { Badge, badgeClasses as classes } from '@mui/base/Badge';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
const { render } = createRenderer();
- const mount = createMount();
describeConformanceUnstyled(
@@ -15,7 +14,6 @@ describe(' ', () => {
classes,
inheritComponent: 'span',
render,
- mount,
refInstanceof: window.HTMLSpanElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/Button/Button.test.tsx b/packages/mui-base/src/Button/Button.test.tsx
index 5c47b422cf2c4b..95a89a1d7d7d08 100644
--- a/packages/mui-base/src/Button/Button.test.tsx
+++ b/packages/mui-base/src/Button/Button.test.tsx
@@ -1,18 +1,16 @@
import * as React from 'react';
-import { act, createMount, createRenderer, fireEvent } from '@mui/internal-test-utils';
+import { act, createRenderer, fireEvent } from '@mui/internal-test-utils';
import { expect } from 'chai';
import { spy } from 'sinon';
import { Button, buttonClasses } from '@mui/base/Button';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render, renderToString } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'button',
render,
- mount,
refInstanceof: window.HTMLButtonElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/FormControl/FormControl.test.tsx b/packages/mui-base/src/FormControl/FormControl.test.tsx
index 07d68dd4ed5775..8e911e759bfa4d 100644
--- a/packages/mui-base/src/FormControl/FormControl.test.tsx
+++ b/packages/mui-base/src/FormControl/FormControl.test.tsx
@@ -1,18 +1,16 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { createMount, createRenderer, fireEvent } from '@mui/internal-test-utils';
+import { createRenderer, fireEvent } from '@mui/internal-test-utils';
import { FormControl, formControlClasses, useFormControlContext } from '@mui/base/FormControl';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/Input/Input.test.tsx b/packages/mui-base/src/Input/Input.test.tsx
index cd1031e0239323..bf1c61209f31ff 100644
--- a/packages/mui-base/src/Input/Input.test.tsx
+++ b/packages/mui-base/src/Input/Input.test.tsx
@@ -1,19 +1,17 @@
import * as React from 'react';
import PropTypes from 'prop-types';
-import { createMount, createRenderer, fireEvent, screen, act } from '@mui/internal-test-utils';
+import { createRenderer, fireEvent, screen, act } from '@mui/internal-test-utils';
import { expect } from 'chai';
import { spy } from 'sinon';
import { Input, inputClasses, InputOwnerState } from '@mui/base/Input';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/Menu/Menu.test.tsx b/packages/mui-base/src/Menu/Menu.test.tsx
index 325e1b601062c3..5d25dda325e20d 100644
--- a/packages/mui-base/src/Menu/Menu.test.tsx
+++ b/packages/mui-base/src/Menu/Menu.test.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import {
- createMount,
createRenderer,
fireEvent,
act,
@@ -27,7 +26,6 @@ const testContext: DropdownContextValue = {
};
describe(' ', () => {
- const mount = createMount();
const { render: internalRender } = createRenderer();
async function render(
@@ -46,12 +44,6 @@ describe(' ', () => {
{node} ,
);
},
- mount: (node: React.ReactNode) => {
- const wrapper = mount(
- {node} ,
- );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLDivElement,
slots: {
root: {
diff --git a/packages/mui-base/src/MenuButton/MenuButton.test.tsx b/packages/mui-base/src/MenuButton/MenuButton.test.tsx
index fac3364dbcc5c9..26658177f8fc9d 100644
--- a/packages/mui-base/src/MenuButton/MenuButton.test.tsx
+++ b/packages/mui-base/src/MenuButton/MenuButton.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import userEvent from '@testing-library/user-event';
-import { act, createMount, createRenderer } from '@mui/internal-test-utils';
+import { act, createRenderer } from '@mui/internal-test-utils';
import { MenuButton, menuButtonClasses } from '@mui/base/MenuButton';
import { DropdownContext, DropdownContextValue, DropdownActionTypes } from '@mui/base/useDropdown';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
@@ -21,7 +21,6 @@ const testContext: DropdownContextValue = {
};
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
@@ -31,12 +30,6 @@ describe(' ', () => {
{node} ,
);
},
- mount: (node: React.ReactNode) => {
- const wrapper = mount(
- {node} ,
- );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLButtonElement,
slots: {
root: {
diff --git a/packages/mui-base/src/MenuItem/MenuItem.test.tsx b/packages/mui-base/src/MenuItem/MenuItem.test.tsx
index a60f727c3a87ad..3f3efa09059d80 100644
--- a/packages/mui-base/src/MenuItem/MenuItem.test.tsx
+++ b/packages/mui-base/src/MenuItem/MenuItem.test.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { MenuItem, menuItemClasses } from '@mui/base/MenuItem';
import { MenuProvider } from '@mui/base/useMenu';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
@@ -23,7 +23,6 @@ const testContext = {
};
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
@@ -31,10 +30,6 @@ describe(' ', () => {
render: (node) => {
return render({node} );
},
- mount: (node: React.ReactNode) => {
- const wrapper = mount({node} );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLLIElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/Modal/Modal.test.tsx b/packages/mui-base/src/Modal/Modal.test.tsx
index feecda642f5c20..c1f1bff8348230 100644
--- a/packages/mui-base/src/Modal/Modal.test.tsx
+++ b/packages/mui-base/src/Modal/Modal.test.tsx
@@ -1,11 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { Modal, modalClasses as classes, ModalRootSlotProps } from '@mui/base/Modal';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
let savedBodyStyle: CSSStyleDeclaration;
@@ -24,7 +23,6 @@ describe(' ', () => {
() => ({
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
slots: {
root: {
diff --git a/packages/mui-base/src/Option/Option.test.tsx b/packages/mui-base/src/Option/Option.test.tsx
index b3f326d22a26d3..36eae126b0cc04 100644
--- a/packages/mui-base/src/Option/Option.test.tsx
+++ b/packages/mui-base/src/Option/Option.test.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { Option, optionClasses } from '@mui/base/Option';
import { SelectProvider } from '../useSelect/SelectProvider';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
@@ -12,7 +12,6 @@ const dummyGetItemState = () => ({
});
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
@@ -32,22 +31,6 @@ describe(' ', () => {
,
);
},
- mount: (node: React.ReactNode) => {
- const wrapper = mount(
- {},
- getItemIndex: () => 0,
- getItemState: dummyGetItemState,
- registerItem: () => ({ id: 0, deregister: () => {} }),
- totalSubitemCount: 0,
- }}
- >
- {node}
- ,
- );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLLIElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/OptionGroup/OptionGroup.test.tsx b/packages/mui-base/src/OptionGroup/OptionGroup.test.tsx
index f242b7830fb248..bd50b055fe7814 100644
--- a/packages/mui-base/src/OptionGroup/OptionGroup.test.tsx
+++ b/packages/mui-base/src/OptionGroup/OptionGroup.test.tsx
@@ -1,16 +1,14 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { OptionGroup, optionGroupClasses } from '@mui/base/OptionGroup';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'li',
render,
- mount,
refInstanceof: window.HTMLLIElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/Popper/Popper.test.tsx b/packages/mui-base/src/Popper/Popper.test.tsx
index f9332c71120dcb..37c7d95c8fe940 100644
--- a/packages/mui-base/src/Popper/Popper.test.tsx
+++ b/packages/mui-base/src/Popper/Popper.test.tsx
@@ -1,12 +1,11 @@
import * as React from 'react';
import { expect } from 'chai';
-import { createRenderer, createMount, screen } from '@mui/internal-test-utils';
+import { createRenderer, screen } from '@mui/internal-test-utils';
import { Popper, popperClasses } from '@mui/base/Popper';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
const { render } = createRenderer();
- const mount = createMount();
const defaultProps = {
anchorEl: () => document.createElement('svg'),
@@ -17,7 +16,6 @@ describe(' ', () => {
describeConformanceUnstyled( , () => ({
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
skip: [
// https://github.com/facebook/react/issues/11565
diff --git a/packages/mui-base/src/Select/Select.test.tsx b/packages/mui-base/src/Select/Select.test.tsx
index d3ec34e600d7c0..0a841aeda2a0ca 100644
--- a/packages/mui-base/src/Select/Select.test.tsx
+++ b/packages/mui-base/src/Select/Select.test.tsx
@@ -2,7 +2,6 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import {
- createMount,
createRenderer,
fireEvent,
act,
@@ -23,7 +22,6 @@ import { describeConformanceUnstyled } from '../../test/describeConformanceUnsty
// userEvent.setup() requires Safari 14 or up to work
describe(' ', () => {
- const mount = createMount();
const { render: internalRender } = createRenderer();
async function render(
@@ -46,7 +44,6 @@ describe(' ', () => {
describeConformanceUnstyled(componentToTest, () => ({
inheritComponent: 'button',
render,
- mount,
refInstanceof: window.HTMLButtonElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/Slider/Slider.test.tsx b/packages/mui-base/src/Slider/Slider.test.tsx
index 0c426a2544f2b1..65355693a559da 100644
--- a/packages/mui-base/src/Slider/Slider.test.tsx
+++ b/packages/mui-base/src/Slider/Slider.test.tsx
@@ -1,7 +1,7 @@
import { expect } from 'chai';
import * as React from 'react';
import { spy, stub } from 'sinon';
-import { act, createRenderer, createMount, fireEvent, screen } from '@mui/internal-test-utils';
+import { act, createRenderer, fireEvent, screen } from '@mui/internal-test-utils';
import {
Slider,
sliderClasses as classes,
@@ -31,14 +31,12 @@ describe(' ', () => {
}
});
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
classes,
inheritComponent: 'span',
render,
- mount,
refInstanceof: window.HTMLSpanElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/Snackbar/Snackbar.test.tsx b/packages/mui-base/src/Snackbar/Snackbar.test.tsx
index 70c147c8fd3af1..30746b3d31ded9 100644
--- a/packages/mui-base/src/Snackbar/Snackbar.test.tsx
+++ b/packages/mui-base/src/Snackbar/Snackbar.test.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { act, createRenderer, createMount, fireEvent } from '@mui/internal-test-utils';
+import { act, createRenderer, fireEvent } from '@mui/internal-test-utils';
import { Snackbar, snackbarClasses as classes } from '@mui/base/Snackbar';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
@@ -23,8 +23,6 @@ describe(' ', () => {
return result;
}
- const mount = createMount();
-
describeConformanceUnstyled(
@@ -33,7 +31,6 @@ describe(' ', () => {
classes,
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
slots: {
root: {
diff --git a/packages/mui-base/src/Switch/Switch.test.tsx b/packages/mui-base/src/Switch/Switch.test.tsx
index 7ebe7e669e50ae..13ab4ac130ccae 100644
--- a/packages/mui-base/src/Switch/Switch.test.tsx
+++ b/packages/mui-base/src/Switch/Switch.test.tsx
@@ -1,17 +1,15 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { expect } from 'chai';
import { Switch, SwitchOwnerState, switchClasses } from '@mui/base/Switch';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'span',
render,
- mount,
refInstanceof: window.HTMLSpanElement,
testComponentPropWith: 'span',
slots: {
diff --git a/packages/mui-base/src/Tab/Tab.test.tsx b/packages/mui-base/src/Tab/Tab.test.tsx
index 97cc23fda2bc0b..9fefbeba650727 100644
--- a/packages/mui-base/src/Tab/Tab.test.tsx
+++ b/packages/mui-base/src/Tab/Tab.test.tsx
@@ -1,12 +1,11 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { Tab, tabClasses } from '@mui/base/Tab';
import { TabsListProvider, TabsListProviderValue } from '../useTabsList';
import { TabsContext } from '../Tabs';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
const testTabsListContext: TabsListProviderValue = {
@@ -38,22 +37,6 @@ describe(' ', () => {
return { container, ...other };
},
- mount: (node: any) => {
- const wrapper = mount(
- '',
- getTabPanelId: () => '',
- }}
- >
- {node}
- ,
- );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLButtonElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/TabPanel/TabPanel.test.tsx b/packages/mui-base/src/TabPanel/TabPanel.test.tsx
index 7d37cb6adee3ef..ab6caafd1d6978 100644
--- a/packages/mui-base/src/TabPanel/TabPanel.test.tsx
+++ b/packages/mui-base/src/TabPanel/TabPanel.test.tsx
@@ -1,11 +1,10 @@
import * as React from 'react';
-import { createMount, createRenderer } from '@mui/internal-test-utils';
+import { createRenderer } from '@mui/internal-test-utils';
import { TabPanel, tabPanelClasses } from '@mui/base/TabPanel';
import { TabsProvider, TabsProviderValue } from '../useTabs';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
const tabsProviderDefaultValue: TabsProviderValue = {
@@ -31,10 +30,6 @@ describe(' ', () => {
return { container, ...other };
},
- mount: (node: any) => {
- const wrapper = mount({node} );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/TablePagination/TablePagination.test.tsx b/packages/mui-base/src/TablePagination/TablePagination.test.tsx
index 0d0c32a88948df..b8be82fdbf7fa4 100644
--- a/packages/mui-base/src/TablePagination/TablePagination.test.tsx
+++ b/packages/mui-base/src/TablePagination/TablePagination.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import PropTypes from 'prop-types';
-import { fireEvent, createRenderer, createMount } from '@mui/internal-test-utils';
+import { fireEvent, createRenderer } from '@mui/internal-test-utils';
import {
TablePagination,
tablePaginationClasses as classes,
@@ -17,7 +17,6 @@ interface WithClassName {
describe(' ', () => {
const noop = () => {};
const { render } = createRenderer();
- const mount = createMount();
const CustomRootComponent = React.forwardRef(
({ className }: WithClassName, ref: React.Ref) => (
@@ -42,16 +41,6 @@ describe(' ', () => {
...other,
};
},
- mount: (node: any) => {
- const wrapper = mount(
- ,
- );
- return wrapper.find('tr').childAt(0);
- },
refInstanceof: window.HTMLTableCellElement,
testComponentPropWith: 'th',
slots: {
diff --git a/packages/mui-base/src/Tabs/Tabs.test.tsx b/packages/mui-base/src/Tabs/Tabs.test.tsx
index f75b9a75e49f51..c0ad7c5fdcaf8b 100644
--- a/packages/mui-base/src/Tabs/Tabs.test.tsx
+++ b/packages/mui-base/src/Tabs/Tabs.test.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
-import { act, createRenderer, fireEvent, screen, createMount } from '@mui/internal-test-utils';
+import { act, createRenderer, fireEvent, screen } from '@mui/internal-test-utils';
import { Tab } from '@mui/base/Tab';
import { Tabs, tabsClasses as classes, TabsProps } from '@mui/base/Tabs';
import { TabsList } from '@mui/base/TabsList';
@@ -9,7 +9,6 @@ import { TabPanel } from '@mui/base/TabPanel';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
before(function beforeHook() {
@@ -28,7 +27,6 @@ describe(' ', () => {
classes,
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'header',
slots: {
diff --git a/packages/mui-base/src/TabsList/TabsList.test.tsx b/packages/mui-base/src/TabsList/TabsList.test.tsx
index f32487522d9486..fc0e8d092909c4 100644
--- a/packages/mui-base/src/TabsList/TabsList.test.tsx
+++ b/packages/mui-base/src/TabsList/TabsList.test.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import { act, createMount, createRenderer } from '@mui/internal-test-utils';
+import { act, createRenderer } from '@mui/internal-test-utils';
import { Tab } from '@mui/base/Tab';
import { Tabs, TabsContext } from '@mui/base/Tabs';
import { TabsList, tabsListClasses } from '@mui/base/TabsList';
@@ -8,7 +8,6 @@ import { describeConformanceUnstyled } from '../../test/describeConformanceUnsty
describe(' ', () => {
const { render } = createRenderer();
- const mount = createMount();
describeConformanceUnstyled( , () => ({
inheritComponent: 'div',
@@ -29,22 +28,6 @@ describe(' ', () => {
return { container, ...other };
},
- mount: (node: any) => {
- const wrapper = mount(
- {},
- registerTabIdLookup() {},
- getTabId: () => '',
- getTabPanelId: () => '',
- }}
- >
- {node}
- ,
- );
- return wrapper.childAt(0);
- },
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/TextareaAutosize/TextareaAutosize.test.tsx b/packages/mui-base/src/TextareaAutosize/TextareaAutosize.test.tsx
index 696f4821833fe3..d2645e3a662b70 100644
--- a/packages/mui-base/src/TextareaAutosize/TextareaAutosize.test.tsx
+++ b/packages/mui-base/src/TextareaAutosize/TextareaAutosize.test.tsx
@@ -1,14 +1,7 @@
import * as React from 'react';
import { expect } from 'chai';
import sinon, { spy, stub } from 'sinon';
-import {
- act,
- screen,
- waitFor,
- createMount,
- createRenderer,
- fireEvent,
-} from '@mui/internal-test-utils';
+import { act, screen, waitFor, createRenderer, fireEvent } from '@mui/internal-test-utils';
import { TextareaAutosize } from '@mui/base/TextareaAutosize';
import { describeConformanceUnstyled } from '../../test/describeConformanceUnstyled';
@@ -41,11 +34,9 @@ async function raf() {
describe(' ', () => {
const { clock, render } = createRenderer();
- const mount = createMount();
describeConformanceUnstyled( , () => ({
render,
- mount,
inheritComponent: 'textarea',
refInstanceof: window.HTMLTextAreaElement,
slots: {},
diff --git a/packages/mui-base/src/Unstable_NumberInput/NumberInput.test.tsx b/packages/mui-base/src/Unstable_NumberInput/NumberInput.test.tsx
index 99687a3571df0d..5f3b0fc32b4604 100644
--- a/packages/mui-base/src/Unstable_NumberInput/NumberInput.test.tsx
+++ b/packages/mui-base/src/Unstable_NumberInput/NumberInput.test.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
import { expect } from 'chai';
import { spy } from 'sinon';
import userEvent from '@testing-library/user-event';
-import { act, createMount, createRenderer, fireEvent } from '@mui/internal-test-utils';
+import { act, createRenderer, fireEvent } from '@mui/internal-test-utils';
import {
Unstable_NumberInput as NumberInput,
numberInputClasses,
@@ -17,13 +17,11 @@ import { describeConformanceUnstyled } from '../../test/describeConformanceUnsty
// userEvent.setup() requires Safari 14 or up to work
describe(' ', () => {
- const mount = createMount();
const { render } = createRenderer();
describeConformanceUnstyled( , () => ({
inheritComponent: 'div',
render,
- mount,
refInstanceof: window.HTMLDivElement,
testComponentPropWith: 'div',
slots: {
diff --git a/packages/mui-base/src/Unstable_Popup/Popup.test.tsx b/packages/mui-base/src/Unstable_Popup/Popup.test.tsx
index a44782ec2105c1..6f1047845b6448 100644
--- a/packages/mui-base/src/Unstable_Popup/Popup.test.tsx
+++ b/packages/mui-base/src/Unstable_Popup/Popup.test.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
import { expect } from 'chai';
-import { act, createRenderer, createMount, screen, fireEvent } from '@mui/internal-test-utils';
+import { act, createRenderer, screen, fireEvent } from '@mui/internal-test-utils';
import { Unstable_Popup as Popup, popupClasses, PopupProps } from '@mui/base/Unstable_Popup';
import { PopupContext } from './PopupContext';
import { useTransitionStateManager } from '../useTransition';
@@ -34,7 +34,6 @@ function FakeTransition(props: React.PropsWithChildren<{}>) {
describe(' ', () => {
const { clock, render } = createRenderer();
- const mount = createMount();
// https://floating-ui.com/docs/react#testing
async function waitForPosition() {
@@ -58,7 +57,6 @@ describe(' ', () => {
return result;
},
- mount,
refInstanceof: window.HTMLDivElement,
skip: [
// https://github.com/facebook/react/issues/11565
diff --git a/packages/mui-joy/src/Table/Table.test.tsx b/packages/mui-joy/src/Table/Table.test.tsx
index 6fa3b341f772cc..66456b2bb14b36 100644
--- a/packages/mui-joy/src/Table/Table.test.tsx
+++ b/packages/mui-joy/src/Table/Table.test.tsx
@@ -22,7 +22,6 @@ describe('', () => {
skip: [
'classesRoot',
'componentsProp',
- // Emotion `compat` is not set with `createMount` for these tests
'componentProp',
'mergeClassName',
'propsSpread',
diff --git a/packages/mui-material/src/Menu/Menu.test.js b/packages/mui-material/src/Menu/Menu.test.js
index ef7aa46172dd12..660aa3fef9099a 100644
--- a/packages/mui-material/src/Menu/Menu.test.js
+++ b/packages/mui-material/src/Menu/Menu.test.js
@@ -3,7 +3,6 @@ import { spy } from 'sinon';
import { expect } from 'chai';
import {
createRenderer,
- createMount,
screen,
fireEvent,
strictModeDoubleLoggingSuppressed,
@@ -11,12 +10,11 @@ import {
import Menu, { menuClasses as classes } from '@mui/material/Menu';
import Popover from '@mui/material/Popover';
import { createTheme, ThemeProvider } from '@mui/material/styles';
-import { MenuPaper } from './Menu';
import describeConformance from '../../test/describeConformance';
+import { paperClasses } from '../Paper';
describe(' ', () => {
const { render } = createRenderer({ clock: 'fake' });
- const mount = createMount();
describeConformance( document.createElement('div')} open />, () => ({
classes,
@@ -141,8 +139,9 @@ describe(' ', () => {
describe('prop: PaperProps', () => {
it('should be passed to the paper component', () => {
const customElevation = 12;
- const customClasses = { rounded: { borderRadius: 12 } };
- const wrapper = mount(
+ const customClasses = { rounded: 'custom-rounded' };
+
+ render(
', () => {
/>,
);
- expect(wrapper.find(MenuPaper).props().elevation).to.equal(customElevation);
- expect(wrapper.find(MenuPaper).props().classes).to.contain(customClasses);
+ expect(screen.getByTestId('paper')).to.have.class(paperClasses.elevation12);
+ expect(screen.getByTestId('paper')).to.have.class(customClasses.rounded);
});
});
@@ -381,27 +380,20 @@ describe(' ', () => {
});
});
- describe('paper', () => {
- it('should use MenuPaper component', () => {
- const wrapper = mount(
-
-
- ,
- );
-
- expect(wrapper.find(MenuPaper)).to.have.length(1);
- });
- });
-
describe('slots', () => {
it('should merge slots with existing values', () => {
- const wrapper = mount(
-
+ render(
+
,
);
- expect(wrapper.find(MenuPaper)).to.have.length(1);
+ expect(screen.getByTestId('paper')).to.have.length(1);
});
});
});
diff --git a/packages/mui-material/src/Popover/Popover.test.js b/packages/mui-material/src/Popover/Popover.test.js
index 914c6163c3837c..3067fd251436a5 100644
--- a/packages/mui-material/src/Popover/Popover.test.js
+++ b/packages/mui-material/src/Popover/Popover.test.js
@@ -1,11 +1,10 @@
import * as React from 'react';
import { expect } from 'chai';
import { spy, stub, match } from 'sinon';
-import { act, createMount, createRenderer, screen } from '@mui/internal-test-utils';
+import { act, createRenderer, screen } from '@mui/internal-test-utils';
import PropTypes from 'prop-types';
-import Grow from '@mui/material/Grow';
import Modal from '@mui/material/Modal';
-import Paper from '@mui/material/Paper';
+import Paper, { paperClasses } from '@mui/material/Paper';
import Popover, { popoverClasses as classes, PopoverPaper } from '@mui/material/Popover';
import { ThemeProvider, createTheme } from '@mui/material/styles';
import { getOffsetLeft, getOffsetTop } from './Popover';
@@ -46,7 +45,6 @@ const ReplacementPaper = styled(Paper, {
describe(' ', () => {
const { clock, render } = createRenderer({ clock: 'fake' });
- const mount = createMount();
describeConformance( document.createElement('div')} open />, () => ({
classes,
@@ -316,8 +314,8 @@ describe(' ', () => {
});
describe('paper', () => {
- it('should have PopoverPaper as a child of Transition', () => {
- const wrapper = mount(
+ it('should have the paper class', () => {
+ render(
', () => {
,
);
- expect(wrapper.find(PopoverPaper)).to.have.lengthOf(1);
- expect(screen.getByTestId('paper')).not.to.equal(null);
+ expect(screen.getByTestId('paper')).to.have.class(classes.paper);
});
- it('should have the paper class', () => {
- render(
+ it('should have a elevation prop passed down', () => {
+ const { setProps } = render(
', () => {
,
);
- expect(screen.getByTestId('paper')).to.have.class(classes.paper);
- });
+ expect(screen.getByTestId('paper')).to.have.class(paperClasses.elevation8);
- it('should have a elevation prop passed down', () => {
- const wrapper = mount(
-
-
- ,
- );
-
- expect(wrapper.find(PopoverPaper).props().elevation).to.equal(8);
+ setProps({ slotProps: { paper: { 'data-testid': 'paper', elevation: 16 } } });
- wrapper.setProps({ elevation: 16 });
- expect(wrapper.find(PopoverPaper).props().elevation).to.equal(16);
+ expect(screen.getByTestId('paper')).to.have.class(paperClasses.elevation16);
});
});
@@ -424,20 +412,19 @@ describe(' ', () => {
it('should have opacity 1 only after onEntering has been called', () => {
const onEnteringSpy = spy();
const paperRenderSpy = spy(PopoverPaper, 'render');
-
- const wrapper = mount(
+ const { setProps } = render(
,
);
- wrapper.setProps({ open: true });
+ setProps({ open: true });
expect(
paperRenderSpy
@@ -998,12 +985,20 @@ describe(' ', () => {
describe('prop: transitionDuration', () => {
it('should apply the auto prop if supported', () => {
- const wrapper = mount(
-
+ const TransitionComponent = React.forwardRef((props, ref) => (
+
+ ));
+ TransitionComponent.muiSupportAuto = true;
+ render(
+
,
);
- expect(wrapper.find(Grow).props().timeout).to.equal('auto');
+ expect(screen.getByTestId('transition')).to.have.attribute('data-timeout').equals('auto');
});
it('should not apply the auto prop if not supported', () => {
@@ -1053,19 +1048,21 @@ describe(' ', () => {
const slotPropsElevation = 12;
const paperPropsElevation = 14;
- const wrapper = mount(
+ render(
,
);
expect(slotPropsElevation).not.to.equal(paperPropsElevation);
- expect(wrapper.find(PopoverPaper).props().elevation).to.equal(slotPropsElevation);
+ expect(screen.getByTestId('paper')).to.have.class(
+ `${paperClasses[`elevation${slotPropsElevation}`]}`,
+ );
});
it('should position popover correctly when ref is provided', () => {
diff --git a/packages/mui-styles/src/StylesProvider/StylesProvider.test.js b/packages/mui-styles/src/StylesProvider/StylesProvider.test.js
index 50ea3ac6303ca0..52963f295fa3dd 100644
--- a/packages/mui-styles/src/StylesProvider/StylesProvider.test.js
+++ b/packages/mui-styles/src/StylesProvider/StylesProvider.test.js
@@ -1,56 +1,65 @@
import * as React from 'react';
import * as ReactDOMServer from 'react-dom/server';
import { expect } from 'chai';
+import { spy, match } from 'sinon';
import { create, SheetsRegistry } from 'jss';
-import { createMount, strictModeDoubleLoggingSuppressed } from '@mui/internal-test-utils';
+import { createRenderer, strictModeDoubleLoggingSuppressed } from '@mui/internal-test-utils';
import StylesProvider, { StylesContext } from './StylesProvider';
import makeStyles from '../makeStyles';
import createGenerateClassName from '../createGenerateClassName';
-function Test() {
- const options = React.useContext(StylesContext);
- return ;
-}
-
-function getOptions(wrapper) {
- return wrapper.find('span').props()['data-options'];
-}
-
describe('StylesProvider', () => {
- const mount = createMount();
+ const { render } = createRenderer();
let generateClassName;
+ let getContext;
+
+ function Test() {
+ const context = React.useContext(StylesContext);
+
+ React.useEffect(() => {
+ getContext(context);
+ }, [context]);
+
+ return null;
+ }
beforeEach(() => {
generateClassName = createGenerateClassName();
+ getContext = spy();
});
- it('should provide the options', () => {
- const wrapper = mount(
+ it('should provide the context', () => {
+ render(
,
);
- expect(getOptions(wrapper).disableGeneration).to.equal(true);
+
+ expect(getContext.alwaysCalledWith(match({ disableGeneration: true }))).to.equal(true);
});
it('should merge the themes', () => {
- const wrapper = mount(
+ render(
,
);
- expect(getOptions(wrapper).disableGeneration).to.equal(true);
+
+ expect(getContext.alwaysCalledWith(match({ disableGeneration: true }))).to.equal(true);
});
it('should handle injectFirst', () => {
- const wrapper = mount(
+ render(
,
);
- expect(getOptions(wrapper).jss.options.insertionPoint.nodeType).to.equal(8);
+
+ expect(
+ getContext.alwaysCalledWith(match({ jss: { options: { insertionPoint: { nodeType: 8 } } } })),
+ ).to.equal(true);
});
describe('server-side', () => {
@@ -128,20 +137,20 @@ describe('StylesProvider', () => {
it('should accept a custom JSS instance', () => {
const jss = create();
- const wrapper = mount(
+ render(
,
);
- expect(getOptions(wrapper).jss).to.equal(jss);
+
+ expect(getContext.alwaysCalledWith(match({ jss }))).to.equal(true);
});
describe('warnings', () => {
it('should support invalid input', () => {
const jss = create();
-
expect(() => {
- mount(
+ render(
,
diff --git a/packages/mui-styles/src/makeStyles/makeStyles.test.js b/packages/mui-styles/src/makeStyles/makeStyles.test.js
index a4b49a82628da6..d2a9b3b896dca3 100644
--- a/packages/mui-styles/src/makeStyles/makeStyles.test.js
+++ b/packages/mui-styles/src/makeStyles/makeStyles.test.js
@@ -2,8 +2,7 @@ import { expect } from 'chai';
import * as React from 'react';
import PropTypes from 'prop-types';
import { SheetsRegistry } from 'jss';
-import { act } from 'react-dom/test-utils';
-import { createMount } from '@mui/internal-test-utils';
+import { createRenderer, screen, renderHook, fireEvent } from '@mui/internal-test-utils';
import { createTheme } from '@mui/material/styles';
import createGenerateClassName from '../createGenerateClassName';
import makeStyles from './makeStyles';
@@ -13,28 +12,7 @@ import ThemeProvider from '../ThemeProvider';
describe('makeStyles', () => {
// StrictModeViolation: uses `useSynchronousEffect`
- const mount = createMount({ strict: null });
-
- /**
- * returns a function that given the props for the styles object will return
- * the css classes
- * @param {object} styles argument for `makeStyles`
- */
- function createGetClasses(styles) {
- const useStyles = makeStyles(styles);
- const output = {};
-
- function TestComponent(props) {
- output.classes = useStyles(props);
- return
;
- }
-
- return function mountWithProps(props) {
- const wrapper = mount( );
- output.wrapper = wrapper;
- return output;
- };
- }
+ const { render } = createRenderer({ strict: false });
let generateClassName;
@@ -44,72 +22,73 @@ describe('makeStyles', () => {
it('should accept a classes prop', () => {
const styles = { root: {} };
- const mountWithProps = createGetClasses(styles);
- const output = mountWithProps();
- const baseClasses = output.classes;
- output.wrapper.setProps({
- classes: { root: 'h1' },
- });
- const extendedClasses = output.classes;
+ const useStyles = makeStyles(styles);
+
+ const { result, rerender } = renderHook((props) => useStyles(props));
+ const baseClasses = result.current;
+ rerender({ classes: { root: 'h1' } });
+ const extendedClasses = result.current;
+
expect(extendedClasses.root).to.equal(`${baseClasses.root} h1`);
});
it('should ignore undefined prop', () => {
const styles = { root: {} };
- const mountWithProps = createGetClasses(styles);
- const output = mountWithProps();
- const baseClasses = output.classes;
- output.wrapper.setProps({
- classes: { root: undefined },
- });
- const extendedClasses = output.classes;
+ const useStyles = makeStyles(styles);
+
+ const { result, rerender } = renderHook((props) => useStyles(props));
+ const baseClasses = result.current;
+ rerender({ classes: { root: undefined } });
+ const extendedClasses = result.current;
+
expect(extendedClasses.root).to.equal(baseClasses.root);
});
describe('warnings', () => {
- const mountWithProps = createGetClasses({ root: {} });
+ const useStyles = makeStyles({ root: {} });
it('should warn if providing a unknown key', () => {
- const output = mountWithProps();
+ let baseClasses;
+ let extendedClasses;
expect(() => {
- output.wrapper.setProps({ classes: { bar: 'foo' } });
+ const { result } = renderHook(() => useStyles({ classes: { bar: 'foo' } }));
+ baseClasses = result.current;
+ extendedClasses = result.current;
}).toErrorDev('MUI: The key `bar` provided to the classes prop is not implemented');
-
- const baseClasses = output.classes;
- const extendedClasses = output.classes;
expect(extendedClasses).to.deep.equal({ root: baseClasses.root, bar: 'undefined foo' });
});
it('should warn if providing a string', () => {
- const output = mountWithProps();
-
expect(() => {
- output.wrapper.setProps({ classes: 'foo' });
+ renderHook(() => useStyles({ classes: 'foo' }));
}).toErrorDev(['You might want to use the className prop instead']);
});
it('should warn if providing a non string', () => {
- const output = mountWithProps();
- const baseClasses = output.classes;
+ const { result, rerender } = renderHook((props) => useStyles(props));
+ const baseClasses = result.current;
expect(() => {
- output.wrapper.setProps({ classes: { root: {} } });
+ rerender({ classes: { root: {} } });
}).toErrorDev('MUI: The key `root` provided to the classes prop is not valid');
- const extendedClasses = output.classes;
+ const extendedClasses = result.current;
+
expect(extendedClasses).to.deep.equal({ root: `${baseClasses.root} [object Object]` });
});
it('should warn if missing theme', () => {
- const styles = (theme) => ({ root: { padding: theme.spacing(2) } });
- const mountWithProps2 = createGetClasses(styles);
+ const useStyles2 = makeStyles((theme) => ({ root: { padding: theme.spacing(2) } }));
expect(() => {
expect(() => {
- mountWithProps2({});
+ renderHook(() => useStyles2({}));
}).to.throw('theme.spacing is not a function');
}).toErrorDev([
+ 'MUI: The `styles` argument provided is invalid.\nYou are providing a function without a theme in the context.',
+ 'MUI: The `styles` argument provided is invalid.\nYou are providing a function without a theme in the context.',
+ 'Uncaught [TypeError: theme.spacing is not a function',
'MUI: The `styles` argument provided is invalid.\nYou are providing a function without a theme in the context.',
'MUI: The `styles` argument provided is invalid.\nYou are providing a function without a theme in the context.',
'Uncaught [TypeError: theme.spacing is not a function',
@@ -118,16 +97,15 @@ describe('makeStyles', () => {
});
it('should warn but not throw if providing an invalid styles type', () => {
- let mountWithProps2;
+ let useStyles2;
expect(() => {
- mountWithProps2 = createGetClasses(undefined);
+ useStyles2 = makeStyles(undefined);
}).toErrorDev(
'MUI: The `styles` argument provided is invalid.\nYou need to provide a function generating the styles or a styles object.',
);
-
expect(() => {
- mountWithProps2({});
+ renderHook(() => useStyles2({}));
}).not.to.throw();
});
@@ -143,15 +121,14 @@ describe('makeStyles', () => {
},
},
};
-
- const useStyles = makeStyles({ root: { margin: 5, padding: 3 } }, { name: 'Test' });
+ const useStyles2 = makeStyles({ root: { margin: 5, padding: 3 } }, { name: 'Test' });
function Test() {
- const classes = useStyles();
+ const classes = useStyles2();
return
;
}
expect(() => {
- mount(
+ render(
,
@@ -164,45 +141,47 @@ describe('makeStyles', () => {
});
describe('classes memoization', () => {
- let mountWithProps;
+ let useStyles;
before(() => {
const styles = { root: {} };
- mountWithProps = createGetClasses(styles);
+ useStyles = makeStyles(styles);
});
it('should recycle with no classes prop', () => {
- const output = mountWithProps();
- const classes1 = output.classes;
- output.wrapper.update();
- const classes2 = output.classes;
+ const { result, rerender } = renderHook(() => useStyles());
+ const classes1 = result.current;
+ rerender();
+ const classes2 = result.current;
+
expect(classes1).to.equal(classes2);
});
it('should recycle even when a classes prop is provided', () => {
const inputClasses = { root: 'foo' };
- const output = mountWithProps({ classes: inputClasses });
- const classes1 = output.classes;
- output.wrapper.setProps({
- classes: inputClasses,
- });
- const classes2 = output.classes;
+ const { result, rerender } = renderHook(() => useStyles({ classes: inputClasses }));
+ const classes1 = result.current;
+ rerender();
+ const classes2 = result.current;
+
expect(classes1).to.equal(classes2);
});
it('should invalidate the cache', () => {
- const output = mountWithProps();
- const classes = output.classes;
- output.wrapper.setProps({ classes: { root: 'foo' } });
- const classes1 = output.classes;
+ const { result, rerender } = renderHook((props) => useStyles(props));
+ const classes = result.current;
+ rerender({ classes: { root: 'foo' } });
+ const classes1 = result.current;
+
expect(classes1).to.deep.equal({
root: `${classes.root} foo`,
});
- output.wrapper.setProps({
+ rerender({
classes: { root: 'bar' },
});
- const classes2 = output.classes;
+ const classes2 = result.current;
+
expect(classes1).not.to.equal(classes2);
expect(classes2).to.deep.equal({
root: `${classes.root} bar`,
@@ -219,13 +198,14 @@ describe('makeStyles', () => {
it('should run lifecycles with no theme', () => {
const useStyles = makeStyles({ root: { display: 'flex' } });
+ const initialTheme = createTheme();
function StyledComponent() {
useStyles();
return
;
}
- const wrapper = mount(
-
+ const { setProps, unmount } = render(
+
{
,
);
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'makeStyles-root-1' });
- wrapper.update();
+
+ setProps();
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'makeStyles-root-1' });
- wrapper.setProps({ theme: createTheme() });
+
+ setProps({ theme: createTheme() });
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'makeStyles-root-2' });
- wrapper.unmount();
+ unmount();
+
expect(sheetsRegistry.registry.length).to.equal(0);
});
@@ -257,7 +243,7 @@ describe('makeStyles', () => {
return
;
}
- const wrapper = mount(
+ const { setProps } = render(
{
,
);
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'MuiTextField-root' });
- wrapper.setProps({ theme: createTheme({ foo: 'bar' }) });
+ setProps({ theme: createTheme({ foo: 'bar' }) });
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'MuiTextField-root' });
});
@@ -294,7 +282,7 @@ describe('makeStyles', () => {
return
;
}
- mount(
+ render(
{
,
);
+
expect(sheetsRegistry.registry.length).to.equal(1);
expect(sheetsRegistry.registry[0].rules.raw).to.deep.equal({
root: { padding: 9, margin: [2, 2, 3] },
@@ -332,14 +321,13 @@ describe('makeStyles', () => {
},
},
};
-
const useStyles = makeStyles({ root: { margin: 5, padding: 3 } }, { name: 'Test' });
function Test() {
const classes = useStyles();
return
;
}
- mount(
+ render(
@@ -354,7 +342,7 @@ describe('makeStyles', () => {
});
});
- it('should handle dynamic props', () => {
+ it('should handle dynamic props', async () => {
const useStyles = makeStyles({
root: (props) => ({ margin: 8, padding: props.padding || 8 }),
});
@@ -362,7 +350,6 @@ describe('makeStyles', () => {
const classes = useStyles(props);
return
;
}
-
function Test(props) {
return (
{
);
}
- const wrapper = mount( );
+ const { setProps } = render( );
+
expect(sheetsRegistry.registry.length).to.equal(2);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'makeStyles-root-1' });
expect(sheetsRegistry.registry[1].classes).to.deep.equal({ root: 'makeStyles-root-2' });
@@ -384,7 +372,8 @@ describe('makeStyles', () => {
padding: '8px',
});
- wrapper.setProps({ padding: 4 });
+ setProps({ padding: 4 });
+
expect(sheetsRegistry.registry.length).to.equal(2);
expect(sheetsRegistry.registry[0].classes).to.deep.equal({ root: 'makeStyles-root-1' });
expect(sheetsRegistry.registry[1].classes).to.deep.equal({ root: 'makeStyles-root-2' });
@@ -398,23 +387,30 @@ describe('makeStyles', () => {
describe('options: disableGeneration', () => {
it('should not generate the styles', () => {
const sheetsRegistry = new SheetsRegistry();
- function Empty() {
+ const useStyles = makeStyles({ root: { padding: 8 } });
+ let classes;
+ function Empty(props) {
+ React.useEffect(() => {
+ classes = props.classes;
+ }, [props.classes]);
return
;
}
- const useStyles = makeStyles({ root: { padding: 8 } });
function StyledComponent() {
- const classes = useStyles();
- return ;
+ const classes2 = useStyles();
+ return ;
}
- const wrapper = mount(
+ const { unmount } = render(
,
);
+
expect(sheetsRegistry.registry.length).to.equal(0);
- expect(wrapper.find(Empty).props().classes).to.deep.equal({});
- wrapper.unmount();
+ expect(classes).to.deep.equal({});
+
+ unmount();
+
expect(sheetsRegistry.registry.length).to.equal(0);
});
});
@@ -439,12 +435,13 @@ describe('makeStyles', () => {
return
;
}
- mount(
+ render(
,
);
+
expect(sheetsRegistry.registry[0].options.classNamePrefix).to.equal('makeStyles');
expect(sheetsRegistry.registry[0].options.name).to.equal(undefined);
expect(sheetsRegistry.registry[1].options.classNamePrefix).to.equal('Fooo');
@@ -522,7 +519,7 @@ describe('makeStyles', () => {
it('should update like expected', () => {
const sheetsRegistry = new SheetsRegistry();
- const wrapper = mount(
+ render(
{
,
);
+
expect(sheetsRegistry.registry.length).to.equal(2);
expect(sheetsRegistry.toString()).to.equal(`.makeStyles-root-2 {
color: white;
background-color: black;
}`);
- act(() => {
- wrapper.find('#color').simulate('change', { target: { value: 'blue' } });
- });
+ fireEvent.change(screen.getByLabelText('color'), { target: { value: 'blue' } });
+
expect(sheetsRegistry.toString()).to.equal(
`.makeStyles-root-4 {
color: blue;
background-color: black;
}`,
);
- act(() => {
- wrapper.find('#background-color').simulate('change', { target: { value: 'green' } });
+
+ fireEvent.change(screen.getByLabelText('background-color'), {
+ target: { value: 'green' },
});
+
expect(sheetsRegistry.toString()).to.equal(
`.makeStyles-root-4 {
color: blue;
From 22be6cf8eb595294edf3ebe1eb5ee7caae380a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Wed, 26 Jun 2024 20:45:24 +0200
Subject: [PATCH 52/65] [test] Remove enzyme (#42706)
---
package.json | 3 -
packages-internal/test-utils/package.json | 3 -
packages-internal/test-utils/src/init.js | 4 -
packages-internal/test-utils/src/until.js | 28 --
.../test-utils/src/until.test.js | 120 --------
pnpm-lock.yaml | 277 ------------------
scripts/useReactVersion.mjs | 5 +-
test/README.md | 1 -
test/karma.conf.js | 6 +-
test/karma.conf.profile.js | 4 +-
test/regressions/webpack.config.js | 6 +-
11 files changed, 7 insertions(+), 450 deletions(-)
delete mode 100644 packages-internal/test-utils/src/until.js
delete mode 100644 packages-internal/test-utils/src/until.test.js
diff --git a/package.json b/package.json
index 5b02c2c11513a6..faa5c4bd80018b 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,6 @@
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
"@babel/register": "^7.24.6",
- "@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@mui-internal/api-docs-builder": "workspace:^",
"@mui-internal/api-docs-builder-core": "workspace:^",
"@mui/internal-docs-utils": "workspace:^",
@@ -120,7 +119,6 @@
"@octokit/rest": "^20.1.1",
"@pigment-css/react": "^0.0.13",
"@playwright/test": "1.44.1",
- "@types/enzyme": "^3.10.18",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.5",
"@types/mocha": "^10.0.7",
@@ -142,7 +140,6 @@
"cpy-cli": "^5.0.0",
"cross-env": "^7.0.3",
"danger": "^12.3.3",
- "enzyme": "^3.11.0",
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-airbnb-typescript": "^18.0.0",
diff --git a/packages-internal/test-utils/package.json b/packages-internal/test-utils/package.json
index 0e2e8e27bd4b4a..2523916d8b6b30 100644
--- a/packages-internal/test-utils/package.json
+++ b/packages-internal/test-utils/package.json
@@ -37,13 +37,11 @@
"@babel/runtime": "^7.24.7",
"@emotion/cache": "^11.11.0",
"@emotion/react": "^11.11.4",
- "@mnajdova/enzyme-adapter-react-18": "^0.2.0",
"@testing-library/dom": "^10.1.0",
"@testing-library/react": "^16.0.0",
"chai": "^4.4.1",
"chai-dom": "^1.12.0",
"dom-accessibility-api": "^0.6.3",
- "enzyme": "^3.11.0",
"format-util": "^1.0.5",
"fs-extra": "^11.2.0",
"jsdom": "^24.0.0",
@@ -57,7 +55,6 @@
"devDependencies": {
"@types/chai": "^4.3.16",
"@types/chai-dom": "^1.11.3",
- "@types/enzyme": "^3.10.18",
"@types/format-util": "^1.0.4",
"@types/prop-types": "^15.7.12",
"@types/react": "^18.2.55",
diff --git a/packages-internal/test-utils/src/init.js b/packages-internal/test-utils/src/init.js
index d55b0f7f719b4f..85e2fe80a5eb6c 100644
--- a/packages-internal/test-utils/src/init.js
+++ b/packages-internal/test-utils/src/init.js
@@ -1,10 +1,6 @@
-import enzyme from 'enzyme';
-import Adapter from '@mnajdova/enzyme-adapter-react-18';
import * as testingLibrary from '@testing-library/react/pure';
import './initMatchers';
-enzyme.configure({ adapter: new Adapter() });
-
// checking if an element is hidden is quite expensive
// this is only done in CI as a fail safe. It can still explicitly be checked
// in the test files which helps documenting what is part of the DOM but hidden
diff --git a/packages-internal/test-utils/src/until.js b/packages-internal/test-utils/src/until.js
deleted file mode 100644
index aab33f8085bf51..00000000000000
--- a/packages-internal/test-utils/src/until.js
+++ /dev/null
@@ -1,28 +0,0 @@
-function shallowRecursively(wrapper, selector, { context, ...other }) {
- if (wrapper.isEmptyRender() || typeof wrapper.getElement().type === 'string') {
- return wrapper;
- }
-
- let newContext = context;
-
- const instance = wrapper.root().instance();
- // The instance can be null with a stateless functional component and react >= 16.
- if (instance && instance.getChildContext) {
- newContext = {
- ...context,
- ...instance.getChildContext(),
- };
- }
-
- const nextWrapper = wrapper.shallow({ context: newContext, ...other });
-
- if (selector && wrapper.is(selector)) {
- return nextWrapper;
- }
-
- return shallowRecursively(nextWrapper, selector, { context: newContext });
-}
-
-export default function until(selector, options = {}) {
- return this.single('until', () => shallowRecursively(this, selector, options));
-}
diff --git a/packages-internal/test-utils/src/until.test.js b/packages-internal/test-utils/src/until.test.js
deleted file mode 100644
index ee9edc05292249..00000000000000
--- a/packages-internal/test-utils/src/until.test.js
+++ /dev/null
@@ -1,120 +0,0 @@
-import * as React from 'react';
-import { expect } from 'chai';
-import PropTypes from 'prop-types';
-import { shallow } from 'enzyme';
-import until from './until';
-
-function Div() {
- return
;
-}
-const hoc = (Component) =>
- function Wrapper() {
- return ;
- };
-
-describe('until', () => {
- it('shallow renders the current wrapper one level deep', () => {
- const EnhancedDiv = hoc(Div);
- const wrapper = until.call(shallow( ), 'Div');
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- it('shallow renders the current wrapper several levels deep', () => {
- const EnhancedDiv = hoc(hoc(hoc(Div)));
- const wrapper = until.call(shallow( ), 'Div');
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- it('stops shallow rendering when the wrapper is empty', () => {
- const nullHoc = () => () => null;
- const EnhancedDiv = nullHoc();
- const wrapper = until.call(shallow( ), 'Div');
- expect(wrapper.html()).to.equal(null);
- });
-
- it('shallow renders as much as possible when no selector is provided', () => {
- const EnhancedDiv = hoc(hoc(Div));
- const wrapper = until.call(shallow( ));
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- it('shallow renders the current wrapper even if the selector never matches', () => {
- const EnhancedDiv = hoc(Div);
- const wrapper = until.call(shallow( ), 'NotDiv');
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- it('stops shallow rendering when it encounters a HTML element', () => {
- const wrapper = until.call(
- shallow(
- ,
- ),
- 'Div',
- );
- expect(
- wrapper.contains(
- ,
- ),
- ).to.equal(true);
- });
-
- it('throws when until called on an empty wrapper', () => {
- expect(() => {
- until.call(shallow(
).find('Foo'), 'div');
- }).to.throw(Error);
- });
-
- it('shallow renders non-root wrappers', () => {
- function Container() {
- return (
-
- );
- }
- const wrapper = until.call(shallow( ).find(Div));
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- // eslint-disable-next-line react/prefer-stateless-function
- class Foo extends React.Component {
- render() {
- return
;
- }
- }
-
- Foo.contextTypes = {
- quux: PropTypes.bool.isRequired,
- };
-
- it('context propagation passes down context from the root component', () => {
- const EnhancedFoo = hoc(Foo);
- const options = { context: { quux: true } };
- const wrapper = until.call(shallow( , options), 'Foo', options);
- expect(wrapper.context('quux')).to.equal(true);
- expect(wrapper.contains(
)).to.equal(true);
- });
-
- class Bar extends React.Component {
- static childContextTypes = { quux: PropTypes.bool };
-
- getChildContext() {
- return { quux: true };
- }
-
- render() {
- return ;
- }
- }
-
- it('context propagation passes down context from an intermediary component', () => {
- const EnhancedBar = hoc(Bar);
- const wrapper = until.call(shallow( ), 'Foo');
- expect(wrapper.context('quux')).to.equal(true);
- expect(wrapper.contains(
)).to.equal(true);
- });
-});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ac55e4b6b11299..a2402e44e35a09 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -71,9 +71,6 @@ importers:
'@babel/register':
specifier: ^7.24.6
version: 7.24.6(@babel/core@7.24.7)
- '@mnajdova/enzyme-adapter-react-18':
- specifier: ^0.2.0
- version: 0.2.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@mui-internal/api-docs-builder':
specifier: workspace:^
version: link:packages/api-docs-builder
@@ -110,9 +107,6 @@ importers:
'@playwright/test':
specifier: 1.44.1
version: 1.44.1
- '@types/enzyme':
- specifier: ^3.10.18
- version: 3.10.18
'@types/fs-extra':
specifier: ^11.0.4
version: 11.0.4
@@ -176,9 +170,6 @@ importers:
danger:
specifier: ^12.3.3
version: 12.3.3(encoding@0.1.13)
- enzyme:
- specifier: ^3.11.0
- version: 3.11.0
eslint:
specifier: ^8.57.0
version: 8.57.0
@@ -1002,9 +993,6 @@ importers:
'@emotion/react':
specifier: ^11.11.4
version: 11.11.4(@types/react@18.2.55)(react@18.2.0)
- '@mnajdova/enzyme-adapter-react-18':
- specifier: ^0.2.0
- version: 0.2.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
'@testing-library/dom':
specifier: ^10.1.0
version: 10.1.0
@@ -1020,9 +1008,6 @@ importers:
dom-accessibility-api:
specifier: ^0.6.3
version: 0.6.3
- enzyme:
- specifier: ^3.11.0
- version: 3.11.0
format-util:
specifier: ^1.0.5
version: 1.0.5
@@ -1063,9 +1048,6 @@ importers:
'@types/chai-dom':
specifier: ^1.11.3
version: 1.11.3
- '@types/enzyme':
- specifier: ^3.10.18
- version: 3.10.18
'@types/format-util':
specifier: ^1.0.4
version: 1.0.4
@@ -3817,13 +3799,6 @@ packages:
resolution: {integrity: sha512-JFvIYrlvR8Txa8h7VZx8VIQDltukEKOKaZL/muGO7Q/5aE2vjOKHsD/jkWYe/2uFy1xv37ubdx17O1UXQNadPg==}
engines: {node: '>=18.0.0'}
- '@mnajdova/enzyme-adapter-react-18@0.2.0':
- resolution: {integrity: sha512-BOnjlVa7FHI1YUnYe+FdUtQu6szI1wLJ+C1lHyqmF3T9gu/J/WCYqqcD44dPkrU+8eYvvk/gQducsqna4HFiAg==}
- peerDependencies:
- enzyme: ^3.0.0
- react: ^18.0.0
- react-dom: ^18.0.0
-
'@mui/base@5.0.0-beta.30':
resolution: {integrity: sha512-dc38W4W3K42atE9nSaOeoJ7/x9wGIfawdwC/UmMxMLlZ1iSsITQ8dQJaTATCbn98YvYPINK/EH541YA5enQIPQ==}
engines: {node: '>=12.0.0'}
@@ -5219,9 +5194,6 @@ packages:
'@types/chai@4.3.16':
resolution: {integrity: sha512-PatH4iOdyh3MyWtmHVFXLWCCIhUbopaltqddG9BzB+gMIzee2MJrvd+jouii9Z3wzQJruGWAm7WOMjgfG8hQlQ==}
- '@types/cheerio@0.22.31':
- resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
-
'@types/connect@3.4.35':
resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
@@ -5240,9 +5212,6 @@ packages:
'@types/doctrine@0.0.9':
resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==}
- '@types/enzyme@3.10.18':
- resolution: {integrity: sha512-RaO/TyyHZvXkpzinbMTZmd/S5biU4zxkvDsn22ujC29t9FMSzq8tnn8f2MxQ2P8GVhFRG5jTAL05DXKyTtpEQQ==}
-
'@types/eslint-scope@3.7.4':
resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
@@ -5678,12 +5647,6 @@ packages:
resolution: {integrity: sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==}
engines: {node: '>=12'}
- airbnb-prop-types@2.16.0:
- resolution: {integrity: sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==}
- deprecated: This package has been renamed to 'prop-types-tools'
- peerDependencies:
- react: ^0.14 || ^15.0.0 || ^16.0.0-alpha
-
ajv-formats@2.1.1:
resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
peerDependencies:
@@ -5848,10 +5811,6 @@ packages:
resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
engines: {node: '>=8'}
- array.prototype.filter@1.0.1:
- resolution: {integrity: sha512-Dk3Ty7N42Odk7PjU/Ci3zT4pLj20YvuVnneG/58ICM6bt4Ij5kZaJTVQ9TSaWaIECX2sFyz4KItkVZqHNnciqw==}
- engines: {node: '>= 0.4'}
-
array.prototype.find@2.2.2:
resolution: {integrity: sha512-DRumkfW97iZGOfn+lIXbkVrXL04sfYKX+EfOodo8XboR5sxPDVvOjZTF/rysusa9lmhmSOeD6Vp6RKQP+eP4Tg==}
@@ -6337,13 +6296,6 @@ packages:
check-error@1.0.3:
resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
- cheerio-select@2.1.0:
- resolution: {integrity: sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==}
-
- cheerio@1.0.0-rc.12:
- resolution: {integrity: sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==}
- engines: {node: '>= 6'}
-
chokidar@3.5.3:
resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
engines: {node: '>= 8.10.0'}
@@ -7062,9 +7014,6 @@ packages:
resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
engines: {node: '>=8'}
- discontinuous-range@1.0.0:
- resolution: {integrity: sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==}
-
dlv@1.1.3:
resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
@@ -7218,17 +7167,6 @@ packages:
engines: {node: '>=4'}
hasBin: true
- enzyme-adapter-utils@1.14.0:
- resolution: {integrity: sha512-F/z/7SeLt+reKFcb7597IThpDp0bmzcH1E9Oabqv+o01cID2/YInlqHbFl7HzWBl4h3OdZYedtwNDOmSKkk0bg==}
- peerDependencies:
- react: 0.13.x || 0.14.x || ^15.0.0-0 || ^16.0.0-0
-
- enzyme-shallow-equal@1.0.4:
- resolution: {integrity: sha512-MttIwB8kKxypwHvRynuC3ahyNc+cFbR8mjVIltnmzQ0uKGqmsfO4bfBuLxb0beLNPhjblUEYvEbsg+VSygvF1Q==}
-
- enzyme@3.11.0:
- resolution: {integrity: sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==}
-
err-code@2.0.3:
resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
@@ -8135,9 +8073,6 @@ packages:
resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==}
engines: {node: ^16.14.0 || >=18.0.0}
- html-element-map@1.3.1:
- resolution: {integrity: sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==}
-
html-encoding-sniffer@4.0.0:
resolution: {integrity: sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==}
engines: {node: '>=18'}
@@ -8173,9 +8108,6 @@ packages:
htmlparser2@6.1.0:
resolution: {integrity: sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==}
- htmlparser2@8.0.1:
- resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
-
http-cache-semantics@4.1.1:
resolution: {integrity: sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==}
@@ -8553,9 +8485,6 @@ packages:
resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
engines: {node: '>= 0.4'}
- is-subset@0.1.1:
- resolution: {integrity: sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==}
-
is-symbol@1.0.4:
resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
engines: {node: '>= 0.4'}
@@ -9102,9 +9031,6 @@ packages:
lodash.difference@4.5.0:
resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
- lodash.escape@4.0.1:
- resolution: {integrity: sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==}
-
lodash.escaperegexp@4.1.2:
resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
@@ -9588,9 +9514,6 @@ packages:
module-details-from-path@1.0.3:
resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
- moo@0.5.1:
- resolution: {integrity: sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==}
-
mri@1.2.0:
resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
engines: {node: '>=4'}
@@ -9637,10 +9560,6 @@ packages:
natural-compare@1.4.0:
resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
- nearley@2.20.1:
- resolution: {integrity: sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==}
- hasBin: true
-
negotiator@0.6.3:
resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
engines: {node: '>= 0.6'}
@@ -10186,9 +10105,6 @@ packages:
parse-url@8.1.0:
resolution: {integrity: sha512-xDvOoLU5XRrcOZvnI6b8zA6n9O9ejNk/GExuz1yBuWUGn9KA97GI6HTs6u02wKara1CeVmZhH+0TZFdWScR89w==}
- parse5-htmlparser2-tree-adapter@7.0.0:
- resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
-
parse5@7.1.2:
resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==}
@@ -10269,9 +10185,6 @@ packages:
peek-stream@1.1.3:
resolution: {integrity: sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==}
- performance-now@2.1.0:
- resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
-
picocolors@0.2.1:
resolution: {integrity: sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==}
@@ -10554,9 +10467,6 @@ packages:
resolution: {integrity: sha512-KQVDEubSUHGSt5xLakaToDFrSoZhStB8dXLzk2xvwR67gJktrHFvpR63oZgHyK19WKbHFLXJqCPXdVR3aBP8Ig==}
engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
- prop-types-exact@1.2.0:
- resolution: {integrity: sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==}
-
prop-types@15.8.1:
resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
@@ -10613,7 +10523,6 @@ packages:
engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
deprecated: |-
You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.
-
(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)
qjobs@1.2.0:
@@ -10650,19 +10559,9 @@ packages:
resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
engines: {node: '>=10'}
- raf@3.4.1:
- resolution: {integrity: sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==}
-
- railroad-diagrams@1.0.0:
- resolution: {integrity: sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==}
-
rambda@7.5.0:
resolution: {integrity: sha512-y/M9weqWAH4iopRd7EHDEQQvpFPHj1AA3oHozE9tfITHUtTR7Z9PSlIRRG2l1GuW7sefC1cXFfIcF+cgnShdBA==}
- randexp@0.4.6:
- resolution: {integrity: sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==}
- engines: {node: '>=0.12'}
-
randombytes@2.1.0:
resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
@@ -11005,9 +10904,6 @@ packages:
resolution: {integrity: sha512-ECkTw8TmJwW60lOTR+ZkODISW6RQ8+2CL3COqtiJKLd6MmB45hN51HprHFziKLGkAuTGQhBb91V8cy+KHlaCjw==}
engines: {node: '>= 0.4'}
- reflect.ownkeys@0.2.0:
- resolution: {integrity: sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg==}
-
regenerate-unicode-properties@10.1.0:
resolution: {integrity: sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==}
engines: {node: '>=4'}
@@ -11132,10 +11028,6 @@ packages:
resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
engines: {node: '>=8'}
- ret@0.1.15:
- resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
- engines: {node: '>=0.12'}
-
retry@0.12.0:
resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
engines: {node: '>= 4'}
@@ -11192,9 +11084,6 @@ packages:
rrweb-cssom@0.6.0:
resolution: {integrity: sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==}
- rst-selector-parser@2.2.3:
- resolution: {integrity: sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==}
-
rtl-css-js@1.16.0:
resolution: {integrity: sha512-Oc7PnzwIEU4M0K1J4h/7qUUaljXhQ0kCObRsZjxs2HjkpKsnoTMvSmvJ4sqgJZd0zBoEfAyTdnK/jMIYvrjySQ==}
@@ -14473,22 +14362,6 @@ snapshots:
- encoding
- supports-color
- '@mnajdova/enzyme-adapter-react-18@0.2.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
- dependencies:
- enzyme: 3.11.0
- enzyme-adapter-utils: 1.14.0(react@18.2.0)
- enzyme-shallow-equal: 1.0.4
- has: 1.0.3
- object.assign: 4.1.5
- object.values: 1.2.0
- prop-types: 15.8.1
- react: 18.2.0
- react-dom: 18.2.0(react@18.2.0)
- react-is: 18.2.0
- react-reconciler: 0.29.0(react@18.2.0)
- react-test-renderer: 18.2.0(react@18.2.0)
- semver: 5.7.2
-
'@mui/base@5.0.0-beta.30(@types/react@18.2.55)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
dependencies:
'@babel/runtime': 7.24.7
@@ -16274,10 +16147,6 @@ snapshots:
'@types/chai@4.3.16': {}
- '@types/cheerio@0.22.31':
- dependencies:
- '@types/node': 18.19.39
-
'@types/connect@3.4.35':
dependencies:
'@types/node': 18.19.39
@@ -16294,11 +16163,6 @@ snapshots:
'@types/doctrine@0.0.9': {}
- '@types/enzyme@3.10.18':
- dependencies:
- '@types/cheerio': 0.22.31
- '@types/react': 18.2.55
-
'@types/eslint-scope@3.7.4':
dependencies:
'@types/eslint': 8.56.10
@@ -16821,19 +16685,6 @@ snapshots:
clean-stack: 4.2.0
indent-string: 5.0.0
- airbnb-prop-types@2.16.0(react@18.2.0):
- dependencies:
- array.prototype.find: 2.2.2
- function.prototype.name: 1.1.6
- is-regex: 1.1.4
- object-is: 1.1.5
- object.assign: 4.1.5
- object.entries: 1.1.8
- prop-types: 15.8.1
- prop-types-exact: 1.2.0
- react: 18.2.0
- react-is: 16.13.1
-
ajv-formats@2.1.1(ajv@8.12.0):
optionalDependencies:
ajv: 8.12.0
@@ -17015,14 +16866,6 @@ snapshots:
array-union@2.1.0: {}
- array.prototype.filter@1.0.1:
- dependencies:
- call-bind: 1.0.7
- define-properties: 1.2.1
- es-abstract: 1.23.3
- es-array-method-boxes-properly: 1.0.0
- is-string: 1.0.7
-
array.prototype.find@2.2.2:
dependencies:
call-bind: 1.0.7
@@ -17711,25 +17554,6 @@ snapshots:
dependencies:
get-func-name: 2.0.2
- cheerio-select@2.1.0:
- dependencies:
- boolbase: 1.0.0
- css-select: 5.1.0
- css-what: 6.1.0
- domelementtype: 2.3.0
- domhandler: 5.0.3
- domutils: 3.0.1
-
- cheerio@1.0.0-rc.12:
- dependencies:
- cheerio-select: 2.1.0
- dom-serializer: 2.0.0
- domhandler: 5.0.3
- domutils: 3.0.1
- htmlparser2: 8.0.1
- parse5: 7.1.2
- parse5-htmlparser2-tree-adapter: 7.0.0
-
chokidar@3.5.3:
dependencies:
anymatch: 3.1.3
@@ -18524,8 +18348,6 @@ snapshots:
dependencies:
path-type: 4.0.0
- discontinuous-range@1.0.0: {}
-
dlv@1.1.3: {}
doctrine@2.1.0:
@@ -18693,47 +18515,6 @@ snapshots:
envinfo@7.8.1: {}
- enzyme-adapter-utils@1.14.0(react@18.2.0):
- dependencies:
- airbnb-prop-types: 2.16.0(react@18.2.0)
- function.prototype.name: 1.1.6
- has: 1.0.3
- object.assign: 4.1.5
- object.fromentries: 2.0.8
- prop-types: 15.8.1
- react: 18.2.0
- semver: 5.7.2
-
- enzyme-shallow-equal@1.0.4:
- dependencies:
- has: 1.0.3
- object-is: 1.1.5
-
- enzyme@3.11.0:
- dependencies:
- array.prototype.flat: 1.3.2
- cheerio: 1.0.0-rc.12
- enzyme-shallow-equal: 1.0.4
- function.prototype.name: 1.1.6
- has: 1.0.3
- html-element-map: 1.3.1
- is-boolean-object: 1.1.2
- is-callable: 1.2.7
- is-number-object: 1.0.7
- is-regex: 1.1.4
- is-string: 1.0.7
- is-subset: 0.1.1
- lodash.escape: 4.0.1
- lodash.isequal: 4.5.0
- object-inspect: 1.13.1
- object-is: 1.1.5
- object.assign: 4.1.5
- object.entries: 1.1.8
- object.values: 1.2.0
- raf: 3.4.1
- rst-selector-parser: 2.2.3
- string.prototype.trim: 1.2.9
-
err-code@2.0.3: {}
error-ex@1.3.2:
@@ -19965,11 +19746,6 @@ snapshots:
dependencies:
lru-cache: 10.1.0
- html-element-map@1.3.1:
- dependencies:
- array.prototype.filter: 1.0.1
- call-bind: 1.0.7
-
html-encoding-sniffer@4.0.0:
dependencies:
whatwg-encoding: 3.1.1
@@ -20013,13 +19789,6 @@ snapshots:
domutils: 2.8.0
entities: 2.2.0
- htmlparser2@8.0.1:
- dependencies:
- domelementtype: 2.3.0
- domhandler: 5.0.3
- domutils: 3.0.1
- entities: 4.5.0
-
http-cache-semantics@4.1.1: {}
http-errors@2.0.0:
@@ -20368,8 +20137,6 @@ snapshots:
dependencies:
has-tostringtag: 1.0.2
- is-subset@0.1.1: {}
-
is-symbol@1.0.4:
dependencies:
has-symbols: 1.0.3
@@ -21194,8 +20961,6 @@ snapshots:
lodash.difference@4.5.0: {}
- lodash.escape@4.0.1: {}
-
lodash.escaperegexp@4.1.2: {}
lodash.find@4.6.0: {}
@@ -21824,8 +21589,6 @@ snapshots:
module-details-from-path@1.0.3: {}
- moo@0.5.1: {}
-
mri@1.2.0: {}
mrmime@1.0.1: {}
@@ -21865,13 +21628,6 @@ snapshots:
natural-compare@1.4.0: {}
- nearley@2.20.1:
- dependencies:
- commander: 2.20.3
- moo: 0.5.1
- railroad-diagrams: 1.0.0
- randexp: 0.4.6
-
negotiator@0.6.3: {}
neo-async@2.6.2: {}
@@ -22572,11 +22328,6 @@ snapshots:
dependencies:
parse-path: 7.0.0
- parse5-htmlparser2-tree-adapter@7.0.0:
- dependencies:
- domhandler: 5.0.3
- parse5: 7.1.2
-
parse5@7.1.2:
dependencies:
entities: 4.5.0
@@ -22641,8 +22392,6 @@ snapshots:
duplexify: 3.7.1
through2: 2.0.5
- performance-now@2.1.0: {}
-
picocolors@0.2.1: {}
picocolors@1.0.1: {}
@@ -22910,12 +22659,6 @@ snapshots:
dependencies:
read: 2.1.0
- prop-types-exact@1.2.0:
- dependencies:
- has: 1.0.3
- object.assign: 4.1.5
- reflect.ownkeys: 0.2.0
-
prop-types@15.8.1:
dependencies:
loose-envify: 1.4.0
@@ -23004,19 +22747,8 @@ snapshots:
quick-lru@5.1.1: {}
- raf@3.4.1:
- dependencies:
- performance-now: 2.1.0
-
- railroad-diagrams@1.0.0: {}
-
rambda@7.5.0: {}
- randexp@0.4.6:
- dependencies:
- discontinuous-range: 1.0.0
- ret: 0.1.15
-
randombytes@2.1.0:
dependencies:
safe-buffer: 5.2.1
@@ -23496,8 +23228,6 @@ snapshots:
globalthis: 1.0.3
which-builtin-type: 1.1.3
- reflect.ownkeys@0.2.0: {}
-
regenerate-unicode-properties@10.1.0:
dependencies:
regenerate: 1.4.2
@@ -23632,8 +23362,6 @@ snapshots:
onetime: 5.1.2
signal-exit: 3.0.7
- ret@0.1.15: {}
-
retry@0.12.0: {}
retry@0.13.1: {}
@@ -23689,11 +23417,6 @@ snapshots:
rrweb-cssom@0.6.0: {}
- rst-selector-parser@2.2.3:
- dependencies:
- lodash.flattendeep: 4.4.0
- nearley: 2.20.1
-
rtl-css-js@1.16.0:
dependencies:
'@babel/runtime': 7.24.7
diff --git a/scripts/useReactVersion.mjs b/scripts/useReactVersion.mjs
index 55a4338e626f3b..35cbafdfb25608 100644
--- a/scripts/useReactVersion.mjs
+++ b/scripts/useReactVersion.mjs
@@ -18,12 +18,11 @@ const exec = promisify(childProcess.exec);
// packages published from the react monorepo using the same version
const reactPackageNames = ['react', 'react-dom', 'react-is', 'react-test-renderer', 'scheduler'];
-const devDependenciesPackageNames = ['@mnajdova/enzyme-adapter-react-18', '@testing-library/react'];
+const devDependenciesPackageNames = ['@testing-library/react'];
// if we need to support more versions we will need to add new mapping here
const additionalVersionsMappings = {
17: {
- '@mnajdova/enzyme-adapter-react-18': 'npm:@eps1lon/enzyme-adapter-react-17',
'@testing-library/react': '^12.1.0',
},
};
@@ -82,8 +81,6 @@ async function main(version) {
// At this moment all dist tags reference React 18 version, so we don't need
// to update these dependencies unless an older version is used, or when the
// next/experimental dist tag reference to a future version of React
- // packageJson.devDependencies['@mnajdova/enzyme-adapter-react-18'] =
- // 'npm:@mnajdova/enzyme-adapter-react-next';
// packageJson.devDependencies['@testing-library/react'] = 'alpha';
if (majorVersion && additionalVersionsMappings[majorVersion]) {
diff --git a/test/README.md b/test/README.md
index a2b90eb92f500b..fe750b8bda099f 100644
--- a/test/README.md
+++ b/test/README.md
@@ -18,7 +18,6 @@ Thanks for writing tests! Here's a quick run-down on our current setup.
- [Karma](https://karma-runner.github.io/latest/index.html)
- [Playwright](https://playwright.dev/)
- [jsdom](https://github.com/jsdom/jsdom)
-- [enzyme](https://airbnb.io/enzyme/) (old tests only)
## Writing tests
diff --git a/test/karma.conf.js b/test/karma.conf.js
index 4002f93ca893b1..998491a3ba9ac0 100644
--- a/test/karma.conf.js
+++ b/test/karma.conf.js
@@ -119,7 +119,7 @@ module.exports = function setKarmaConfig(config) {
'process.env.TEST_GATE': JSON.stringify(process.env.TEST_GATE),
}),
new webpack.ProvidePlugin({
- // required by enzyme > cheerio > parse5 > util
+ // required by code accessing `process.env` in the browser
process: 'process/browser.js',
}),
],
@@ -189,10 +189,8 @@ module.exports = function setKarmaConfig(config) {
// needed by sourcemap
fs: false,
path: false,
- // needed by enzyme > cheerio
+ // Exclude polyfill and treat 'stream' as an empty module since it is not required. next -> gzip-size relies on it.
stream: false,
- // required by enzyme > cheerio > parse5
- util: require.resolve('util/'),
vm: false,
},
},
diff --git a/test/karma.conf.profile.js b/test/karma.conf.profile.js
index 4482e12b7983dc..ec06840bee9602 100644
--- a/test/karma.conf.profile.js
+++ b/test/karma.conf.profile.js
@@ -81,7 +81,7 @@ module.exports = function setKarmaConfig(config) {
'process.env.TEST_GATE': JSON.stringify('enable-dispatching-profiler'),
}),
new webpack.ProvidePlugin({
- // required by enzyme > cheerio > parse5 > util
+ // required by code accessing `process.env` in the browser
process: 'process/browser.js',
}),
],
@@ -108,7 +108,7 @@ module.exports = function setKarmaConfig(config) {
// needed by sourcemap
fs: false,
path: false,
- // needed by enzyme > cheerio
+ // Exclude polyfill and treat 'stream' as an empty module since it is not required. next -> gzip-size relies on it.
stream: false,
},
},
diff --git a/test/regressions/webpack.config.js b/test/regressions/webpack.config.js
index b4472eedd1cfe4..bd7c7e9fdc047c 100644
--- a/test/regressions/webpack.config.js
+++ b/test/regressions/webpack.config.js
@@ -25,7 +25,7 @@ module.exports = {
// Avoid bundling the whole @mui/icons-material package. x2 the bundling speed.
new webpack.IgnorePlugin({ resourceRegExp: /material-icons\/SearchIcons\.js/ }),
new webpack.ProvidePlugin({
- // required by enzyme > cheerio > parse5 > util
+ // required by code accessing `process.env` in the browser
process: 'process/browser.js',
}),
],
@@ -57,10 +57,8 @@ module.exports = {
fallback: {
// Exclude polyfill and treat 'fs' as an empty module since it is not required. next -> gzip-size relies on it.
fs: false,
- // needed by enzyme > cheerio
+ // Exclude polyfill and treat 'stream' as an empty module since it is not required. next -> gzip-size relies on it.
stream: false,
- // required by enzyme > cheerio > parse5
- util: require.resolve('util/'),
// Exclude polyfill and treat 'zlib' as an empty module since it is not required. next -> gzip-size relies on it.
zlib: false,
},
From 21c95e7ab2f820a9e4d55d1da3cb68ff51c3318d Mon Sep 17 00:00:00 2001
From: wbt
Date: Wed, 26 Jun 2024 15:02:54 -0400
Subject: [PATCH 53/65] [material-ui][Autocomplete] Fix more React 18.3 key
spread warnings in demos (#42639)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: wbt
Co-authored-by: Aarón García Hervás
---
.../components/autocomplete/CheckboxesTags.js | 25 ++---
.../autocomplete/CheckboxesTags.tsx | 25 ++---
.../components/autocomplete/CountrySelect.js | 32 ++++---
.../components/autocomplete/CountrySelect.tsx | 32 ++++---
.../autocomplete/FreeSoloCreateOption.js | 9 +-
.../autocomplete/FreeSoloCreateOption.tsx | 9 +-
.../FreeSoloCreateOptionDialog.js | 9 +-
.../FreeSoloCreateOptionDialog.tsx | 9 +-
.../components/autocomplete/GitHubLabel.js | 93 ++++++++++---------
.../components/autocomplete/GitHubLabel.tsx | 93 ++++++++++---------
.../autocomplete/GloballyCustomizedOptions.js | 34 ++++---
.../GloballyCustomizedOptions.tsx | 34 ++++---
.../components/autocomplete/GoogleMaps.js | 4 +-
.../components/autocomplete/GoogleMaps.tsx | 4 +-
.../components/autocomplete/Highlights.js | 3 +-
.../components/autocomplete/Highlights.tsx | 3 +-
.../autocomplete/UseAutocomplete.js | 11 ++-
.../autocomplete/UseAutocomplete.tsx | 11 ++-
.../autocomplete/UseAutocomplete.tsx.preview | 11 ++-
.../components/autocomplete/Virtualize.js | 4 +-
.../components/autocomplete/Virtualize.tsx | 4 +-
21 files changed, 272 insertions(+), 187 deletions(-)
diff --git a/docs/data/material/components/autocomplete/CheckboxesTags.js b/docs/data/material/components/autocomplete/CheckboxesTags.js
index a07f37a4c05cd2..df72ec9733c6af 100644
--- a/docs/data/material/components/autocomplete/CheckboxesTags.js
+++ b/docs/data/material/components/autocomplete/CheckboxesTags.js
@@ -16,17 +16,20 @@ export default function CheckboxesTags() {
options={top100Films}
disableCloseOnSelect
getOptionLabel={(option) => option.title}
- renderOption={(props, option, { selected }) => (
-
-
- {option.title}
-
- )}
+ renderOption={(props, option, { selected }) => {
+ const { key, ...optionProps } = props;
+ return (
+
+
+ {option.title}
+
+ );
+ }}
style={{ width: 500 }}
renderInput={(params) => (
diff --git a/docs/data/material/components/autocomplete/CheckboxesTags.tsx b/docs/data/material/components/autocomplete/CheckboxesTags.tsx
index a07f37a4c05cd2..df72ec9733c6af 100644
--- a/docs/data/material/components/autocomplete/CheckboxesTags.tsx
+++ b/docs/data/material/components/autocomplete/CheckboxesTags.tsx
@@ -16,17 +16,20 @@ export default function CheckboxesTags() {
options={top100Films}
disableCloseOnSelect
getOptionLabel={(option) => option.title}
- renderOption={(props, option, { selected }) => (
-
-
- {option.title}
-
- )}
+ renderOption={(props, option, { selected }) => {
+ const { key, ...optionProps } = props;
+ return (
+
+
+ {option.title}
+
+ );
+ }}
style={{ width: 500 }}
renderInput={(params) => (
diff --git a/docs/data/material/components/autocomplete/CountrySelect.js b/docs/data/material/components/autocomplete/CountrySelect.js
index d9b9dc9a348435..47353368939fa7 100644
--- a/docs/data/material/components/autocomplete/CountrySelect.js
+++ b/docs/data/material/components/autocomplete/CountrySelect.js
@@ -11,18 +11,26 @@ export default function CountrySelect() {
options={countries}
autoHighlight
getOptionLabel={(option) => option.label}
- renderOption={(props, option) => (
- img': { mr: 2, flexShrink: 0 } }} {...props}>
-
- {option.label} ({option.code}) +{option.phone}
-
- )}
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+ img': { mr: 2, flexShrink: 0 } }}
+ {...optionProps}
+ >
+
+ {option.label} ({option.code}) +{option.phone}
+
+ );
+ }}
renderInput={(params) => (
option.label}
- renderOption={(props, option) => (
- img': { mr: 2, flexShrink: 0 } }} {...props}>
-
- {option.label} ({option.code}) +{option.phone}
-
- )}
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+ img': { mr: 2, flexShrink: 0 } }}
+ {...optionProps}
+ >
+
+ {option.label} ({option.code}) +{option.phone}
+
+ );
+ }}
renderInput={(params) => (
{option.title} }
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {option.title}
+
+ );
+ }}
sx={{ width: 300 }}
freeSolo
renderInput={(params) => (
diff --git a/docs/data/material/components/autocomplete/FreeSoloCreateOption.tsx b/docs/data/material/components/autocomplete/FreeSoloCreateOption.tsx
index d95cb137a1614d..ff7e52523be26b 100644
--- a/docs/data/material/components/autocomplete/FreeSoloCreateOption.tsx
+++ b/docs/data/material/components/autocomplete/FreeSoloCreateOption.tsx
@@ -56,7 +56,14 @@ export default function FreeSoloCreateOption() {
// Regular option
return option.title;
}}
- renderOption={(props, option) => {option.title} }
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {option.title}
+
+ );
+ }}
sx={{ width: 300 }}
freeSolo
renderInput={(params) => (
diff --git a/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.js b/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.js
index 22516f183d3bb1..ffccefc33aa8e1 100644
--- a/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.js
+++ b/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.js
@@ -87,7 +87,14 @@ export default function FreeSoloCreateOptionDialog() {
selectOnFocus
clearOnBlur
handleHomeEndKeys
- renderOption={(props, option) => {option.title} }
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {option.title}
+
+ );
+ }}
sx={{ width: 300 }}
freeSolo
renderInput={(params) => }
diff --git a/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.tsx b/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.tsx
index 779b26e26d6d17..5179e050b1dd73 100644
--- a/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.tsx
+++ b/docs/data/material/components/autocomplete/FreeSoloCreateOptionDialog.tsx
@@ -87,7 +87,14 @@ export default function FreeSoloCreateOptionDialog() {
selectOnFocus
clearOnBlur
handleHomeEndKeys
- renderOption={(props, option) => {option.title} }
+ renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {option.title}
+
+ );
+ }}
sx={{ width: 300 }}
freeSolo
renderInput={(params) => }
diff --git a/docs/data/material/components/autocomplete/GitHubLabel.js b/docs/data/material/components/autocomplete/GitHubLabel.js
index 736811a4d81a35..9117f91608283e 100644
--- a/docs/data/material/components/autocomplete/GitHubLabel.js
+++ b/docs/data/material/components/autocomplete/GitHubLabel.js
@@ -214,51 +214,54 @@ export default function GitHubLabel() {
disableCloseOnSelect
renderTags={() => null}
noOptionsText="No labels"
- renderOption={(props, option, { selected }) => (
-
-
-
- ({
- flexGrow: 1,
- '& span': {
- color: '#8b949e',
- ...t.applyStyles('light', {
- color: '#586069',
- }),
- },
- })}
- >
- {option.name}
-
- {option.description}
-
-
-
- )}
+ renderOption={(props, option, { selected }) => {
+ const { key, ...optionProps } = props;
+ return (
+
+
+
+ ({
+ flexGrow: 1,
+ '& span': {
+ color: '#8b949e',
+ ...t.applyStyles('light', {
+ color: '#586069',
+ }),
+ },
+ })}
+ >
+ {option.name}
+
+ {option.description}
+
+
+
+ );
+ }}
options={[...labels].sort((a, b) => {
// Display the selected labels first.
let ai = value.indexOf(a);
diff --git a/docs/data/material/components/autocomplete/GitHubLabel.tsx b/docs/data/material/components/autocomplete/GitHubLabel.tsx
index a5421b2dc736fb..c322f58b7e5352 100644
--- a/docs/data/material/components/autocomplete/GitHubLabel.tsx
+++ b/docs/data/material/components/autocomplete/GitHubLabel.tsx
@@ -222,51 +222,54 @@ export default function GitHubLabel() {
disableCloseOnSelect
renderTags={() => null}
noOptionsText="No labels"
- renderOption={(props, option, { selected }) => (
-
-
-
- ({
- flexGrow: 1,
- '& span': {
- color: '#8b949e',
- ...t.applyStyles('light', {
- color: '#586069',
- }),
- },
- })}
- >
- {option.name}
-
- {option.description}
-
-
-
- )}
+ renderOption={(props, option, { selected }) => {
+ const { key, ...optionProps } = props;
+ return (
+
+
+
+ ({
+ flexGrow: 1,
+ '& span': {
+ color: '#8b949e',
+ ...t.applyStyles('light', {
+ color: '#586069',
+ }),
+ },
+ })}
+ >
+ {option.name}
+
+ {option.description}
+
+
+
+ );
+ }}
options={[...labels].sort((a, b) => {
// Display the selected labels first.
let ai = value.indexOf(a);
diff --git a/docs/data/material/components/autocomplete/GloballyCustomizedOptions.js b/docs/data/material/components/autocomplete/GloballyCustomizedOptions.js
index 8f0327c5227592..a70d241612db37 100644
--- a/docs/data/material/components/autocomplete/GloballyCustomizedOptions.js
+++ b/docs/data/material/components/autocomplete/GloballyCustomizedOptions.js
@@ -14,21 +14,25 @@ const customTheme = (outerTheme) =>
components: {
MuiAutocomplete: {
defaultProps: {
- renderOption: (props, option, state, ownerState) => (
-
- {ownerState.getOptionLabel(option)}
-
- ),
+ renderOption: (props, option, state, ownerState) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {ownerState.getOptionLabel(option)}
+
+ );
+ },
},
},
},
diff --git a/docs/data/material/components/autocomplete/GloballyCustomizedOptions.tsx b/docs/data/material/components/autocomplete/GloballyCustomizedOptions.tsx
index 3ec3840e00292a..1e68b3116c830e 100644
--- a/docs/data/material/components/autocomplete/GloballyCustomizedOptions.tsx
+++ b/docs/data/material/components/autocomplete/GloballyCustomizedOptions.tsx
@@ -14,21 +14,25 @@ const customTheme = (outerTheme: Theme) =>
components: {
MuiAutocomplete: {
defaultProps: {
- renderOption: (props, option, state, ownerState) => (
-
- {ownerState.getOptionLabel(option)}
-
- ),
+ renderOption: (props, option, state, ownerState) => {
+ const { key, ...optionProps } = props;
+ return (
+
+ {ownerState.getOptionLabel(option)}
+
+ );
+ },
},
},
},
diff --git a/docs/data/material/components/autocomplete/GoogleMaps.js b/docs/data/material/components/autocomplete/GoogleMaps.js
index 90168362e2f93d..0287e024d5de19 100644
--- a/docs/data/material/components/autocomplete/GoogleMaps.js
+++ b/docs/data/material/components/autocomplete/GoogleMaps.js
@@ -113,6 +113,7 @@ export default function GoogleMaps() {
)}
renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
const matches =
option.structured_formatting.main_text_matched_substrings || [];
@@ -120,9 +121,8 @@ export default function GoogleMaps() {
option.structured_formatting.main_text,
matches.map((match) => [match.offset, match.offset + match.length]),
);
-
return (
-
+
diff --git a/docs/data/material/components/autocomplete/GoogleMaps.tsx b/docs/data/material/components/autocomplete/GoogleMaps.tsx
index 1b855645eed1a9..b52bd46bd7f7ad 100644
--- a/docs/data/material/components/autocomplete/GoogleMaps.tsx
+++ b/docs/data/material/components/autocomplete/GoogleMaps.tsx
@@ -137,6 +137,7 @@ export default function GoogleMaps() {
)}
renderOption={(props, option) => {
+ const { key, ...optionProps } = props;
const matches =
option.structured_formatting.main_text_matched_substrings || [];
@@ -144,9 +145,8 @@ export default function GoogleMaps() {
option.structured_formatting.main_text,
matches.map((match: any) => [match.offset, match.offset + match.length]),
);
-
return (
-
+
diff --git a/docs/data/material/components/autocomplete/Highlights.js b/docs/data/material/components/autocomplete/Highlights.js
index 7d5c6950dcde81..12b34cdc5d37ef 100644
--- a/docs/data/material/components/autocomplete/Highlights.js
+++ b/docs/data/material/components/autocomplete/Highlights.js
@@ -14,11 +14,12 @@ export default function Highlights() {
)}
renderOption={(props, option, { inputValue }) => {
+ const { key, ...optionProps } = props;
const matches = match(option.title, inputValue, { insideWords: true });
const parts = parse(option.title, matches);
return (
-
+
{parts.map((part, index) => (
)}
renderOption={(props, option, { inputValue }) => {
+ const { key, ...optionProps } = props;
const matches = match(option.title, inputValue, { insideWords: true });
const parts = parse(option.title, matches);
return (
-
+
{parts.map((part, index) => (
{groupedOptions.length > 0 ? (
- {groupedOptions.map((option, index) => (
- {option.title}
- ))}
+ {groupedOptions.map((option, index) => {
+ const { key, ...optionProps } = getOptionProps({ option, index });
+ return (
+
+ {option.title}
+
+ );
+ })}
) : null}
diff --git a/docs/data/material/components/autocomplete/UseAutocomplete.tsx b/docs/data/material/components/autocomplete/UseAutocomplete.tsx
index 0af0a01184ba2e..2e30c245fcf5a4 100644
--- a/docs/data/material/components/autocomplete/UseAutocomplete.tsx
+++ b/docs/data/material/components/autocomplete/UseAutocomplete.tsx
@@ -63,9 +63,14 @@ export default function UseAutocomplete() {
{groupedOptions.length > 0 ? (
- {(groupedOptions as typeof top100Films).map((option, index) => (
- {option.title}
- ))}
+ {(groupedOptions as typeof top100Films).map((option, index) => {
+ const { key, ...optionProps } = getOptionProps({ option, index });
+ return (
+
+ {option.title}
+
+ );
+ })}
) : null}
diff --git a/docs/data/material/components/autocomplete/UseAutocomplete.tsx.preview b/docs/data/material/components/autocomplete/UseAutocomplete.tsx.preview
index e53e8c231f0d5a..10f7a19d40e215 100644
--- a/docs/data/material/components/autocomplete/UseAutocomplete.tsx.preview
+++ b/docs/data/material/components/autocomplete/UseAutocomplete.tsx.preview
@@ -4,8 +4,13 @@
{groupedOptions.length > 0 ? (
- {(groupedOptions as typeof top100Films).map((option, index) => (
- {option.title}
- ))}
+ {(groupedOptions as typeof top100Films).map((option, index) => {
+ const { key, ...optionProps } = getOptionProps({ option, index });
+ return (
+
+ {option.title}
+
+ );
+ })}
) : null}
\ No newline at end of file
diff --git a/docs/data/material/components/autocomplete/Virtualize.js b/docs/data/material/components/autocomplete/Virtualize.js
index ba0162eda8ef04..72c0cfa455bc3e 100644
--- a/docs/data/material/components/autocomplete/Virtualize.js
+++ b/docs/data/material/components/autocomplete/Virtualize.js
@@ -27,8 +27,10 @@ function renderRow(props) {
);
}
+ const { key, ...optionProps } = dataSet[0];
+
return (
-
+
{`#${dataSet[2] + 1} - ${dataSet[1]}`}
);
diff --git a/docs/data/material/components/autocomplete/Virtualize.tsx b/docs/data/material/components/autocomplete/Virtualize.tsx
index 7d7dab92ebd8c4..cfa2ccd1a91e93 100644
--- a/docs/data/material/components/autocomplete/Virtualize.tsx
+++ b/docs/data/material/components/autocomplete/Virtualize.tsx
@@ -26,8 +26,10 @@ function renderRow(props: ListChildComponentProps) {
);
}
+ const { key, ...optionProps } = dataSet[0];
+
return (
-
+
{`#${dataSet[2] + 1} - ${dataSet[1]}`}
);
From efa16f0f1e3e32904ff1ae8190f49b98a44c069a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aar=C3=B3n=20Garc=C3=ADa=20Herv=C3=A1s?=
Date: Wed, 26 Jun 2024 21:04:44 +0200
Subject: [PATCH 54/65] [material-ui][docs] Fix type error in virtualized table
demo (#42757)
---
.../data/material/components/table/ReactVirtualizedTable.js | 4 ++--
.../material/components/table/ReactVirtualizedTable.tsx | 6 ++++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docs/data/material/components/table/ReactVirtualizedTable.js b/docs/data/material/components/table/ReactVirtualizedTable.js
index b710f62196b84c..e39dbe378d5ac9 100644
--- a/docs/data/material/components/table/ReactVirtualizedTable.js
+++ b/docs/data/material/components/table/ReactVirtualizedTable.js
@@ -64,8 +64,8 @@ const VirtuosoTableComponents = {
Table: (props) => (
),
- TableHead,
- TableRow: ({ item: _item, ...props }) => ,
+ TableHead: React.forwardRef((props, ref) => ),
+ TableRow,
TableBody: React.forwardRef((props, ref) => ),
};
diff --git a/docs/data/material/components/table/ReactVirtualizedTable.tsx b/docs/data/material/components/table/ReactVirtualizedTable.tsx
index c21f1c4f94fa68..bff9541d511f81 100644
--- a/docs/data/material/components/table/ReactVirtualizedTable.tsx
+++ b/docs/data/material/components/table/ReactVirtualizedTable.tsx
@@ -89,8 +89,10 @@ const VirtuosoTableComponents: TableComponents = {
Table: (props) => (
),
- TableHead,
- TableRow: ({ item: _item, ...props }) => ,
+ TableHead: React.forwardRef((props, ref) => (
+
+ )),
+ TableRow,
TableBody: React.forwardRef((props, ref) => (
)),
From 2383dedad5bea4e377298ff1cf5f1f39a5667dff Mon Sep 17 00:00:00 2001
From: sai chand <60743144+sai6855@users.noreply.github.com>
Date: Thu, 27 Jun 2024 00:52:02 +0530
Subject: [PATCH 55/65] [material-ui][Modal] migrate useSlotProps to useSLot
(#42150)
---
packages/mui-material/src/Modal/Modal.js | 47 +++++++++++--------
packages/mui-material/src/Modal/Modal.test.js | 1 -
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/packages/mui-material/src/Modal/Modal.js b/packages/mui-material/src/Modal/Modal.js
index c3868f0f0e3cdd..feb588bc59c2b6 100644
--- a/packages/mui-material/src/Modal/Modal.js
+++ b/packages/mui-material/src/Modal/Modal.js
@@ -4,7 +4,6 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import HTMLElementType from '@mui/utils/HTMLElementType';
import elementAcceptingRef from '@mui/utils/elementAcceptingRef';
-import { useSlotProps } from '@mui/base/utils';
import { unstable_useModal as useModal } from '@mui/base/unstable_useModal';
import composeClasses from '@mui/utils/composeClasses';
import FocusTrap from '../Unstable_TrapFocus';
@@ -13,6 +12,8 @@ import { styled } from '../zero-styled';
import { useDefaultProps } from '../DefaultPropsProvider';
import Backdrop from '../Backdrop';
import { getModalUtilityClass } from './modalClasses';
+import useSlot from '../utils/useSlot';
+import { useForkRef } from '../utils';
const useUtilityClasses = (ownerState) => {
const { open, exited, classes } = ownerState;
@@ -99,8 +100,8 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
onTransitionEnter,
onTransitionExited,
open,
- slotProps,
- slots,
+ slotProps = {},
+ slots = {},
// eslint-disable-next-line react/prop-types
theme,
...other
@@ -151,16 +152,21 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
childProps.onExited = onExited;
}
- const RootSlot = slots?.root ?? components.Root ?? ModalRoot;
- const BackdropSlot = slots?.backdrop ?? components.Backdrop ?? BackdropComponent;
-
- const rootSlotProps = slotProps?.root ?? componentsProps.root;
- const backdropSlotProps = slotProps?.backdrop ?? componentsProps.backdrop;
+ const externalForwardedProps = {
+ slots: {
+ root: components.Root,
+ backdrop: components.Backdrop,
+ ...slots,
+ },
+ slotProps: {
+ ...componentsProps,
+ ...slotProps,
+ },
+ };
- const rootProps = useSlotProps({
- elementType: RootSlot,
- externalSlotProps: rootSlotProps,
- externalForwardedProps: other,
+ const [RootSlot, rootProps] = useSlot('root', {
+ elementType: ModalRoot,
+ externalForwardedProps,
getSlotProps: getRootProps,
additionalProps: {
ref,
@@ -169,15 +175,14 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
ownerState,
className: clsx(
className,
- rootSlotProps?.className,
classes?.root,
!ownerState.open && ownerState.exited && classes?.hidden,
),
});
- const backdropProps = useSlotProps({
- elementType: BackdropSlot,
- externalSlotProps: backdropSlotProps,
+ const [BackdropSlot, backdropProps] = useSlot('backdrop', {
+ elementType: BackdropComponent,
+ externalForwardedProps,
additionalProps: BackdropProps,
getSlotProps: (otherHandlers) => {
return getBackdropProps({
@@ -192,10 +197,12 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
},
});
},
- className: clsx(backdropSlotProps?.className, BackdropProps?.className, classes?.backdrop),
+ className: clsx(BackdropProps?.className, classes?.backdrop),
ownerState,
});
+ const backdropRef = useForkRef(BackdropProps?.ref, backdropProps.ref);
+
if (!keepMounted && !open && (!hasTransition || exited)) {
return null;
}
@@ -208,8 +215,10 @@ const Modal = React.forwardRef(function Modal(inProps, ref) {
* is not meant for humans to interact with directly.
* https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/docs/rules/no-static-element-interactions.md
*/}
-
- {!hideBackdrop && BackdropComponent ? : null}
+
+ {!hideBackdrop && BackdropComponent ? (
+
+ ) : null}
', () => {
'themeDefaultProps', // portal, can't determine the root
'themeStyleOverrides', // portal, can't determine the root
'reactTestRenderer', // portal https://github.com/facebook/react/issues/11565
- 'slotPropsCallback', // not supported yet
],
}),
);
From 2888995e2834b758d727193699cad8044d41cdb1 Mon Sep 17 00:00:00 2001
From: cjl750
Date: Wed, 26 Jun 2024 14:22:37 -0500
Subject: [PATCH 56/65] [docs][material-ui][theme] Add documentation on
migrating JSS's alternative, array-based syntax to syntax supported by
Emotion (#42053)
---
.../migration-v4/v5-style-changes.md | 79 ++++++++++++++++++-
1 file changed, 77 insertions(+), 2 deletions(-)
diff --git a/docs/data/material/migration/migration-v4/v5-style-changes.md b/docs/data/material/migration/migration-v4/v5-style-changes.md
index 1f907c24ca3c25..a7b50d3e9c741f 100644
--- a/docs/data/material/migration/migration-v4/v5-style-changes.md
+++ b/docs/data/material/migration/migration-v4/v5-style-changes.md
@@ -29,12 +29,14 @@ All other changes must be handled manually.
## Migrate theme styleOverrides to Emotion
+### Refactor local rule references
+
Although your style overrides defined in the theme may partially work, there is an important difference regarding how the nested elements are styled.
The `$` syntax (local rule reference) used with JSS will not work with Emotion.
You need to replace those selectors with a valid class selector.
-### Replace state class names
+#### Replace state class names
```diff
const theme = createTheme({
@@ -53,7 +55,7 @@ You need to replace those selectors with a valid class selector.
});
```
-### Replace nested classes selectors with global class names
+#### Replace nested classes selectors with global class names
```diff
const theme = createTheme({
@@ -99,6 +101,79 @@ You can rely on this instead of hardcoding the classes.
Take a look at the complete [list of global state classnames](/material-ui/customization/how-to-customize/#state-classes) available.
+### Refactor alternative syntax for space- and comma-separated values
+
+The alternative, array-based syntax JSS supports for space- and comma-separated values is not supported by Emotion.
+
+#### Replace array-based values with string-based values
+
+**Before**
+
+```jsx
+const theme = createTheme({
+ overrides: {
+ MuiBox: {
+ root: {
+ background: [
+ ['url(image1.png)', 'no-repeat', 'top'],
+ ['url(image2.png)', 'no-repeat', 'center'],
+ '!important',
+ ],
+ },
+ },
+ },
+});
+```
+
+**After**
+
+```jsx
+const theme = createTheme({
+ components: {
+ MuiBox: {
+ styleOverrides: {
+ root: {
+ background:
+ 'url(image1.png) no-repeat top, url(image2.png) no-repeat center !important',
+ },
+ },
+ },
+ },
+});
+```
+
+Be sure to add units to numeric values as appropriate.
+
+**Before**
+
+```jsx
+const theme = createTheme({
+ overrides: {
+ MuiOutlinedInput: {
+ root: {
+ padding: [[5, 8, 6]],
+ },
+ },
+ },
+});
+```
+
+**After**
+
+```jsx
+const theme = createTheme({
+ components: {
+ MuiOutlinedInput: {
+ styleOverrides: {
+ root: {
+ padding: '5px 8px 6px',
+ },
+ },
+ },
+ },
+});
+```
+
## ref
### Refactor non-ref-forwarding class components
From 4780aeb10f9aa74f483307960e110dcb68fecea4 Mon Sep 17 00:00:00 2001
From: JiYeon <73057489+appleSimple@users.noreply.github.com>
Date: Thu, 27 Jun 2024 04:41:44 +0900
Subject: [PATCH 57/65] [material-ui][Text Field] when click password
visibility button, text caret position change to very front. (#42595)
---
.../material/components/text-fields/InputAdornments.js | 7 +++++++
.../material/components/text-fields/InputAdornments.tsx | 7 +++++++
2 files changed, 14 insertions(+)
diff --git a/docs/data/material/components/text-fields/InputAdornments.js b/docs/data/material/components/text-fields/InputAdornments.js
index 39a5c219e43d2e..4176586ca9e943 100644
--- a/docs/data/material/components/text-fields/InputAdornments.js
+++ b/docs/data/material/components/text-fields/InputAdornments.js
@@ -21,6 +21,10 @@ export default function InputAdornments() {
event.preventDefault();
};
+ const handleMouseUpPassword = (event) => {
+ event.preventDefault();
+ };
+
return (
@@ -56,6 +60,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
edge="end"
>
{showPassword ?
:
}
@@ -108,6 +113,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
edge="end"
>
{showPassword ?
:
}
@@ -158,6 +164,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
>
{showPassword ?
:
}
diff --git a/docs/data/material/components/text-fields/InputAdornments.tsx b/docs/data/material/components/text-fields/InputAdornments.tsx
index a347354809a2fc..661945ed50b13f 100644
--- a/docs/data/material/components/text-fields/InputAdornments.tsx
+++ b/docs/data/material/components/text-fields/InputAdornments.tsx
@@ -21,6 +21,10 @@ export default function InputAdornments() {
event.preventDefault();
};
+ const handleMouseUpPassword = (event: React.MouseEvent
) => {
+ event.preventDefault();
+ };
+
return (
@@ -56,6 +60,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
edge="end"
>
{showPassword ?
:
}
@@ -108,6 +113,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
edge="end"
>
{showPassword ?
:
}
@@ -158,6 +164,7 @@ export default function InputAdornments() {
aria-label="toggle password visibility"
onClick={handleClickShowPassword}
onMouseDown={handleMouseDownPassword}
+ onMouseUp={handleMouseUpPassword}
>
{showPassword ?
:
}
From a3f76456fc3cc70f176f3e7fc65746f62b11ef62 Mon Sep 17 00:00:00 2001
From: Jan Potoms <2109932+Janpot@users.noreply.github.com>
Date: Wed, 26 Jun 2024 22:23:19 +0200
Subject: [PATCH 58/65] [docs] Fix link in CONTRIBUTING.md (#42755)
Signed-off-by: Jan Potoms <2109932+Janpot@users.noreply.github.com>
---
CONTRIBUTING.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 55cfa20ae6c9cf..374c20efe88a41 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -162,7 +162,7 @@ The following statements must be true:
- The code is linted. If the code was changed, run `pnpm eslint`.
- The code is type-safe. If TypeScript sources or declarations were changed, run `pnpm typescript` to confirm that the check passes.
- The API docs are up to date. If API was changed, run `pnpm proptypes && pnpm docs:api`.
-- The demos are up to date. If demos were changed, run `pnpm docs:typescript:formatted`. See [about writing demos](#3-write-the-content-of-the-demo).
+- The demos are up to date. If demos were changed, run `pnpm docs:typescript:formatted`. See [about writing demos](#2-write-the-demo-code).
- The pull request title follows the pattern `[product-name][Component] Imperative commit message`. (See: [How to Write a Git Commit Message](https://chris.beams.io/posts/git-commit/) for a great explanation).
Don't worry if you miss a step—the Continuous Integration will run a thorough set of tests on your commits, and the maintainers of the project can assist you if you run into problems.
From 20565ce83eeea3954c4ce74c7e27d133d9a8c52c Mon Sep 17 00:00:00 2001
From: Siriwat K
Date: Thu, 27 Jun 2024 12:03:45 +0700
Subject: [PATCH 59/65] [material-ui] Export Pigment CSS layout components
(#42693)
---
apps/local-ui-lib/package.json | 2 +-
apps/pigment-css-next-app/package.json | 4 +-
.../app/material-ui/react-container/page.tsx | 26 ++
.../src/app/material-ui/react-grid/page.tsx | 73 ++++
.../src/app/material-ui/react-stack/page.tsx | 53 +++
apps/pigment-css-next-app/src/app/page.tsx | 172 +++++----
apps/pigment-css-vite-app/package.json | 4 +-
.../components/container/container.md | 2 +-
docs/data/material/components/grid2/grid2.md | 1 +
.../data/material/components/hidden/hidden.md | 2 +-
docs/data/material/components/stack/stack.md | 2 +-
docs/data/material/pagesApi.js | 4 +
.../material-ui/api/pigment-container.js | 23 ++
.../material-ui/api/pigment-container.json | 32 ++
docs/pages/material-ui/api/pigment-grid.js | 23 ++
docs/pages/material-ui/api/pigment-grid.json | 69 ++++
docs/pages/material-ui/api/pigment-hidden.js | 23 ++
.../pages/material-ui/api/pigment-hidden.json | 42 ++
docs/pages/material-ui/api/pigment-stack.js | 23 ++
docs/pages/material-ui/api/pigment-stack.json | 38 ++
.../pigment-container/pigment-container.json | 19 +
.../api-docs/pigment-grid/pigment-grid.json | 28 ++
.../pigment-hidden/pigment-hidden.json | 44 +++
.../api-docs/pigment-stack/pigment-stack.json | 15 +
package.json | 2 +-
.../materialUi/projectSettings.ts | 8 +-
.../utils/createTypeScriptProject.ts | 41 +-
packages/mui-material/package.json | 4 +
...iddenCssClasses.js => hiddenCssClasses.ts} | 2 +-
.../PigmentContainer.spec.tsx | 11 +
.../src/PigmentContainer/PigmentContainer.tsx | 156 ++++++++
.../src/PigmentContainer/index.ts | 3 +
.../src/PigmentGrid/PigmentGrid.spec.tsx | 18 +
.../src/PigmentGrid/PigmentGrid.tsx | 289 ++++++++++++++
.../mui-material/src/PigmentGrid/index.ts | 3 +
.../src/PigmentHidden/PigmentHidden.tsx | 360 ++++++++++++++++++
.../mui-material/src/PigmentHidden/index.ts | 2 +
.../src/PigmentStack/PigmentStack.spec.tsx | 13 +
.../src/PigmentStack/PigmentStack.tsx | 136 +++++++
.../mui-material/src/PigmentStack/index.ts | 3 +
.../src/Unstable_Grid/gridGenerator.ts | 2 +-
packages/rsc-builder/buildRsc.ts | 3 +
pnpm-lock.yaml | 57 +--
43 files changed, 1707 insertions(+), 130 deletions(-)
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-container/page.tsx
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-grid/page.tsx
create mode 100644 apps/pigment-css-next-app/src/app/material-ui/react-stack/page.tsx
create mode 100644 docs/pages/material-ui/api/pigment-container.js
create mode 100644 docs/pages/material-ui/api/pigment-container.json
create mode 100644 docs/pages/material-ui/api/pigment-grid.js
create mode 100644 docs/pages/material-ui/api/pigment-grid.json
create mode 100644 docs/pages/material-ui/api/pigment-hidden.js
create mode 100644 docs/pages/material-ui/api/pigment-hidden.json
create mode 100644 docs/pages/material-ui/api/pigment-stack.js
create mode 100644 docs/pages/material-ui/api/pigment-stack.json
create mode 100644 docs/translations/api-docs/pigment-container/pigment-container.json
create mode 100644 docs/translations/api-docs/pigment-grid/pigment-grid.json
create mode 100644 docs/translations/api-docs/pigment-hidden/pigment-hidden.json
create mode 100644 docs/translations/api-docs/pigment-stack/pigment-stack.json
rename packages/mui-material/src/Hidden/{hiddenCssClasses.js => hiddenCssClasses.ts} (89%)
create mode 100644 packages/mui-material/src/PigmentContainer/PigmentContainer.spec.tsx
create mode 100644 packages/mui-material/src/PigmentContainer/PigmentContainer.tsx
create mode 100644 packages/mui-material/src/PigmentContainer/index.ts
create mode 100644 packages/mui-material/src/PigmentGrid/PigmentGrid.spec.tsx
create mode 100644 packages/mui-material/src/PigmentGrid/PigmentGrid.tsx
create mode 100644 packages/mui-material/src/PigmentGrid/index.ts
create mode 100644 packages/mui-material/src/PigmentHidden/PigmentHidden.tsx
create mode 100644 packages/mui-material/src/PigmentHidden/index.ts
create mode 100644 packages/mui-material/src/PigmentStack/PigmentStack.spec.tsx
create mode 100644 packages/mui-material/src/PigmentStack/PigmentStack.tsx
create mode 100644 packages/mui-material/src/PigmentStack/index.ts
diff --git a/apps/local-ui-lib/package.json b/apps/local-ui-lib/package.json
index 5171ceed5e70b8..66f3077adca4dc 100644
--- a/apps/local-ui-lib/package.json
+++ b/apps/local-ui-lib/package.json
@@ -3,6 +3,6 @@
"version": "0.0.1",
"private": true,
"dependencies": {
- "@pigment-css/react": "^0.0.13"
+ "@pigment-css/react": "^0.0.16"
}
}
diff --git a/apps/pigment-css-next-app/package.json b/apps/pigment-css-next-app/package.json
index 8e04aed38ed3e9..1bdc678cdbf0e3 100644
--- a/apps/pigment-css-next-app/package.json
+++ b/apps/pigment-css-next-app/package.json
@@ -9,7 +9,7 @@
"clean": "rimraf .next"
},
"dependencies": {
- "@pigment-css/react": "^0.0.13",
+ "@pigment-css/react": "^0.0.16",
"@mui/utils": "workspace:^",
"@mui/base": "workspace:^",
"@mui/lab": "workspace:^",
@@ -24,7 +24,7 @@
"next": "latest"
},
"devDependencies": {
- "@pigment-css/nextjs-plugin": "^0.0.14",
+ "@pigment-css/nextjs-plugin": "^0.0.16",
"@types/node": "^20.5.7",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-container/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-container/page.tsx
new file mode 100644
index 00000000000000..29f358acebe6db
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-container/page.tsx
@@ -0,0 +1,26 @@
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import Container from '@mui/material/PigmentContainer';
+
+export default function ContainerPage() {
+ return (
+
+
+ Fixed Container
+
+
+
+
+
+
+
+ Simple Container
+
+
+
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-grid/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-grid/page.tsx
new file mode 100644
index 00000000000000..95d73163427a61
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-grid/page.tsx
@@ -0,0 +1,73 @@
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import Paper from '@mui/material/Paper';
+import Grid from '@mui/material/PigmentGrid';
+import { styled } from '@pigment-css/react';
+
+const Item = styled(Paper)(({ theme }) => ({
+ backgroundColor: '#fff',
+ ...theme.typography.body2,
+ padding: theme.spacing(1),
+ textAlign: 'center',
+ color: theme.palette.text.secondary,
+ ...theme.applyStyles('dark', {
+ backgroundColor: '#1A2027',
+ }),
+}));
+
+export default function GridPage() {
+ return (
+
+
+ Basic Grid
+
+
+
+
+ - xs=8
+
+
+ - xs=4
+
+
+ - xs=4
+
+
+ - xs=8
+
+
+
+
+
+
+ Columns Grid
+
+
+
+
+ - xs=8
+
+
+ - xs=8
+
+
+
+
+
+
+ Responsive Grid
+
+
+
+ {Array.from(Array(6)).map((_, index) => (
+
+ - xs=2
+
+ ))}
+
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-next-app/src/app/material-ui/react-stack/page.tsx b/apps/pigment-css-next-app/src/app/material-ui/react-stack/page.tsx
new file mode 100644
index 00000000000000..4c541461688a3f
--- /dev/null
+++ b/apps/pigment-css-next-app/src/app/material-ui/react-stack/page.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react';
+import Divider from '@mui/material/Divider';
+import Paper from '@mui/material/Paper';
+import Stack from '@mui/material/PigmentStack';
+import { styled } from '@pigment-css/react';
+
+const Item = styled(Paper)(({ theme }) => ({
+ backgroundColor: '#fff',
+ ...theme.typography.body2,
+ padding: theme.spacing(1),
+ textAlign: 'center',
+ color: theme.palette.text.secondary,
+ ...theme.applyStyles('dark', {
+ backgroundColor: '#1A2027',
+ }),
+}));
+
+export default function StackPage() {
+ return (
+
+
+ Basic Stack
+
+
+ - Item 1
+ - Item 2
+ - Item 3
+
+
+
+
+ Divider Stack
+
+ } spacing={2}>
+ - Item 1
+ - Item 2
+ - Item 3
+
+
+
+
+ Responsive Stack
+
+
+ - Item 1
+ - Item 2
+ - Item 3
+
+
+
+
+ );
+}
diff --git a/apps/pigment-css-next-app/src/app/page.tsx b/apps/pigment-css-next-app/src/app/page.tsx
index 0a9b3811f9974d..9b5daea6b2749e 100644
--- a/apps/pigment-css-next-app/src/app/page.tsx
+++ b/apps/pigment-css-next-app/src/app/page.tsx
@@ -1,5 +1,8 @@
import Image from 'next/image';
import { styled, css } from '@pigment-css/react';
+import PigmentStack from '@mui/material/PigmentStack';
+import PigmentContainer from '@mui/material/PigmentContainer';
+import PigmentHidden from '@mui/material/PigmentHidden';
import styles from './page.module.css';
const visuallyHidden = css({
@@ -91,92 +94,101 @@ const Description = styled.div({
export default function Home() {
return (
-
- I am invisible
-
-
- Get started by editing
- src/app/page.tsx
-
-
-
+
+
+
);
}
diff --git a/apps/pigment-css-vite-app/package.json b/apps/pigment-css-vite-app/package.json
index dae2d664aa2454..4f48388ce9d5a0 100644
--- a/apps/pigment-css-vite-app/package.json
+++ b/apps/pigment-css-vite-app/package.json
@@ -9,7 +9,7 @@
"build": "vite build"
},
"dependencies": {
- "@pigment-css/react": "^0.0.13",
+ "@pigment-css/react": "^0.0.16",
"@mui/utils": "workspace:^",
"@mui/base": "workspace:^",
"@mui/lab": "workspace:^",
@@ -27,7 +27,7 @@
"devDependencies": {
"@babel/preset-react": "^7.24.7",
"@babel/preset-typescript": "^7.24.7",
- "@pigment-css/vite-plugin": "^0.0.13",
+ "@pigment-css/vite-plugin": "^0.0.16",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.1",
diff --git a/docs/data/material/components/container/container.md b/docs/data/material/components/container/container.md
index c585be2d5e869b..89d84bcde96a0f 100644
--- a/docs/data/material/components/container/container.md
+++ b/docs/data/material/components/container/container.md
@@ -1,7 +1,7 @@
---
productId: material-ui
title: React Container component
-components: Container
+components: Container, PigmentContainer
githubLabel: 'component: Container'
---
diff --git a/docs/data/material/components/grid2/grid2.md b/docs/data/material/components/grid2/grid2.md
index 9027f29218cd76..8159a29db601b1 100644
--- a/docs/data/material/components/grid2/grid2.md
+++ b/docs/data/material/components/grid2/grid2.md
@@ -1,6 +1,7 @@
---
productId: material-ui
title: React Grid component
+components: PigmentGrid
githubLabel: 'component: Grid'
materialDesign: https://m2.material.io/design/layout/understanding-layout.html
---
diff --git a/docs/data/material/components/hidden/hidden.md b/docs/data/material/components/hidden/hidden.md
index d1e62eb96deac6..767f500da24623 100644
--- a/docs/data/material/components/hidden/hidden.md
+++ b/docs/data/material/components/hidden/hidden.md
@@ -2,7 +2,7 @@
productId: material-ui
title: React Hidden component
description: The Hidden component is deprecated, check out the migration guide for more details.
-components: Hidden
+components: Hidden, PigmentHidden
githubLabel: 'component: Hidden'
---
diff --git a/docs/data/material/components/stack/stack.md b/docs/data/material/components/stack/stack.md
index 6ab6a6db2a419f..c85249440829e6 100644
--- a/docs/data/material/components/stack/stack.md
+++ b/docs/data/material/components/stack/stack.md
@@ -1,7 +1,7 @@
---
productId: material-ui
title: React Stack component
-components: Stack
+components: Stack, PigmentStack
githubLabel: 'component: Stack'
---
diff --git a/docs/data/material/pagesApi.js b/docs/data/material/pagesApi.js
index 7bb6fe6df78aa8..377857c79e5dff 100644
--- a/docs/data/material/pagesApi.js
+++ b/docs/data/material/pagesApi.js
@@ -80,6 +80,10 @@ module.exports = [
{ pathname: '/material-ui/api/pagination' },
{ pathname: '/material-ui/api/pagination-item' },
{ pathname: '/material-ui/api/paper' },
+ { pathname: '/material-ui/api/pigment-container' },
+ { pathname: '/material-ui/api/pigment-grid' },
+ { pathname: '/material-ui/api/pigment-hidden' },
+ { pathname: '/material-ui/api/pigment-stack' },
{ pathname: '/material-ui/api/popover' },
{ pathname: '/material-ui/api/popper' },
{ pathname: '/material-ui/api/radio' },
diff --git a/docs/pages/material-ui/api/pigment-container.js b/docs/pages/material-ui/api/pigment-container.js
new file mode 100644
index 00000000000000..aefeab0eb60f9f
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-container.js
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import ApiPage from 'docs/src/modules/components/ApiPage';
+import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
+import jsonPageContent from './pigment-container.json';
+
+export default function Page(props) {
+ const { descriptions, pageContent } = props;
+ return ;
+}
+
+Page.getInitialProps = () => {
+ const req = require.context(
+ 'docs/translations/api-docs/pigment-container',
+ false,
+ /\.\/pigment-container.*.json$/,
+ );
+ const descriptions = mapApiPageTranslations(req);
+
+ return {
+ descriptions,
+ pageContent: jsonPageContent,
+ };
+};
diff --git a/docs/pages/material-ui/api/pigment-container.json b/docs/pages/material-ui/api/pigment-container.json
new file mode 100644
index 00000000000000..6ae3b5e82d37ad
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-container.json
@@ -0,0 +1,32 @@
+{
+ "props": {
+ "classes": { "type": { "name": "object" }, "additionalInfo": { "cssApi": true } },
+ "disableGutters": { "type": { "name": "bool" }, "default": "false" },
+ "fixed": { "type": { "name": "bool" }, "default": "false" },
+ "maxWidth": {
+ "type": {
+ "name": "enum",
+ "description": "'lg' | 'md' | 'sm' | 'xl' | 'xs' | false"
+ },
+ "default": "'lg'"
+ },
+ "sx": {
+ "type": {
+ "name": "union",
+ "description": "Array<func | object | bool> | func | object"
+ },
+ "additionalInfo": { "sx": true }
+ }
+ },
+ "name": "PigmentContainer",
+ "imports": [
+ "import PigmentContainer from '@mui/material/PigmentContainer';",
+ "import { PigmentContainer } from '@mui/material';"
+ ],
+ "classes": [],
+ "muiName": "MuiPigmentContainer",
+ "filename": "/packages/mui-material/src/PigmentContainer/PigmentContainer.tsx",
+ "inheritance": null,
+ "demos": "",
+ "cssComponent": false
+}
diff --git a/docs/pages/material-ui/api/pigment-grid.js b/docs/pages/material-ui/api/pigment-grid.js
new file mode 100644
index 00000000000000..2bffa857c20998
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-grid.js
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import ApiPage from 'docs/src/modules/components/ApiPage';
+import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
+import jsonPageContent from './pigment-grid.json';
+
+export default function Page(props) {
+ const { descriptions, pageContent } = props;
+ return ;
+}
+
+Page.getInitialProps = () => {
+ const req = require.context(
+ 'docs/translations/api-docs/pigment-grid',
+ false,
+ /\.\/pigment-grid.*.json$/,
+ );
+ const descriptions = mapApiPageTranslations(req);
+
+ return {
+ descriptions,
+ pageContent: jsonPageContent,
+ };
+};
diff --git a/docs/pages/material-ui/api/pigment-grid.json b/docs/pages/material-ui/api/pigment-grid.json
new file mode 100644
index 00000000000000..2932f5752dc897
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-grid.json
@@ -0,0 +1,69 @@
+{
+ "props": {
+ "children": { "type": { "name": "node" } },
+ "columns": {
+ "type": {
+ "name": "union",
+ "description": "Array<number> | number | object"
+ },
+ "default": "12"
+ },
+ "columnSpacing": {
+ "type": {
+ "name": "union",
+ "description": "Array<number | string> | number | object | string"
+ }
+ },
+ "container": { "type": { "name": "bool" }, "default": "false" },
+ "direction": {
+ "type": {
+ "name": "union",
+ "description": "'column' | 'column-reverse' | 'row' | 'row-reverse' | Array<'column' | 'column-reverse' | 'row' | 'row-reverse'> | object"
+ },
+ "default": "'row'"
+ },
+ "offset": {
+ "type": {
+ "name": "union",
+ "description": "Array<number> | number | object"
+ }
+ },
+ "rowSpacing": {
+ "type": {
+ "name": "union",
+ "description": "Array<number | string> | number | object | string"
+ }
+ },
+ "size": {
+ "type": {
+ "name": "union",
+ "description": "Array<number> | number | object"
+ }
+ },
+ "spacing": {
+ "type": {
+ "name": "union",
+ "description": "Array<number | string> | number | object | string"
+ },
+ "default": "0"
+ },
+ "wrap": {
+ "type": {
+ "name": "enum",
+ "description": "'nowrap' | 'wrap-reverse' | 'wrap'"
+ },
+ "default": "'wrap'"
+ }
+ },
+ "name": "PigmentGrid",
+ "imports": [
+ "import PigmentGrid from '@mui/material/PigmentGrid';",
+ "import { PigmentGrid } from '@mui/material';"
+ ],
+ "classes": [],
+ "muiName": "MuiPigmentGrid",
+ "filename": "/packages/mui-material/src/PigmentGrid/PigmentGrid.tsx",
+ "inheritance": null,
+ "demos": "",
+ "cssComponent": false
+}
diff --git a/docs/pages/material-ui/api/pigment-hidden.js b/docs/pages/material-ui/api/pigment-hidden.js
new file mode 100644
index 00000000000000..644fd9bb4ddd26
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-hidden.js
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import ApiPage from 'docs/src/modules/components/ApiPage';
+import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
+import jsonPageContent from './pigment-hidden.json';
+
+export default function Page(props) {
+ const { descriptions, pageContent } = props;
+ return ;
+}
+
+Page.getInitialProps = () => {
+ const req = require.context(
+ 'docs/translations/api-docs/pigment-hidden',
+ false,
+ /\.\/pigment-hidden.*.json$/,
+ );
+ const descriptions = mapApiPageTranslations(req);
+
+ return {
+ descriptions,
+ pageContent: jsonPageContent,
+ };
+};
diff --git a/docs/pages/material-ui/api/pigment-hidden.json b/docs/pages/material-ui/api/pigment-hidden.json
new file mode 100644
index 00000000000000..577a02ebe804b6
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-hidden.json
@@ -0,0 +1,42 @@
+{
+ "props": {
+ "children": { "type": { "name": "node" } },
+ "implementation": {
+ "type": { "name": "enum", "description": "'css' | 'js'" },
+ "default": "'js'"
+ },
+ "initialWidth": {
+ "type": {
+ "name": "enum",
+ "description": "'lg' | 'md' | 'sm' | 'xl' | 'xs'"
+ }
+ },
+ "lgDown": { "type": { "name": "bool" }, "default": "false" },
+ "lgUp": { "type": { "name": "bool" }, "default": "false" },
+ "mdDown": { "type": { "name": "bool" }, "default": "false" },
+ "mdUp": { "type": { "name": "bool" }, "default": "false" },
+ "only": {
+ "type": {
+ "name": "union",
+ "description": "'lg' | 'md' | 'sm' | 'xl' | 'xs' | Array<'lg' | 'md' | 'sm' | 'xl' | 'xs'>"
+ }
+ },
+ "smDown": { "type": { "name": "bool" }, "default": "false" },
+ "smUp": { "type": { "name": "bool" }, "default": "false" },
+ "xlDown": { "type": { "name": "bool" }, "default": "false" },
+ "xlUp": { "type": { "name": "bool" }, "default": "false" },
+ "xsDown": { "type": { "name": "bool" }, "default": "false" },
+ "xsUp": { "type": { "name": "bool" }, "default": "false" }
+ },
+ "name": "PigmentHidden",
+ "imports": [
+ "import PigmentHidden from '@mui/material/PigmentHidden';",
+ "import { PigmentHidden } from '@mui/material';"
+ ],
+ "classes": [],
+ "muiName": "MuiPigmentHidden",
+ "filename": "/packages/mui-material/src/PigmentHidden/PigmentHidden.tsx",
+ "inheritance": null,
+ "demos": "",
+ "cssComponent": false
+}
diff --git a/docs/pages/material-ui/api/pigment-stack.js b/docs/pages/material-ui/api/pigment-stack.js
new file mode 100644
index 00000000000000..47d4892cfa198d
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-stack.js
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import ApiPage from 'docs/src/modules/components/ApiPage';
+import mapApiPageTranslations from 'docs/src/modules/utils/mapApiPageTranslations';
+import jsonPageContent from './pigment-stack.json';
+
+export default function Page(props) {
+ const { descriptions, pageContent } = props;
+ return ;
+}
+
+Page.getInitialProps = () => {
+ const req = require.context(
+ 'docs/translations/api-docs/pigment-stack',
+ false,
+ /\.\/pigment-stack.*.json$/,
+ );
+ const descriptions = mapApiPageTranslations(req);
+
+ return {
+ descriptions,
+ pageContent: jsonPageContent,
+ };
+};
diff --git a/docs/pages/material-ui/api/pigment-stack.json b/docs/pages/material-ui/api/pigment-stack.json
new file mode 100644
index 00000000000000..02aafc2d4a936f
--- /dev/null
+++ b/docs/pages/material-ui/api/pigment-stack.json
@@ -0,0 +1,38 @@
+{
+ "props": {
+ "children": { "type": { "name": "node" } },
+ "direction": {
+ "type": {
+ "name": "union",
+ "description": "'column-reverse' | 'column' | 'row-reverse' | 'row' | Array<'column-reverse' | 'column' | 'row-reverse' | 'row'> | { lg?: 'column-reverse' | 'column' | 'row-reverse' | 'row', md?: 'column-reverse' | 'column' | 'row-reverse' | 'row', sm?: 'column-reverse' | 'column' | 'row-reverse' | 'row', xl?: 'column-reverse' | 'column' | 'row-reverse' | 'row', xs?: 'column-reverse' | 'column' | 'row-reverse' | 'row' }"
+ },
+ "default": "'column'"
+ },
+ "divider": { "type": { "name": "node" } },
+ "spacing": {
+ "type": {
+ "name": "union",
+ "description": "Array<number | string> | number | { lg?: number | string, md?: number | string, sm?: number | string, xl?: number | string, xs?: number | string } | string"
+ },
+ "default": "0"
+ },
+ "sx": {
+ "type": {
+ "name": "union",
+ "description": "Array<func | object | bool> | func | object"
+ },
+ "additionalInfo": { "sx": true }
+ }
+ },
+ "name": "PigmentStack",
+ "imports": [
+ "import PigmentStack from '@mui/material/PigmentStack';",
+ "import { PigmentStack } from '@mui/material';"
+ ],
+ "classes": [],
+ "muiName": "MuiPigmentStack",
+ "filename": "/packages/mui-material/src/PigmentStack/PigmentStack.tsx",
+ "inheritance": null,
+ "demos": "",
+ "cssComponent": false
+}
diff --git a/docs/translations/api-docs/pigment-container/pigment-container.json b/docs/translations/api-docs/pigment-container/pigment-container.json
new file mode 100644
index 00000000000000..f890b94fca3865
--- /dev/null
+++ b/docs/translations/api-docs/pigment-container/pigment-container.json
@@ -0,0 +1,19 @@
+{
+ "componentDescription": "",
+ "propDescriptions": {
+ "classes": { "description": "Override or extend the styles applied to the component." },
+ "disableGutters": {
+ "description": "If true
, the left and right padding is removed."
+ },
+ "fixed": {
+ "description": "Set the max-width to match the min-width of the current breakpoint. This is useful if you'd prefer to design for a fixed set of sizes instead of trying to accommodate a fully fluid viewport. It's fluid by default."
+ },
+ "maxWidth": {
+ "description": "Determine the max-width of the container. The container width grows with the size of the screen. Set to false
to disable maxWidth
."
+ },
+ "sx": {
+ "description": "The system prop that allows defining system overrides as well as additional CSS styles."
+ }
+ },
+ "classDescriptions": {}
+}
diff --git a/docs/translations/api-docs/pigment-grid/pigment-grid.json b/docs/translations/api-docs/pigment-grid/pigment-grid.json
new file mode 100644
index 00000000000000..a25e109d10f8e4
--- /dev/null
+++ b/docs/translations/api-docs/pigment-grid/pigment-grid.json
@@ -0,0 +1,28 @@
+{
+ "componentDescription": "",
+ "propDescriptions": {
+ "children": { "description": "The content of the component." },
+ "columns": { "description": "The number of columns." },
+ "columnSpacing": {
+ "description": "Defines the horizontal space between the type item
components. It overrides the value of the spacing
prop."
+ },
+ "container": {
+ "description": "If true
, the component will have the flex container behavior. You should be wrapping items with a container ."
+ },
+ "direction": {
+ "description": "Defines the flex-direction
style property. It is applied for all screen sizes."
+ },
+ "offset": { "description": "Defines the offset of the grid." },
+ "rowSpacing": {
+ "description": "Defines the vertical space between the type item
components. It overrides the value of the spacing
prop."
+ },
+ "size": { "description": "Defines the column size of the grid." },
+ "spacing": {
+ "description": "Defines the space between the type item
components. It can only be used on a type container
component."
+ },
+ "wrap": {
+ "description": "Defines the flex-wrap
style property. It's applied for all screen sizes."
+ }
+ },
+ "classDescriptions": {}
+}
diff --git a/docs/translations/api-docs/pigment-hidden/pigment-hidden.json b/docs/translations/api-docs/pigment-hidden/pigment-hidden.json
new file mode 100644
index 00000000000000..bd79d32a2e3711
--- /dev/null
+++ b/docs/translations/api-docs/pigment-hidden/pigment-hidden.json
@@ -0,0 +1,44 @@
+{
+ "componentDescription": "",
+ "propDescriptions": {
+ "children": { "description": "The content of the component." },
+ "implementation": {
+ "description": "Specify which implementation to use. 'js' is the default, 'css' works better for server-side rendering."
+ },
+ "initialWidth": {
+ "description": "You can use this prop when choosing the js
implementation with server-side rendering. As window.innerWidth
is unavailable on the server, we default to rendering an empty component during the first mount. You might want to use a heuristic to approximate the screen width of the client browser screen width. For instance, you could be using the user-agent or the client-hints. https://caniuse.com/#search=client%20hint "
+ },
+ "lgDown": {
+ "description": "If true
, component is hidden on screens below (but not including) this size."
+ },
+ "lgUp": {
+ "description": "If true
, component is hidden on screens this size and above."
+ },
+ "mdDown": {
+ "description": "If true
, component is hidden on screens below (but not including) this size."
+ },
+ "mdUp": {
+ "description": "If true
, component is hidden on screens this size and above."
+ },
+ "only": { "description": "Hide the given breakpoint(s)." },
+ "smDown": {
+ "description": "If true
, component is hidden on screens below (but not including) this size."
+ },
+ "smUp": {
+ "description": "If true
, component is hidden on screens this size and above."
+ },
+ "xlDown": {
+ "description": "If true
, component is hidden on screens below (but not including) this size."
+ },
+ "xlUp": {
+ "description": "If true
, component is hidden on screens this size and above."
+ },
+ "xsDown": {
+ "description": "If true
, component is hidden on screens below (but not including) this size."
+ },
+ "xsUp": {
+ "description": "If true
, component is hidden on screens this size and above."
+ }
+ },
+ "classDescriptions": {}
+}
diff --git a/docs/translations/api-docs/pigment-stack/pigment-stack.json b/docs/translations/api-docs/pigment-stack/pigment-stack.json
new file mode 100644
index 00000000000000..f7269641da25bf
--- /dev/null
+++ b/docs/translations/api-docs/pigment-stack/pigment-stack.json
@@ -0,0 +1,15 @@
+{
+ "componentDescription": "",
+ "propDescriptions": {
+ "children": { "description": "The content of the component." },
+ "direction": {
+ "description": "Defines the flex-direction
style property. It is applied for all screen sizes."
+ },
+ "divider": { "description": "Add an element between each child." },
+ "spacing": { "description": "Defines the space between immediate children." },
+ "sx": {
+ "description": "The system prop, which allows defining system overrides as well as additional CSS styles."
+ }
+ },
+ "classDescriptions": {}
+}
diff --git a/package.json b/package.json
index faa5c4bd80018b..678d0b2da04229 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
"@mui/utils": "workspace:^",
"@next/eslint-plugin-next": "^14.2.4",
"@octokit/rest": "^20.1.1",
- "@pigment-css/react": "^0.0.13",
+ "@pigment-css/react": "^0.0.16",
"@playwright/test": "1.44.1",
"@types/fs-extra": "^11.0.4",
"@types/lodash": "^4.17.5",
diff --git a/packages/api-docs-builder-core/materialUi/projectSettings.ts b/packages/api-docs-builder-core/materialUi/projectSettings.ts
index ccac4f8f7dfd69..45b4b8ec90041a 100644
--- a/packages/api-docs-builder-core/materialUi/projectSettings.ts
+++ b/packages/api-docs-builder-core/materialUi/projectSettings.ts
@@ -16,7 +16,13 @@ export const projectSettings: ProjectSettings = {
{
name: 'material',
rootPath: path.join(process.cwd(), 'packages/mui-material'),
- entryPointPath: 'src/index.d.ts',
+ entryPointPath: [
+ 'src/index.d.ts',
+ 'src/PigmentStack/PigmentStack.tsx',
+ 'src/PigmentContainer/PigmentContainer.tsx',
+ 'src/PigmentHidden/PigmentHidden.tsx',
+ 'src/PigmentGrid/PigmentGrid.tsx',
+ ],
},
{
name: 'lab',
diff --git a/packages/api-docs-builder/utils/createTypeScriptProject.ts b/packages/api-docs-builder/utils/createTypeScriptProject.ts
index ba3b64e54df3c2..2965e6a9b063aa 100644
--- a/packages/api-docs-builder/utils/createTypeScriptProject.ts
+++ b/packages/api-docs-builder/utils/createTypeScriptProject.ts
@@ -22,9 +22,14 @@ export interface CreateTypeScriptProjectOptions {
/**
* File used as root of the package.
* This property is used to gather the exports of the project.
- * The path must be relative to the root path.
+ *
+ * Use an array to target more than one entrypoint.
+ *
+ * @example 'src/index.d.ts'
+ * @example ['src/index.d.ts', 'src/PigmentStack/PigmentStack.tsx']
+ * `PigmentStack` cannot be included in the `index.d.ts` file because it is using Pigment CSS specific API.
*/
- entryPointPath?: string;
+ entryPointPath?: string | string[];
/**
* Files to include in the project.
* By default, it will use the files defined in the tsconfig.
@@ -77,16 +82,30 @@ export const createTypeScriptProject = (
const checker = program.getTypeChecker();
- let exports: TypeScriptProject['exports'];
+ let exports: TypeScriptProject['exports'] = {};
if (inputEntryPointPath) {
- const entryPointPath = path.join(rootPath, inputEntryPointPath);
- const sourceFile = program.getSourceFile(entryPointPath);
-
- exports = Object.fromEntries(
- checker.getExportsOfModule(checker.getSymbolAtLocation(sourceFile!)!).map((symbol) => {
- return [symbol.name, symbol];
- }),
- );
+ const arrayEntryPointPath = Array.isArray(inputEntryPointPath)
+ ? inputEntryPointPath
+ : [inputEntryPointPath];
+ arrayEntryPointPath.forEach((entry) => {
+ const entryPointPath = path.join(rootPath, entry);
+ const sourceFile = program.getSourceFile(entryPointPath);
+
+ const pathData = path.parse(entryPointPath);
+
+ exports = {
+ ...exports,
+ ...Object.fromEntries(
+ checker.getExportsOfModule(checker.getSymbolAtLocation(sourceFile!)!).map((symbol) => {
+ return [symbol.name, symbol];
+ }),
+ ),
+ ...(pathData.name !== 'index' && {
+ // use the default export when the entrypoint is not `index`.
+ [pathData.name]: checker.getSymbolAtLocation(sourceFile!)!,
+ }),
+ };
+ });
} else {
exports = {};
}
diff --git a/packages/mui-material/package.json b/packages/mui-material/package.json
index 4f34ee48e82a28..7edd600adc791e 100644
--- a/packages/mui-material/package.json
+++ b/packages/mui-material/package.json
@@ -78,6 +78,7 @@
"peerDependencies": {
"@emotion/react": "^11.5.0",
"@emotion/styled": "^11.3.0",
+ "@pigment-css/react": "^0.0.16",
"@types/react": "^17.0.0 || ^18.0.0",
"react": "^17.0.0 || ^18.0.0",
"react-dom": "^17.0.0 || ^18.0.0"
@@ -91,6 +92,9 @@
},
"@emotion/styled": {
"optional": true
+ },
+ "@pigment-css/react": {
+ "optional": true
}
},
"sideEffects": false,
diff --git a/packages/mui-material/src/Hidden/hiddenCssClasses.js b/packages/mui-material/src/Hidden/hiddenCssClasses.ts
similarity index 89%
rename from packages/mui-material/src/Hidden/hiddenCssClasses.js
rename to packages/mui-material/src/Hidden/hiddenCssClasses.ts
index 123f9ba4b66230..bc120f1adb71ff 100644
--- a/packages/mui-material/src/Hidden/hiddenCssClasses.js
+++ b/packages/mui-material/src/Hidden/hiddenCssClasses.ts
@@ -1,7 +1,7 @@
import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
import generateUtilityClass from '@mui/utils/generateUtilityClass';
-export function getHiddenCssUtilityClass(slot) {
+export function getHiddenCssUtilityClass(slot: string) {
return generateUtilityClass('PrivateHiddenCss', slot);
}
diff --git a/packages/mui-material/src/PigmentContainer/PigmentContainer.spec.tsx b/packages/mui-material/src/PigmentContainer/PigmentContainer.spec.tsx
new file mode 100644
index 00000000000000..8a51c5ebab07df
--- /dev/null
+++ b/packages/mui-material/src/PigmentContainer/PigmentContainer.spec.tsx
@@ -0,0 +1,11 @@
+import * as React from 'react';
+import Container from '@mui/material/PigmentContainer';
+
+ ;
+ ;
+ ;
+ ;
+ ;
+
+// @ts-expect-error `maxWidth` is not a valid prop
+ ;
diff --git a/packages/mui-material/src/PigmentContainer/PigmentContainer.tsx b/packages/mui-material/src/PigmentContainer/PigmentContainer.tsx
new file mode 100644
index 00000000000000..2753a263b034b1
--- /dev/null
+++ b/packages/mui-material/src/PigmentContainer/PigmentContainer.tsx
@@ -0,0 +1,156 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import { OverridableComponent, OverrideProps } from '@mui/types';
+// @ts-ignore
+import Container from '@pigment-css/react/Container';
+import capitalize from '@mui/utils/capitalize';
+import composeClasses from '@mui/utils/composeClasses';
+import generateUtilityClass from '@mui/utils/generateUtilityClass';
+import { SxProps, Breakpoint } from '@mui/system';
+import { Theme } from '../styles';
+import { ContainerClasses } from '../Container/containerClasses';
+
+export interface PigmentContainerOwnProps {
+ children?: React.ReactNode;
+ /**
+ * Override or extend the styles applied to the component.
+ */
+ classes?: Partial;
+ /**
+ * If `true`, the left and right padding is removed.
+ * @default false
+ */
+ disableGutters?: boolean;
+ /**
+ * Set the max-width to match the min-width of the current breakpoint.
+ * This is useful if you'd prefer to design for a fixed set of sizes
+ * instead of trying to accommodate a fully fluid viewport.
+ * It's fluid by default.
+ * @default false
+ */
+ fixed?: boolean;
+ /**
+ * Determine the max-width of the container.
+ * The container width grows with the size of the screen.
+ * Set to `false` to disable `maxWidth`.
+ * @default 'lg'
+ */
+ maxWidth?: Breakpoint | false;
+ /**
+ * The system prop that allows defining system overrides as well as additional CSS styles.
+ */
+ sx?: SxProps;
+}
+
+export interface PigmentContainerTypeMap<
+ AdditionalProps = {},
+ RootComponent extends React.ElementType = 'div',
+> {
+ props: AdditionalProps & PigmentContainerOwnProps;
+ defaultComponent: RootComponent;
+}
+
+export type PigmentContainerProps<
+ RootComponent extends React.ElementType = PigmentContainerTypeMap['defaultComponent'],
+ AdditionalProps = {},
+> = OverrideProps, RootComponent> & {
+ component?: React.ElementType;
+};
+
+const useUtilityClasses = (ownerState: PigmentContainerOwnProps) => {
+ const { classes, fixed, disableGutters, maxWidth } = ownerState;
+
+ const slots = {
+ root: [
+ 'root',
+ maxWidth && `maxWidth${capitalize(String(maxWidth))}`,
+ fixed && 'fixed',
+ disableGutters && 'disableGutters',
+ ],
+ };
+
+ return composeClasses(slots, (slot) => generateUtilityClass('MuiContainer', slot), classes);
+};
+/**
+ *
+ * Demos:
+ *
+ * - [Container](https://next.mui.com/material-ui/react-container/)
+ *
+ * API:
+ *
+ * - [PigmentContainer API](https://next.mui.com/material-ui/api/pigment-container/)
+ */
+const PigmentContainer = React.forwardRef(function PigmentContainer(
+ { className, disableGutters = false, fixed = false, maxWidth = 'lg', ...props },
+ ref,
+) {
+ const ownerState = {
+ ...props,
+ disableGutters,
+ fixed,
+ maxWidth,
+ };
+ const classes = useUtilityClasses(ownerState);
+ return (
+
+ );
+}) as OverridableComponent;
+
+PigmentContainer.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * @ignore
+ */
+ children: PropTypes.node,
+ /**
+ * Override or extend the styles applied to the component.
+ */
+ classes: PropTypes.object,
+ /**
+ * @ignore
+ */
+ className: PropTypes.string,
+ /**
+ * If `true`, the left and right padding is removed.
+ * @default false
+ */
+ disableGutters: PropTypes.bool,
+ /**
+ * Set the max-width to match the min-width of the current breakpoint.
+ * This is useful if you'd prefer to design for a fixed set of sizes
+ * instead of trying to accommodate a fully fluid viewport.
+ * It's fluid by default.
+ * @default false
+ */
+ fixed: PropTypes.bool,
+ /**
+ * Determine the max-width of the container.
+ * The container width grows with the size of the screen.
+ * Set to `false` to disable `maxWidth`.
+ * @default 'lg'
+ */
+ maxWidth: PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs', false]),
+ /**
+ * The system prop that allows defining system overrides as well as additional CSS styles.
+ */
+ sx: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])),
+ PropTypes.func,
+ PropTypes.object,
+ ]),
+} as any;
+
+export default PigmentContainer;
diff --git a/packages/mui-material/src/PigmentContainer/index.ts b/packages/mui-material/src/PigmentContainer/index.ts
new file mode 100644
index 00000000000000..67dad4c894ebe3
--- /dev/null
+++ b/packages/mui-material/src/PigmentContainer/index.ts
@@ -0,0 +1,3 @@
+export { default } from './PigmentContainer';
+export * from './PigmentContainer';
+export { default as containerClasses } from '../Container/containerClasses';
diff --git a/packages/mui-material/src/PigmentGrid/PigmentGrid.spec.tsx b/packages/mui-material/src/PigmentGrid/PigmentGrid.spec.tsx
new file mode 100644
index 00000000000000..eaaa1bd40f56ba
--- /dev/null
+++ b/packages/mui-material/src/PigmentGrid/PigmentGrid.spec.tsx
@@ -0,0 +1,18 @@
+import * as React from 'react';
+import Grid from '@mui/material/PigmentGrid';
+
+ ;
+ ;
+ ;
+
+// @ts-expect-error `size` is not a valid prop
+ ;
+
+ ;
+ ;
+ ;
+ ;
+ ;
+ ;
+ ;
+ ;
diff --git a/packages/mui-material/src/PigmentGrid/PigmentGrid.tsx b/packages/mui-material/src/PigmentGrid/PigmentGrid.tsx
new file mode 100644
index 00000000000000..fad246bc48cb0f
--- /dev/null
+++ b/packages/mui-material/src/PigmentGrid/PigmentGrid.tsx
@@ -0,0 +1,289 @@
+import * as React from 'react';
+import clsx from 'clsx';
+import PropTypes from 'prop-types';
+import { OverridableComponent, OverrideProps } from '@mui/types';
+import { SxProps } from '@mui/system';
+// @ts-ignore
+import Grid from '@pigment-css/react/Grid';
+import composeClasses from '@mui/utils/composeClasses';
+import generateUtilityClass from '@mui/utils/generateUtilityClass';
+import {
+ generateDirectionClasses,
+ generateSizeClassNames,
+ generateSpacingClassNames,
+} from '@mui/system/Unstable_Grid/gridGenerator';
+import { Breakpoint, Theme } from '../styles';
+
+type ResponsiveStyleValue = T | Array | { [key in Breakpoint]?: T | null };
+
+export type GridDirection = 'row' | 'row-reverse' | 'column' | 'column-reverse';
+
+export type GridSpacing = number | string;
+
+export type GridWrap = 'nowrap' | 'wrap' | 'wrap-reverse';
+
+export type GridSize = 'auto' | 'grow' | number;
+
+export interface GridBaseProps {
+ /**
+ * The content of the component.
+ */
+ children?: React.ReactNode;
+ /**
+ * The number of columns.
+ * @default 12
+ */
+ columns?: ResponsiveStyleValue;
+ /**
+ * Defines the horizontal space between the type `item` components.
+ * It overrides the value of the `spacing` prop.
+ */
+ columnSpacing?: ResponsiveStyleValue;
+ /**
+ * If `true`, the component will have the flex *container* behavior.
+ * You should be wrapping *items* with a *container*.
+ * @default false
+ */
+ container?: boolean;
+ /**
+ * Defines the `flex-direction` style property.
+ * It is applied for all screen sizes.
+ * @default 'row'
+ */
+ direction?: ResponsiveStyleValue;
+ /**
+ * Defines the offset of the grid.
+ */
+ offset?: ResponsiveStyleValue | undefined;
+ /**
+ * @internal
+ * The level of the grid starts from `0`
+ * and increases when the grid nests inside another grid regardless of container or item.
+ *
+ * ```js
+ * // level 0
+ * // level 1
+ * // level 2
+ * // level 1
+ * ```
+ *
+ * Only consecutive grid is considered nesting.
+ * A grid container will start at `0` if there are non-Grid element above it.
+ *
+ * ```js
+ * // level 0
+ *
+ *
// level 0
+ * // level 1
+ * ```
+ */
+ unstable_level?: number;
+ /**
+ * Defines the vertical space between the type `item` components.
+ * It overrides the value of the `spacing` prop.
+ */
+ rowSpacing?: ResponsiveStyleValue;
+ /**
+ * Defines the space between the type `item` components.
+ * It can only be used on a type `container` component.
+ * @default 0
+ */
+ spacing?: ResponsiveStyleValue | undefined;
+ /**
+ * Defines the column size of the grid.
+ */
+ size?: ResponsiveStyleValue | undefined;
+ /**
+ * Defines the `flex-wrap` style property.
+ * It's applied for all screen sizes.
+ * @default 'wrap'
+ */
+ wrap?: GridWrap;
+}
+
+export interface GridTypeMap<
+ AdditionalProps = {},
+ DefaultComponent extends React.ElementType = 'div',
+> {
+ props: AdditionalProps & GridBaseProps & { sx?: SxProps };
+ defaultComponent: DefaultComponent;
+}
+
+export type GridProps<
+ RootComponent extends React.ElementType = GridTypeMap['defaultComponent'],
+ AdditionalProps = {
+ component?: React.ElementType;
+ },
+> = OverrideProps, RootComponent>;
+
+const useUtilityClasses = (ownerState: GridBaseProps) => {
+ const { container, direction, size, spacing } = ownerState;
+ let gridSize = {};
+ if (size) {
+ if (Array.isArray(size)) {
+ size.forEach((value, index) => {
+ gridSize = { ...gridSize, [index]: value };
+ });
+ }
+ if (typeof size === 'object') {
+ gridSize = size;
+ }
+ }
+ const slots = {
+ root: [
+ 'root',
+ container && 'container',
+ ...generateDirectionClasses(direction),
+ ...generateSizeClassNames(gridSize),
+ ...(container ? generateSpacingClassNames(spacing) : []),
+ ],
+ };
+
+ return composeClasses(slots, (slot: string) => generateUtilityClass('MuiGrid2', slot), {});
+};
+/**
+ *
+ * Demos:
+ *
+ * - [Grid version 2](https://next.mui.com/material-ui/react-grid2/)
+ *
+ * API:
+ *
+ * - [PigmentGrid API](https://next.mui.com/material-ui/api/pigment-grid/)
+ */
+const PigmentGrid = React.forwardRef(function PigmentGrid(props, ref) {
+ const { className, ...other } = props;
+
+ const classes = useUtilityClasses(props);
+
+ return ;
+}) as OverridableComponent;
+
+PigmentGrid.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * The content of the component.
+ */
+ children: PropTypes.node,
+ /**
+ * @ignore
+ */
+ className: PropTypes.string,
+ /**
+ * The number of columns.
+ * @default 12
+ */
+ columns: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.number),
+ PropTypes.number,
+ PropTypes.object,
+ ]),
+ /**
+ * Defines the horizontal space between the type `item` components.
+ * It overrides the value of the `spacing` prop.
+ */
+ columnSpacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired),
+ PropTypes.number,
+ PropTypes.object,
+ PropTypes.string,
+ ]),
+ /**
+ * If `true`, the component will have the flex *container* behavior.
+ * You should be wrapping *items* with a *container*.
+ * @default false
+ */
+ container: PropTypes.bool,
+ /**
+ * Defines the `flex-direction` style property.
+ * It is applied for all screen sizes.
+ * @default 'row'
+ */
+ direction: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.oneOf(['column', 'column-reverse', 'row', 'row-reverse']),
+ PropTypes.arrayOf(PropTypes.oneOf(['column', 'column-reverse', 'row', 'row-reverse'])),
+ PropTypes.object,
+ ]),
+ /**
+ * Defines the offset of the grid.
+ */
+ offset: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.number),
+ PropTypes.number,
+ PropTypes.object,
+ ]),
+ /**
+ * Defines the vertical space between the type `item` components.
+ * It overrides the value of the `spacing` prop.
+ */
+ rowSpacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired),
+ PropTypes.number,
+ PropTypes.object,
+ PropTypes.string,
+ ]),
+ /**
+ * Defines the column size of the grid.
+ */
+ size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.number),
+ PropTypes.number,
+ PropTypes.object,
+ ]),
+ /**
+ * Defines the space between the type `item` components.
+ * It can only be used on a type `container` component.
+ * @default 0
+ */
+ spacing: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired),
+ PropTypes.number,
+ PropTypes.object,
+ PropTypes.string,
+ ]),
+ /**
+ * @ignore
+ */
+ sx: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])),
+ PropTypes.func,
+ PropTypes.object,
+ ]),
+ /**
+ * @internal
+ * The level of the grid starts from `0`
+ * and increases when the grid nests inside another grid regardless of container or item.
+ *
+ * ```js
+ * // level 0
+ * // level 1
+ * // level 2
+ * // level 1
+ * ```
+ *
+ * Only consecutive grid is considered nesting.
+ * A grid container will start at `0` if there are non-Grid element above it.
+ *
+ * ```js
+ * // level 0
+ *
+ *
// level 0
+ * // level 1
+ * ```
+ */
+ unstable_level: PropTypes.number,
+ /**
+ * Defines the `flex-wrap` style property.
+ * It's applied for all screen sizes.
+ * @default 'wrap'
+ */
+ wrap: PropTypes.oneOf(['nowrap', 'wrap-reverse', 'wrap']),
+} as any;
+
+// @ts-ignore internal logic for nested grid
+PigmentGrid.muiName = 'Grid';
+
+export default PigmentGrid;
diff --git a/packages/mui-material/src/PigmentGrid/index.ts b/packages/mui-material/src/PigmentGrid/index.ts
new file mode 100644
index 00000000000000..9be62559663f67
--- /dev/null
+++ b/packages/mui-material/src/PigmentGrid/index.ts
@@ -0,0 +1,3 @@
+export { default } from './PigmentGrid';
+export * from './PigmentGrid';
+export { default as grid2Classes } from '../Unstable_Grid2/grid2Classes';
diff --git a/packages/mui-material/src/PigmentHidden/PigmentHidden.tsx b/packages/mui-material/src/PigmentHidden/PigmentHidden.tsx
new file mode 100644
index 00000000000000..7f33f5fc3abe5a
--- /dev/null
+++ b/packages/mui-material/src/PigmentHidden/PigmentHidden.tsx
@@ -0,0 +1,360 @@
+'use client';
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import { Breakpoint } from '@mui/system';
+// @ts-ignore
+import Hidden from '@pigment-css/react/Hidden';
+import capitalize from '@mui/utils/capitalize';
+import composeClasses from '@mui/utils/composeClasses';
+import HiddenJs from '../Hidden/HiddenJs';
+import { getHiddenCssUtilityClass } from '../Hidden/hiddenCssClasses';
+import { useTheme } from '../zero-styled';
+
+export interface HiddenProps {
+ /**
+ * The content of the component.
+ */
+ children?: React.ReactNode;
+ /**
+ * Specify which implementation to use. 'js' is the default, 'css' works better for
+ * server-side rendering.
+ * @default 'js'
+ */
+ implementation?: 'js' | 'css';
+ /**
+ * You can use this prop when choosing the `js` implementation with server-side rendering.
+ *
+ * As `window.innerWidth` is unavailable on the server,
+ * we default to rendering an empty component during the first mount.
+ * You might want to use a heuristic to approximate
+ * the screen width of the client browser screen width.
+ *
+ * For instance, you could be using the user-agent or the client-hints.
+ * https://caniuse.com/#search=client%20hint
+ */
+ initialWidth?: Breakpoint;
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ lgDown?: boolean;
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ lgUp?: boolean;
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ mdDown?: boolean;
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ mdUp?: boolean;
+ /**
+ * Hide the given breakpoint(s).
+ */
+ only?: Breakpoint | Breakpoint[];
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ smDown?: boolean;
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ smUp?: boolean;
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xlDown?: boolean;
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xlUp?: boolean;
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xsDown?: boolean;
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xsUp?: boolean;
+}
+
+const useUtilityClasses = (ownerState: {
+ classes: Record;
+ breakpoints: Array<{ breakpoint: string; dir: string }>;
+}) => {
+ const { classes, breakpoints } = ownerState;
+
+ const slots = {
+ root: [
+ 'root',
+ ...breakpoints.map(({ breakpoint, dir }) => {
+ return dir === 'only'
+ ? `${dir}${capitalize(breakpoint)}`
+ : `${breakpoint}${capitalize(dir)}`;
+ }),
+ ],
+ };
+
+ return composeClasses(slots, getHiddenCssUtilityClass, classes);
+};
+
+function HiddenCss(props: HiddenProps & { className?: string }) {
+ const theme = useTheme();
+ const { children, className, only, ...other } = props;
+
+ if (process.env.NODE_ENV !== 'production') {
+ const unknownProps = Object.keys(other).filter((propName) => {
+ const isUndeclaredBreakpoint = !theme.breakpoints.keys.some((breakpoint) => {
+ return `${breakpoint}Up` === propName || `${breakpoint}Down` === propName;
+ });
+ return !['classes', 'theme', 'isRtl', 'sx'].includes(propName) && isUndeclaredBreakpoint;
+ });
+
+ if (unknownProps.length > 0) {
+ console.error(
+ `MUI: Unsupported props received by \` \`: ${unknownProps.join(
+ ', ',
+ )}. Did you forget to wrap this component in a ThemeProvider declaring these breakpoints?`,
+ );
+ }
+ }
+
+ const breakpoints = [];
+
+ for (let i = 0; i < theme.breakpoints.keys.length; i += 1) {
+ const breakpoint = theme.breakpoints.keys[i];
+ const breakpointUp = other[`${breakpoint}Up`];
+ const breakpointDown = other[`${breakpoint}Down`];
+
+ if (breakpointUp) {
+ breakpoints.push({ breakpoint, dir: 'up' });
+ }
+ if (breakpointDown) {
+ breakpoints.push({ breakpoint, dir: 'down' });
+ }
+ }
+
+ if (only) {
+ const onlyBreakpoints = Array.isArray(only) ? only : [only];
+ onlyBreakpoints.forEach((breakpoint) => {
+ breakpoints.push({ breakpoint, dir: 'only' });
+ });
+ }
+
+ const ownerState = {
+ ...props,
+ classes: {},
+ breakpoints,
+ };
+
+ const classes = useUtilityClasses(ownerState);
+
+ return ;
+}
+
+HiddenCss.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * The content of the component.
+ */
+ children: PropTypes.node,
+ className: PropTypes.string,
+ /**
+ * Specify which implementation to use. 'js' is the default, 'css' works better for
+ * server-side rendering.
+ * @default 'js'
+ */
+ implementation: PropTypes.oneOf(['css', 'js']),
+ /**
+ * You can use this prop when choosing the `js` implementation with server-side rendering.
+ *
+ * As `window.innerWidth` is unavailable on the server,
+ * we default to rendering an empty component during the first mount.
+ * You might want to use a heuristic to approximate
+ * the screen width of the client browser screen width.
+ *
+ * For instance, you could be using the user-agent or the client-hints.
+ * https://caniuse.com/#search=client%20hint
+ */
+ initialWidth: PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']),
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ lgDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ lgUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ mdDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ mdUp: PropTypes.bool,
+ /**
+ * Hide the given breakpoint(s).
+ */
+ only: PropTypes.oneOfType([
+ PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']),
+ PropTypes.arrayOf(PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']).isRequired),
+ ]),
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ smDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ smUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xlDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xlUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xsDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xsUp: PropTypes.bool,
+} as any;
+/**
+ *
+ * Demos:
+ *
+ * - [Hidden](https://next.mui.com/material-ui/react-hidden/)
+ *
+ * API:
+ *
+ * - [PigmentHidden API](https://next.mui.com/material-ui/api/pigment-hidden/)
+ */
+function PigmentHidden({ implementation = 'js', ...props }: HiddenProps & { className?: string }) {
+ if (implementation === 'js') {
+ return ;
+ }
+ return ;
+}
+
+PigmentHidden.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * The content of the component.
+ */
+ children: PropTypes.node,
+ /**
+ * @ignore
+ */
+ className: PropTypes.string,
+ /**
+ * Specify which implementation to use. 'js' is the default, 'css' works better for
+ * server-side rendering.
+ * @default 'js'
+ */
+ implementation: PropTypes.oneOf(['css', 'js']),
+ /**
+ * You can use this prop when choosing the `js` implementation with server-side rendering.
+ *
+ * As `window.innerWidth` is unavailable on the server,
+ * we default to rendering an empty component during the first mount.
+ * You might want to use a heuristic to approximate
+ * the screen width of the client browser screen width.
+ *
+ * For instance, you could be using the user-agent or the client-hints.
+ * https://caniuse.com/#search=client%20hint
+ */
+ initialWidth: PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']),
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ lgDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ lgUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ mdDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ mdUp: PropTypes.bool,
+ /**
+ * Hide the given breakpoint(s).
+ */
+ only: PropTypes.oneOfType([
+ PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']),
+ PropTypes.arrayOf(PropTypes.oneOf(['lg', 'md', 'sm', 'xl', 'xs']).isRequired),
+ ]),
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ smDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ smUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xlDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xlUp: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens below (but not including) this size.
+ * @default false
+ */
+ xsDown: PropTypes.bool,
+ /**
+ * If `true`, component is hidden on screens this size and above.
+ * @default false
+ */
+ xsUp: PropTypes.bool,
+} as any;
+
+export default PigmentHidden;
diff --git a/packages/mui-material/src/PigmentHidden/index.ts b/packages/mui-material/src/PigmentHidden/index.ts
new file mode 100644
index 00000000000000..e1f538b8e05939
--- /dev/null
+++ b/packages/mui-material/src/PigmentHidden/index.ts
@@ -0,0 +1,2 @@
+export { default } from './PigmentHidden';
+export * from './PigmentHidden';
diff --git a/packages/mui-material/src/PigmentStack/PigmentStack.spec.tsx b/packages/mui-material/src/PigmentStack/PigmentStack.spec.tsx
new file mode 100644
index 00000000000000..1ff0b3f2eb37a9
--- /dev/null
+++ b/packages/mui-material/src/PigmentStack/PigmentStack.spec.tsx
@@ -0,0 +1,13 @@
+import * as React from 'react';
+import Stack from '@mui/material/PigmentStack';
+
+ ;
+ ;
+ ;
+ ;
+ ;
+ ;
+ } />;
+
+// @ts-expect-error `spacing` is not a valid prop
+ ;
diff --git a/packages/mui-material/src/PigmentStack/PigmentStack.tsx b/packages/mui-material/src/PigmentStack/PigmentStack.tsx
new file mode 100644
index 00000000000000..fcf8ee052300d3
--- /dev/null
+++ b/packages/mui-material/src/PigmentStack/PigmentStack.tsx
@@ -0,0 +1,136 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import { OverridableComponent, OverrideProps } from '@mui/types';
+// @ts-ignore
+import Stack from '@pigment-css/react/Stack';
+import composeClasses from '@mui/utils/composeClasses';
+import generateUtilityClass from '@mui/utils/generateUtilityClass';
+import { SxProps } from '@mui/system';
+import { Breakpoint, Theme } from '../styles';
+
+type ResponsiveStyleValue = T | Array | { [key in Breakpoint]?: T | null };
+
+export interface PigmentStackOwnProps {
+ /**
+ * The content of the component.
+ */
+ children?: React.ReactNode;
+ /**
+ * Defines the `flex-direction` style property.
+ * It is applied for all screen sizes.
+ * @default 'column'
+ */
+ direction?: ResponsiveStyleValue<'row' | 'row-reverse' | 'column' | 'column-reverse'>;
+ /**
+ * Defines the space between immediate children.
+ * @default 0
+ */
+ spacing?: ResponsiveStyleValue;
+ /**
+ * Add an element between each child.
+ */
+ divider?: React.ReactNode;
+ /**
+ * The system prop, which allows defining system overrides as well as additional CSS styles.
+ */
+ sx?: SxProps;
+}
+
+export interface PigmentStackTypeMap<
+ AdditionalProps = {},
+ RootComponent extends React.ElementType = 'div',
+> {
+ props: AdditionalProps & PigmentStackOwnProps;
+ defaultComponent: RootComponent;
+}
+
+export type PigmentStackProps<
+ RootComponent extends React.ElementType = PigmentStackTypeMap['defaultComponent'],
+ AdditionalProps = {},
+> = OverrideProps, RootComponent> & {
+ component?: React.ElementType;
+};
+
+const useUtilityClasses = () => {
+ const slots = {
+ root: ['root'],
+ };
+
+ return composeClasses(slots, (slot) => generateUtilityClass('MuiStack', slot), {});
+};
+/**
+ *
+ * Demos:
+ *
+ * - [Stack](https://next.mui.com/material-ui/react-stack/)
+ *
+ * API:
+ *
+ * - [PigmentStack API](https://next.mui.com/material-ui/api/pigment-stack/)
+ */
+const PigmentStack = React.forwardRef(function PigmentStack({ className, ...props }, ref) {
+ const classes = useUtilityClasses();
+ return ;
+}) as OverridableComponent;
+
+PigmentStack.propTypes /* remove-proptypes */ = {
+ // ┌────────────────────────────── Warning ──────────────────────────────┐
+ // │ These PropTypes are generated from the TypeScript type definitions. │
+ // │ To update them, edit the TypeScript types and run `pnpm proptypes`. │
+ // └─────────────────────────────────────────────────────────────────────┘
+ /**
+ * The content of the component.
+ */
+ children: PropTypes.node,
+ /**
+ * @ignore
+ */
+ className: PropTypes.string,
+ /**
+ * Defines the `flex-direction` style property.
+ * It is applied for all screen sizes.
+ * @default 'column'
+ */
+ direction: PropTypes.oneOfType([
+ PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ PropTypes.arrayOf(PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row'])),
+ PropTypes.shape({
+ lg: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ md: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ sm: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ xl: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ xs: PropTypes.oneOf(['column-reverse', 'column', 'row-reverse', 'row']),
+ }),
+ ]),
+ /**
+ * Add an element between each child.
+ */
+ divider: PropTypes.node,
+ /**
+ * Defines the space between immediate children.
+ * @default 0
+ */
+ spacing: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])),
+ PropTypes.number,
+ PropTypes.shape({
+ lg: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ md: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ sm: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ xl: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ xs: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+ }),
+ PropTypes.string,
+ ]),
+ /**
+ * The system prop, which allows defining system overrides as well as additional CSS styles.
+ */
+ sx: PropTypes.oneOfType([
+ PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])),
+ PropTypes.func,
+ PropTypes.object,
+ ]),
+} as any;
+
+export default PigmentStack;
diff --git a/packages/mui-material/src/PigmentStack/index.ts b/packages/mui-material/src/PigmentStack/index.ts
new file mode 100644
index 00000000000000..f5cd721d163d91
--- /dev/null
+++ b/packages/mui-material/src/PigmentStack/index.ts
@@ -0,0 +1,3 @@
+export { default } from './PigmentStack';
+export * from './PigmentStack';
+export { default as stackClasses } from '../Stack/stackClasses';
diff --git a/packages/mui-system/src/Unstable_Grid/gridGenerator.ts b/packages/mui-system/src/Unstable_Grid/gridGenerator.ts
index e581d210707784..679fb0b08d9b5d 100644
--- a/packages/mui-system/src/Unstable_Grid/gridGenerator.ts
+++ b/packages/mui-system/src/Unstable_Grid/gridGenerator.ts
@@ -116,7 +116,7 @@ export const generateGridColumnsStyles = ({ theme, ownerState }: Props) => {
traverseBreakpoints(theme.breakpoints, ownerState.columns, (appendStyle, value) => {
appendStyle(styles, { [`--Grid-columns${appendLevel(ownerState.unstable_level)}`]: value });
});
- return styles;
+ return styles as Record;
};
export const generateGridRowSpacingStyles = ({ theme, ownerState }: Props) => {
diff --git a/packages/rsc-builder/buildRsc.ts b/packages/rsc-builder/buildRsc.ts
index e028e5625b25d4..b8f78490bcada1 100644
--- a/packages/rsc-builder/buildRsc.ts
+++ b/packages/rsc-builder/buildRsc.ts
@@ -24,6 +24,9 @@ const PROJECTS: Project[] = [
rootPath: path.join(process.cwd(), 'packages/mui-material'),
ignorePaths: [
'packages/mui-material/src/InitColorSchemeScript/InitColorSchemeScript.tsx', // RSC compatible
+ 'packages/mui-material/src/PigmentContainer/PigmentContainer.tsx', // RSC compatible
+ 'packages/mui-material/src/PigmentGrid/PigmentGrid.tsx', // RSC compatible
+ 'packages/mui-material/src/PigmentStack/PigmentStack.tsx', // RSC compatible
],
},
{
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a2402e44e35a09..cd6d2744890055 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -102,8 +102,8 @@ importers:
specifier: ^20.1.1
version: 20.1.1
'@pigment-css/react':
- specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)
'@playwright/test':
specifier: 1.44.1
version: 1.44.1
@@ -318,8 +318,8 @@ importers:
apps/local-ui-lib:
dependencies:
'@pigment-css/react':
- specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)
apps/pigment-css-next-app:
dependencies:
@@ -348,8 +348,8 @@ importers:
specifier: workspace:^
version: link:../../packages/mui-utils/build
'@pigment-css/react':
- specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)
local-ui-lib:
specifier: workspace:^
version: link:../local-ui-lib
@@ -364,8 +364,8 @@ importers:
version: 18.2.0(react@18.2.0)
devDependencies:
'@pigment-css/nextjs-plugin':
- specifier: ^0.0.14
- version: 0.0.14(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)
'@types/node':
specifier: ^18.19.39
version: 18.19.39
@@ -403,8 +403,8 @@ importers:
specifier: workspace:^
version: link:../../packages/mui-utils/build
'@pigment-css/react':
- specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -434,8 +434,8 @@ importers:
specifier: ^7.24.7
version: 7.24.7(@babel/core@7.24.7)
'@pigment-css/vite-plugin':
- specifier: ^0.0.13
- version: 0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))
'@types/react':
specifier: 18.2.55
version: 18.2.55
@@ -1717,6 +1717,9 @@ importers:
'@mui/utils':
specifier: workspace:^
version: link:../mui-utils/build
+ '@pigment-css/react':
+ specifier: ^0.0.16
+ version: 0.0.16(@types/react@18.2.55)(react@18.2.0)
'@types/react-transition-group':
specifier: ^4.4.10
version: 4.4.10
@@ -4630,21 +4633,21 @@ packages:
resolution: {integrity: sha512-ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==}
engines: {node: '>=14'}
- '@pigment-css/nextjs-plugin@0.0.14':
- resolution: {integrity: sha512-aGRpUnXrJi7jbdHddh1cVeVXeiYvglXQQhpzxJ1grr1f9RovGcyuEx3zADgEG3nZB1TGL6t2zdOUvgz4bCWIyQ==}
+ '@pigment-css/nextjs-plugin@0.0.16':
+ resolution: {integrity: sha512-uwOgM6txECakseZkCOtILPgO0wlDl6wCcsvYl9jWDoeoQOAzLHsO0YSuEJmdirOeGjRGlqxjUcpxa9YfuiUSBQ==}
peerDependencies:
next: ^12.0.0 || ^13.0.0 || ^14.0.0
- '@pigment-css/react@0.0.13':
- resolution: {integrity: sha512-oMFp4u9nLbDpRqvm9o65v0ZgectslIT0Z5k6nz0qhU8vU0ifNAXuKlfe5kD5UOfHcqaEHvy7+6uvoj/YAzdFBw==}
+ '@pigment-css/react@0.0.16':
+ resolution: {integrity: sha512-hi4Qd5ZRgxR82VPv2ilHTimf9Aspir40B05rcmtKSWbVCNLakk5/uxLOgSuf1xDSxhXv5Q5ZVXTEdAaLCZjwzw==}
peerDependencies:
react: ^17.0.0 || ^18.0.0
- '@pigment-css/unplugin@0.0.14':
- resolution: {integrity: sha512-oRAHxBiK7sZ8njZukJQJJdLJ2m26641S2GpnKbKLKV6KQa3TgdsZY34jzEG8iyWB4fBbW9JbLfloSruFncoSrg==}
+ '@pigment-css/unplugin@0.0.16':
+ resolution: {integrity: sha512-T+mE5p4IaSF1WXMm+0Qct4njD2FijByN73L67/7863ZQw5Cmi3ZH6zJNrJGk0gkEcDcDxq4RNUlYA1jM1q5shA==}
- '@pigment-css/vite-plugin@0.0.13':
- resolution: {integrity: sha512-O6O82vzuyOeqCG8sDbETik7g8ZbR53NVlYvFLDvrB1kxZ0k9dAhV5VCgi1hac+FHPwSsV7bQ+dg1pcMz40l2xA==}
+ '@pigment-css/vite-plugin@0.0.16':
+ resolution: {integrity: sha512-9rrF9YArCrvTbBvlEt0/9XWllYZJiJICn3O0VeUJ2JGKAtng37MXbtSIsi1q4eFmAUMKWTW2AFz3YyQPqeTMsg==}
peerDependencies:
vite: ^4.0.0 || ^5.0.0
@@ -15298,16 +15301,16 @@ snapshots:
'@opentelemetry/semantic-conventions@1.25.1': {}
- '@pigment-css/nextjs-plugin@0.0.14(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)':
+ '@pigment-css/nextjs-plugin@0.0.16(@types/react@18.2.55)(next@14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0))(react@18.2.0)':
dependencies:
- '@pigment-css/unplugin': 0.0.14(@types/react@18.2.55)(react@18.2.0)
+ '@pigment-css/unplugin': 0.0.16(@types/react@18.2.55)(react@18.2.0)
next: 14.2.4(@babel/core@7.24.7)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
transitivePeerDependencies:
- '@types/react'
- react
- supports-color
- '@pigment-css/react@0.0.13(@types/react@18.2.55)(react@18.2.0)':
+ '@pigment-css/react@0.0.16(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/core': 7.24.7
'@babel/helper-module-imports': 7.24.7
@@ -15335,10 +15338,10 @@ snapshots:
- '@types/react'
- supports-color
- '@pigment-css/unplugin@0.0.14(@types/react@18.2.55)(react@18.2.0)':
+ '@pigment-css/unplugin@0.0.16(@types/react@18.2.55)(react@18.2.0)':
dependencies:
'@babel/core': 7.24.7
- '@pigment-css/react': 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ '@pigment-css/react': 0.0.16(@types/react@18.2.55)(react@18.2.0)
'@wyw-in-js/shared': 0.5.3
'@wyw-in-js/transform': 0.5.3
babel-plugin-define-var: 0.1.0
@@ -15348,11 +15351,11 @@ snapshots:
- react
- supports-color
- '@pigment-css/vite-plugin@0.0.13(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))':
+ '@pigment-css/vite-plugin@0.0.16(@types/react@18.2.55)(react@18.2.0)(vite@5.3.1(@types/node@18.19.39)(terser@5.29.2))':
dependencies:
'@babel/core': 7.24.7
'@babel/preset-typescript': 7.24.7(@babel/core@7.24.7)
- '@pigment-css/react': 0.0.13(@types/react@18.2.55)(react@18.2.0)
+ '@pigment-css/react': 0.0.16(@types/react@18.2.55)(react@18.2.0)
'@wyw-in-js/shared': 0.5.3
'@wyw-in-js/transform': 0.5.3
babel-plugin-define-var: 0.1.0
From 426875dd4cfe360acc6da1576fb6250af1b65069 Mon Sep 17 00:00:00 2001
From: Ale <93217218+alelthomas@users.noreply.github.com>
Date: Thu, 27 Jun 2024 00:49:08 -0700
Subject: [PATCH 60/65] [website] Add Ale to team (#42764)
---
docs/data/about/teamMembers.json | 8 ++++++++
.../static/branding/about/alejandra-thomas.png | Bin 0 -> 122841 bytes
2 files changed, 8 insertions(+)
create mode 100644 docs/public/static/branding/about/alejandra-thomas.png
diff --git a/docs/data/about/teamMembers.json b/docs/data/about/teamMembers.json
index e19904864000d1..2f16ecd8692612 100644
--- a/docs/data/about/teamMembers.json
+++ b/docs/data/about/teamMembers.json
@@ -331,5 +331,13 @@
"locationCountry": "nl",
"about": "♟️ Chess, 🛠️ Small DIY projects and learning about space 🌌",
"github": "arminmeh"
+ },
+ {
+ "name": "Alejandra Thomas",
+ "title": "Content Engineer",
+ "location": "New York, US",
+ "locationCountry": "us",
+ "about": "Books 📚, long coffee walks ☕️, and my cat 🐈⬛",
+ "github": "alelthomas"
}
]
diff --git a/docs/public/static/branding/about/alejandra-thomas.png b/docs/public/static/branding/about/alejandra-thomas.png
new file mode 100644
index 0000000000000000000000000000000000000000..9adcd4b2fa18391080c7f7315ece17eaa15076fe
GIT binary patch
literal 122841
zcmd41Wmud|voJVF@DNH
zb1>UGnX|BgKp+-Yb{2MaCMX1xv!|Vlkq48VGbI$$zoU{cbp|_GI=EQc+mXGZHZrz%
zbrGbY`4`lGkYob>*J~VHooxPji3ym+)W+1-)Xv43g^ii*->5VJ^SM~M*qHtg!bNRd
z{>O-olf;1jXCZ=Xat~M?-LPj>GRz`LvPDV^F7WTGA&SXqvYyvE=6xvw+
zHx&Pj{5w{b|C4wB1NPro{eLJ0Q5P2{OXGh@!p@o5=${eSSMf1JHOpdT@+u3~f0M<3
ztl|?jasF?FzjC5t>i9oKpwf7qa4>RmHdXa>FcqXxHg&dlbpo6IcN6$egyK%7MlPl%
zLhP*UoJ_3TOzhkOEdOKbUs@FS&k0En7g-Y_URDzxc1})qCJ?6?Cledf%>`oPWa9yG@v{DF%|Da>+Y(iKSFpt^
zTSET}`~MpIU*P{2YW{a|{THkMF4q5#6z%Zew$-ba|Jkpv`h`wF^~>>Z`h|}1iMm3~
z)JaIx#*|DIYOhd(6?ldHukruE+y8q@ggT6WGsAxo=wamWzZoDDnC~BBv3F9nx3>`z
zH?ngxBBNC{wKFkwGIgR8VELaA|9ABMmnZrkFi@ZL-;9~%Up`GJhhahq0J9t=D
~YX(aQjds(B$8)%uG
zqd5;g5pk83!=uBa^nXvvuY3=6LU0+>%Qb5@$wk%xEAIuvRviMgSbV9ibeC6sE-7$>gXM2I3J9+;0CkVs0pFUEZgpt_^
z2Xz^j$kbMmgP7aODL*K@=YGQhFk=Cf!9=uF6!+}u?esY;-}GC~=i4BSEcR`V=001G
zu_sp}dNrF6<5wxQzqMO!jkI29lz+mSQlQSF->=VaGOxyW
zLn(~T!YN&1;IvR5*CLLP=o0IVlssm=AcB8H9J_^^dMwI%`X0;Pezxa-w)b#yWo=Ni
zS=A#)#y~>HNnxSaL+ok?vB@Mp(b<_*HmmxgMb3Zia&!Fc;-iJ4VH&Y1FJ_zH1NU>j
zz&NT048F$dR^iEVKhGzIEj5Zq!|B@_)hn)mO6=k{qMT&_!-S_7i4SBH+gV)ZlH(bw
zxF~N#$fzT*S=o9)yonN>*^z6*Y;7svXKbTK`|SO9BA4Ske*S0I-Y5G2BUH+K@V{1zh5wRT09d@HeJw{nQdx*7XWK>~eVt+O(aCSRy?(|Kh^_NYtN8RI(
z+gTmcX=HvOAmHH8??{gltTkpnruDl=Y
zsx;ZaQ0oq#B~^lt&FH=M{G;QWY>l}(`GX&&7&T9|46~Rg
zq5E;wetpRPDG?pL5>*^$-*?OL4YPI$gi|>E`K-JYv?|TMV1Ty?uyfEl2g&zBvN!^U
z->G^88g3h7?1{+lxXrA|=?)?QQm~{VCgE2-X-@byS=fhO5`R2*e7*QiHD=%Tyqo#p
z2)x?d+-$iitkOIKl*89`#n=d>A6Fs)AKk+tc>
zXQ7=(Y1!X82Hsn-7v5=Uo>X6O*BJhxGO+GQJ^PpA7Cl3oyrOWD@_pZm-_5cgurih{
zX$oGH{419Vb5!t`Zt|X*L_~(b8~|H#;5zX#HJL}(z8ilK?@G(!o%ap%_NJ40d~Sdx
z;e56+ma$u*vjqZ&s020a5J-&cQwjor;Zr)bSj{KQVvKjzCGx6j5ircQOfVtHiXS3R
zy$A0;irse5ZQNkru5mNk|Kzbp@3`^qxLJA0E%*3agEbg+q9fpX^xnPwP_bdf72a#d
ziNOEvadl@6?!1nzf5s8mL~@MsCK`ZZLW`NP3!s(3?S|D>1&qQ|sP6%@zySanSffB#
z8McjcC-deoddz_GPzlyUBD$X9=%$1S-=u~-5?TNT
z1Pp%yqs(fI)!hd0TSw0N1}%-X6bt)-`wD7AGp!%Y&JP
zsYErNpJ0O-uQUb#Jz4UOnC9GD{;?xJ>xC?Q*V_H~chfIdzsj}8U7n6I;X2%S8fZ{B
z^9`ioA(B~Z5&Ah%y*+^j^5fon%o{wrOP`hAcYJp2c;|j|WZ#M#{^S>*BBSn;kZ^K^t$F6L1=<_@
zmVIATnI(kz{zj$y_NaKjgV6bT)-Gm3_xRdYRY{$yWtj#;q*M-d^oXKN3f(mQ0#Eh0?nCUBy6PO?@Z><(4XDyBrutXHkgjXKiI_L;B0~lvL%vt$c|FBB&KC-V
zNH}DEq;EA__?&xtT6OtT1(^$#2GxV7V~uP2wjB&YtmU{+nC^`vt8tfusA
zBiA$Wci{3o!HI{uz($+LNiM*Q5`oro+$}Y=$HPq|<4~^d+u@BhhBK;VDev(2<*!aV
ztOiyD<4q;YCA}u$t!m`BSJtZ!!6&wFxkC?(s8sApeE_JR<_5mZ9$42cXoO?Jn0-D0
zrW0ym6DUmxI4By3PrrP^eKDuF<9YwJ>UoOvY03swr)JZ)7wV(it$F$RdkR-3Q<7#9
zZty<^{Neib=nOhEXAWPX=_j{KqAx<*)*Y?Lk8mvSlWbbo0Ngaj6vC+=QHoWN5Ge6`
zc}_F`C5vNIoI?P>pB!C_VD=)fdb7^tH>q|Hp|I*m!j0mJKi$C8?4bQ<@=aCN{@Jj*
zM@PYGv_=@1;JbFuOGcz?k}4Ngs)WQ50zfpG@WGexPsM&Z$=EiqS5$nyY`eH<@qZlf
zZ&jycSk)+JD#u;pYP~+N{w?PLyLD<%oNo{r@v`Xz^!FRwM^rAPrY^_|bV}`+wV-0|
zzAh(R)Htzbs0q?C;u!(duEhUc@R7x-k5xrB@nXayaQvJ>yXT}y+E5$E@C7_(y3}22
zfbVFSDu%NIrUnp}B9{)))7HDapLM}8oAGrT#=wJL3+j@Q&0X@+-h@XHqb`(~{c`gu
z!kHBDvhNopFrqyX=Vm@55%=Vu9TJ#l``%}Jh=%|BnVek9MDV74ALp|etUihIfw3Gx
zctjS>Q-DOsFfR|lSEN2LSUrLG^a?hU`iqu?D$LwlwcaB+fLbu`Jo8`X>!-usyL0P{
z_4V_$3+J*MgNAW{JfFO)Et?uql~yQMWJHxlCxq@UmxdZ%GGZ>*`hfnRBtNH7uUb+m
zl739EJb<87Zs$`8j?32--g)-a7X(&Naa=_;K$HU=-7}~@;oMlxhdN%1vLqfAh;n|l
zRWMRYayc+z?-!GCS{U`?_keeqlv2CexOU;x%B8@8GrrM`va;Ab{2u%&|4i7=(T>@h
zP*Fopibr@91K7DN=J~&sZkU{!kfDHr~Wb
z41CARKGu~
zF-SQ65Nwsx{F6T2^XnAGMlgMWkox$=g*KMt(~V=MwbsVyw#gCGjQ%eR?z;da>k+0s
z6Q)W5Yg+ARhAJ?H5k|tfOeqL($(bNrDsj}tpJuR>owbTdv;X+`X#bF>e@5_6N`aK!
zbcW_`d)t+N=8iQj9G|lwW!OT55a%c%KNLa9uw%2UgPHC1>EaY&U=mF))!w^Un@
z1i;Jx<#8&*O-;S&AIxi5z?%q8XS^9%MUB9Ar&hGX*!sfJ;p^4xYcFp(Hm!X&`I@Xh
z#2wNsn9kVikIB3QQ@qfpXHS&+HLj^d4UPUn8I}Z?RZdaNXi7SY5R(jEop`M)s%%}Y
zX)d~skWz44SElnaZ(^W$Vr258UUhO8{goitO|Fd(lmlM#QkRo{QD_@G-xA-fqo*iP
zJ+C7ettm6j%E~96#)Ys2tIcn0b
zoPM{*nL4OmYbeWBKU|y-YdBm;?<5CG_B?a+6j1w6uSWtZ$Vjm8L!0e%Ew!z7AuUm3
zl+DA6a#k1I&O(trz5H7dlq=aXVkQ-Lm8@D>B}$^*)ea=8-TmSmZP
zt5U1x{l2z~Rd4t9^Xrxq{ojJZ22AY?&;9?1HLOgdYItdP8+&-);6rQ&U;nM@ct#+*
zeWDZYFwDA;ad9!lMGb~8EAKB_jRVEloujgBQ3-BrF?c*WE734;ApXa;x$=U|L2i~W
z=H%@SMZ;!YbZBRq3&m@7&%WiZv)41{haaawen*o%gDE?YgSsiI%5?)DLF7dO*q9ux
z?~)X^d;$v5jE&9OVdu<4{~S$n8nn3I`0(`p`Z5^Rf%zJ++t(4Zee@eL$7m={Uc4R8
zKa%NA$O=zbQE@$j46c+8PA@pND*>W|NplgJ-+)ik9XwRrz-0G^s`FM=&j
z284H>-XTql&bW3K&>M$*xY*y4WuY-PvzJ!&P%Y`o>!JA~lqG{dD=K~1K6L40<+sqf
z9+gw=vS#&YYSfDZ^QMTP3Uvm%`&hk0&@(B+okdso&+@4D*|*ny?r;5@7qpR-^bAgf
zy2>oSP^3>~LAJD~UE7}{3rKDO$NUM0N2wJ#`%27>I{N!8#A=A!aEB+O&2T*_!co)9
zL)z$`^oSh9g4go$h}$)+F~t0R=)#|NK)|Rw+$1*@$&T4rUs9FT}vZlFzAFP?jAUt+)_V;-r*->mi{wdF8!UA5phf7
zL3yN_m~%@7*4NUCxr)jP?F!z#glWcK3z7E+P7G6w$xhd$cgWTHR2w|wRl2@g(*0}=
z|3PrWt5u3`HJN`eC^M(|B%3f1d}KDV^=~5w$%Y+P)z5abMC1oc;f)c8J~0$zqF=`9`JZ2p5ro%cX`LOt3O&5L46sbZ
zW0$a=)_Iu;map1P7MJ55HP;yC@SN>PBlTy{%kx`B|6TiN`Tnx5AvP4THWBV4$f9CX
zL|y4y1xEP#XfveYNJ6*U^uh4XPdvtSCMWXvYuaZj03Pn(bSmoPPp(P*_k>HtP1Qda
z^HXgr!DA+O`Vlfy%*Si^wIO0t9`+_ht{i!o>eDVtcem`kC8cE4r4uX#61^58_nepw
zt6Wvz?Hd|z@bS0ofErM`nO;vC9c;~&;t$){nf>AZ>1r=KeReNBJ-lJ`>#4$~@9&>w
zuI?S5TCjrkm}qF(YpL_IL`xe$2~Fi$OuqiC`Krk90i|KNgzs&|o3RlMrftQMEWVnN
zyf+Eljd6@wJaUhqTK-U|$&IDGL$+B+_+`ghQ(cL}^N)l_y)T!oFk{0Ccv=^0zzN0A
zs*6cmc_27^q;!1QA@q?^wDzyzgi4G3sv|olzQPgnL+j0E6)5rJ#4|(DLe-k}vRkX~
z!}Y`6VcjO?>kC`jh_TTAdo*7Oyd_%2|m(2k611
ziFX(QBT#&0({DkOisUQ$<9+rh-(avfUfOZx4(H>!^FUzyfNfV6hege&{Dzh|dzGY6
zm`?9c6vlMDva+~(Go0C724gwyZ;sC^8rPyuE~+M@q~RF?q5HLF#qKO=LST%3f52(^
zX`;pPc7FvUv$dL{Ah~cJiMY=jP!}P9I=V9{DK+dk?6pY|!H>mjjD+e_A#xBHrR}R}
zgUk}*deT~7D}CA
zYa9-!lJh{+oO$l9dM=B#ABL`PsYLaelUcrkelMygs)C&ypuNkPh0R;@;BgXbBf)r5
zde(Prbxf&-z2`g*&~ouoZ2AK%5TgyLEypTt5UpN{DyNSLc;!3I#7Q?3EZ2$1yZs&kF#R_^?4^R=t|ZAD~lsUk(bO#sf5`1I3uPx8-ESdR{k
zdC^1Tnx{EcA}->q4{{G#2WGc;UA@QlV`6B>kgPmPqDXripp|moNC1G}B__Zd_>8Us
zNXAwMVyZ9_!4a-{dN>w(cFJ^t5C`Bz8>}QbB#@Nx*txngxo0>RZM-;b;aJHjGsUBk
z=;CCyB6!gW24H0Iy#l^gZbryujv|p+iVb6$m|}$>Q(Oy<@qG-%I6SOGyik^@I;z;b
z(EdX)Fu!A3@A$j2^yX}JO&V{Yj=lb=-{izoQQL*|BL=#VNH4jhj&9#ynO<^J$PNM6
zE^?m`^MH7Rh{pC|{*%xB%!BYjn2;TB9{^~~)qz|lh
zl428}!XE8N;c6TwnJqb9CK(1%^i5qx|4{MR+t7sW4s1t<4;a)Q1E-3^siI}Dnz-3-
zVx4*U1-pjKf*amidq_&CWW5%U&B@b+(J!Dh)|{?S7=VAQxQc%uPUG1Ev-)xy&8
z)zKIkKcf0Ajqnj@Bdq%eI1u7Z(CxuXSy%p-gp*X|Mc;~bxX8XWW3buY}9
zwGK@p`8p=&FSTzmTxj!I3@*+dPIDq3?(e`GZS4lm4nHt87F=f@%yCzYinqS}q1T!n
zymth?leoK2zxpJLUwE&1?WR&TI6>PfckfEt?fqoNQNG{C5CE<7K5}`S_2D}#nn*kH0P<5)x1L?1
z@=XlQhe1qy-{5Lne%&^ws3gB&g#}}X`)M4;7D<4Z9G77og?gLE-tgMoQh~$Y$*@9+
z&P;-_ndU_&);)o~?uD&2>XoA{uUpc_oB%|v)OSbC&f{}WOeIuHvzqBmU--+VNK_+d
z=Z&aR<#=7Gd%X=#1brvI0s$DcX2Ye#n0hn`C{skty^xbtK2osmm{vUhYhuTA7MZ4x
zMI5%*mS-?NX|Pmu*^5CLtCiR_DIcQi=8jR=W9ezZbX4jVp@riWg-OPQy=|PTM*!kA
zD$M^OvP#JBJJvl3J&_VRD^D-$*qNmhs;3^aStk0n*&
z01?!cdyr-Swiztbzv+4rATU^rzmL>YEqNHpCF`u5N7mlu-A$DdoJlpKpuGT
zj;Fab{`f!66(_?0EF}2>?&D@s=@_k0)lD7hoPWm7h&0FBcw-Aud=QJf!U04_O@>h(hV>L$
z8X5CP%_nskGqopE)GoKm$9xt;Dq{9Xt9zbH--J}Po(~^iEf^Sl(~4(%)vHMBX=1#t
zqrC7@@PpXsE&tv_%~E`c?vRdsk+w>pco#4oJXwTWvEy9ty7R3r_$y$*WDbF!Q$Ymc
z;SgDW9!HMGOMa;rd{o%uHnX08_2+#&w}%bS+Xg*UqW~?;teg`bq;d6mH{0l$B&Ko2
zPm_%m^$j>=2>0#c5O{u0=Mel_AEw5|6h(lpxCa`RQ<3fvH*5|B~RWU
zum~1E1OkiE$eYDJ^nFuX==;&GUe`KbErIh^X0X@O2zv#lrI{wf6+Op_!1WKt%pScJ
zr1Xm;u_nC3hruLFXUoq_W$pKO_Z+OK)ftpl@&cF&igi>Q*lfnN-|I1z3(K3_&qyTW@2y9O+AON$@=wv+nJja;IGv0ljENJh*GJ@Wz
zMVq+JvRWn5AvvcTFAC)V8Vh