Skip to content

Commit

Permalink
Bump prettier to ^3.3.3 (#42931)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: ZeeshanTamboli <[email protected]>
  • Loading branch information
renovate[bot] and ZeeshanTamboli authored Jul 15, 2024
1 parent 42d4aad commit a3e0b53
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 35 deletions.
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"gm": "^1.25.0",
"marked": "^13.0.2",
"playwright": "^1.45.1",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"tailwindcss": "^3.4.4",
"yargs": "^17.7.2"
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"nyc": "^17.0.0",
"piscina": "^4.6.1",
"postcss-styled-syntax": "^0.6.4",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"pretty-quick": "^4.0.0",
"process": "^0.11.10",
"rimraf": "^5.0.9",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@types/uuid": "^9.0.8",
"chai": "^4.4.1",
"fast-glob": "^3.3.2",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"rimraf": "^5.0.9"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/api-docs-builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"fast-glob": "^3.3.2",
"fs-extra": "^11.2.0",
"lodash": "^4.17.21",
"prettier": "^3.3.2",
"prettier": "^3.3.3",
"react-docgen": "^5.4.3",
"recast": "^0.23.9",
"remark": "^13.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-base/src/Input/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ const Input = React.forwardRef(function Input<RootComponentType extends React.El
value,
});

const type = !multiline ? typeProp ?? 'text' : undefined;
const type = !multiline ? (typeProp ?? 'text') : undefined;

const ownerState: InputOwnerState = {
...props,
Expand Down Expand Up @@ -145,7 +145,7 @@ const Input = React.forwardRef(function Input<RootComponentType extends React.El
ownerState,
className: [classes.root, className],
});
const InputComponent = multiline ? slots.textarea ?? 'textarea' : slots.input ?? 'input';
const InputComponent = multiline ? (slots.textarea ?? 'textarea') : (slots.input ?? 'input');
const inputProps: WithOptionalOwnerState<InputInputSlotProps> = useSlotProps({
elementType: InputComponent,
getSlotProps: (otherHandlers: EventHandlers) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-base/src/Switch/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const Switch = React.forwardRef(function Switch<RootComponentType extends React.
className: classes.input,
});

const Track: React.ElementType = slots.track === null ? () => null : slots.track ?? 'span';
const Track: React.ElementType = slots.track === null ? () => null : (slots.track ?? 'span');
const trackProps: WithOptionalOwnerState<SwitchTrackSlotProps> = useSlotProps({
elementType: Track,
externalSlotProps: slotProps.track,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/src/Autocomplete/Autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ const Autocomplete = React.forwardRef(function Autocomplete(
const formControl = React.useContext(FormControlContext);
const error = inProps.error ?? formControl?.error ?? errorProp;
const size = inProps.size ?? formControl?.size ?? sizeProp;
const color = inProps.color ?? (error ? 'danger' : formControl?.color ?? colorProp);
const color = inProps.color ?? (error ? 'danger' : (formControl?.color ?? colorProp));
const disabled = disabledProp ?? formControl?.disabled ?? false;

const {
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-joy/src/Checkbox/Checkbox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ const Checkbox = React.forwardRef(function Checkbox(inProps, ref) {
const activeVariant = variantProp || 'solid';
const inactiveVariant = variantProp || 'outlined';
const variant = isCheckboxActive ? activeVariant : inactiveVariant;
const color = inProps.color || (formControl?.error ? 'danger' : formControl?.color ?? colorProp);
const color =
inProps.color || (formControl?.error ? 'danger' : (formControl?.color ?? colorProp));

const activeColor = color || 'primary';
const inactiveColor = color || 'neutral';
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/src/DialogTitle/DialogTitle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const DialogTitle = React.forwardRef(function DialogTitle(inProps, ref) {
...other
} = props;

const color = inProps.color || (variant ? colorProp ?? 'neutral' : colorProp);
const color = inProps.color || (variant ? (colorProp ?? 'neutral') : colorProp);

const externalForwardedProps = { ...other, component, slots, slotProps };

Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/src/Input/Input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ const Input = React.forwardRef(function Input(inProps, ref) {

const error = inProps.error ?? formControl?.error ?? errorProp;
const size = inProps.size ?? formControl?.size ?? sizeProp;
const color = inProps.color ?? (error ? 'danger' : formControl?.color ?? colorProp);
const color = inProps.color ?? (error ? 'danger' : (formControl?.color ?? colorProp));

const ownerState = {
instanceColor: error ? 'danger' : inProps.color,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/src/ListSubheader/ListSubheader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const ListSubheader = React.forwardRef(function ListSubheader(inProps, ref) {
id,
sticky,
variant,
color: variant ? color ?? 'neutral' : color,
color: variant ? (color ?? 'neutral') : color,
};

const classes = useUtilityClasses(ownerState);
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-joy/src/Radio/Radio.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ const Radio = React.forwardRef(function Radio(inProps, ref) {
const radioGroup = React.useContext(RadioGroupContext);
const activeColor = formControl?.error
? 'danger'
: inProps.color ?? formControl?.color ?? colorProp ?? 'primary';
: (inProps.color ?? formControl?.color ?? colorProp ?? 'primary');
const inactiveColor = formControl?.error
? 'danger'
: inProps.color ?? formControl?.color ?? colorProp ?? 'neutral';
: (inProps.color ?? formControl?.color ?? colorProp ?? 'neutral');
const size = inProps.size || formControl?.size || radioGroup?.size || sizeProp;
const name = inProps.name || radioGroup?.name || nameProp;
const disableIcon = inProps.disableIcon || radioGroup?.disableIcon || disableIconProp;
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-joy/src/Select/Select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,8 @@ const Select = React.forwardRef(function Select<OptionValue extends {}, Multiple

const disabledProp = inProps.disabled ?? formControl?.disabled ?? disabledExternalProp;
const size = inProps.size ?? formControl?.size ?? sizeProp;
const color = inProps.color ?? (formControl?.error ? 'danger' : formControl?.color ?? colorProp);
const color =
inProps.color ?? (formControl?.error ? 'danger' : (formControl?.color ?? colorProp));

const renderValue: (option: SelectValue<SelectOption<OptionValue>, Multiple>) => React.ReactNode =
renderValueProp ?? defaultRenderValue;
Expand Down
3 changes: 2 additions & 1 deletion packages/mui-joy/src/Switch/Switch.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ const Switch = React.forwardRef(function Switch(inProps, ref) {
}

const size = inProps.size ?? formControl?.size ?? sizeProp;
const color = inProps.color ?? (formControl?.error ? 'danger' : formControl?.color ?? colorProp);
const color =
inProps.color ?? (formControl?.error ? 'danger' : (formControl?.color ?? colorProp));

const useSwitchProps = {
disabled: inProps.disabled ?? formControl?.disabled ?? disabledExternalProp,
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-joy/src/Textarea/Textarea.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ const Textarea = React.forwardRef(function Textarea(inProps, ref) {
const disabled = inProps.disabled ?? formControl?.disabled ?? disabledProp;
const error = inProps.error ?? formControl?.error ?? errorProp;
const size = inProps.size ?? formControl?.size ?? sizeProp;
const color = inProps.color ?? (error ? 'danger' : formControl?.color ?? colorProp);
const color = inProps.color ?? (error ? 'danger' : (formControl?.color ?? colorProp));

const ownerState = {
instanceColor: error ? 'danger' : inProps.color,
Expand Down
4 changes: 2 additions & 2 deletions packages/mui-joy/src/Typography/Typography.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const TypographyRoot = styled('span', {
...(ownerState.level && ownerState.level !== 'inherit' && theme.typography[ownerState.level]),
fontSize: `var(--Typography-fontSize, ${
ownerState.level && ownerState.level !== 'inherit'
? theme.typography[ownerState.level]?.fontSize ?? 'inherit'
? (theme.typography[ownerState.level]?.fontSize ?? 'inherit')
: 'inherit'
})`,
...(ownerState.noWrap && {
Expand Down Expand Up @@ -194,7 +194,7 @@ const Typography = React.forwardRef(function Typography(inProps, ref) {
...other
} = props;

const color = inProps.color ?? (variant ? colorProp ?? 'neutral' : colorProp);
const color = inProps.color ?? (variant ? (colorProp ?? 'neutral') : colorProp);

const level = nesting || inheriting ? inProps.level || 'inherit' : levelProp;

Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/FilledInput/FilledInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ const FilledInput = React.forwardRef(function FilledInput(inProps, ref) {
const filledInputComponentsProps = { root: { ownerState }, input: { ownerState } };

const componentsProps =
slotProps ?? componentsPropsProp
(slotProps ?? componentsPropsProp)
? deepmerge(filledInputComponentsProps, slotProps ?? componentsPropsProp)
: filledInputComponentsProps;

Expand Down
2 changes: 1 addition & 1 deletion packages/mui-material/src/Input/Input.js
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ const Input = React.forwardRef(function Input(inProps, ref) {
const inputComponentsProps = { root: { ownerState } };

const componentsProps =
slotProps ?? componentsPropsProp
(slotProps ?? componentsPropsProp)
? deepmerge(slotProps ?? componentsPropsProp, inputComponentsProps)
: inputComponentsProps;

Expand Down
28 changes: 14 additions & 14 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a3e0b53

Please sign in to comment.