From 76dc850639a98ad710f47d1382c64117dd05cd2e Mon Sep 17 00:00:00 2001 From: Jan Potoms <2109932+Janpot@users.noreply.github.com> Date: Wed, 24 Jan 2024 14:50:31 +0100 Subject: [PATCH] [code-infra] Update prettier and pretty-quick (#11735) --- .../editing/ValidateServerNameGrid.js | 11 ++- .../editing/ValidateServerNameGrid.tsx | 11 ++- .../CustomHeaderFilterDataGridPro.tsx | 6 +- .../data-grid/row-ordering/RowOrderingGrid.js | 15 ++-- .../row-ordering/RowOrderingGrid.tsx | 15 ++-- ...ControlledSelectionServerPaginationGrid.js | 9 +- ...ontrolledSelectionServerPaginationGrid.tsx | 9 +- .../tree-data/TreeDataLazyLoading.js | 17 ++-- .../tree-data/TreeDataLazyLoading.tsx | 17 ++-- .../PickerWithAutocompleteField.tsx | 11 ++- .../date-pickers/date-calendar/WeekPicker.tsx | 2 +- .../date-calendar/WeekPicker.tsx.preview | 2 +- .../lifecycle/ServerInteraction.js | 4 +- .../lifecycle/ServerInteraction.tsx | 4 +- docs/scripts/formattedTSDemos.js | 4 +- docs/scripts/populatePickersDemos.js | 4 +- package.json | 4 +- .../tests/clipboard.DataGridPremium.test.tsx | 2 +- .../src/components/GridRowReorderCell.tsx | 6 +- .../x-data-grid/src/components/GridFooter.tsx | 71 ++++++++-------- .../x-data-grid/src/components/GridRow.tsx | 6 +- .../src/components/GridRowCount.tsx | 51 ++++++------ .../src/components/toolbar/GridToolbar.tsx | 79 +++++++++--------- .../virtualization/useGridVirtualScroller.tsx | 2 +- .../src/hooks/utils/useGridSelector.ts | 2 +- .../src/models/events/gridEventPublisher.ts | 4 +- .../src/ChartsLegend/ChartsLegend.tsx | 2 +- .../MultiSectionDigitalClock.tsx | 9 +- .../PickersTextField.types.ts | 4 +- .../src/internals/hooks/useUtils.ts | 4 +- .../src/internals/hooks/useValidation.ts | 7 +- .../validation/extractValidationProps.ts | 15 ++-- packages/x-date-pickers/src/locales/beBY.ts | 4 +- packages/x-date-pickers/src/locales/caES.ts | 6 +- packages/x-date-pickers/src/locales/csCZ.ts | 4 +- packages/x-date-pickers/src/locales/daDK.ts | 6 +- packages/x-date-pickers/src/locales/deDE.ts | 6 +- packages/x-date-pickers/src/locales/elGR.ts | 6 +- packages/x-date-pickers/src/locales/esES.ts | 6 +- packages/x-date-pickers/src/locales/eu.ts | 6 +- packages/x-date-pickers/src/locales/faIR.ts | 6 +- packages/x-date-pickers/src/locales/fiFI.ts | 4 +- packages/x-date-pickers/src/locales/frFR.ts | 6 +- packages/x-date-pickers/src/locales/heIL.ts | 4 +- packages/x-date-pickers/src/locales/huHU.ts | 6 +- packages/x-date-pickers/src/locales/isIS.ts | 4 +- packages/x-date-pickers/src/locales/itIT.ts | 6 +- packages/x-date-pickers/src/locales/jaJP.ts | 6 +- packages/x-date-pickers/src/locales/koKR.ts | 6 +- packages/x-date-pickers/src/locales/kzKZ.ts | 4 +- packages/x-date-pickers/src/locales/mk.ts | 4 +- packages/x-date-pickers/src/locales/nbNO.ts | 4 +- packages/x-date-pickers/src/locales/nlNL.ts | 6 +- packages/x-date-pickers/src/locales/plPL.ts | 4 +- packages/x-date-pickers/src/locales/ptBR.ts | 6 +- packages/x-date-pickers/src/locales/roRO.ts | 6 +- packages/x-date-pickers/src/locales/ruRU.ts | 4 +- packages/x-date-pickers/src/locales/skSK.ts | 4 +- packages/x-date-pickers/src/locales/svSE.ts | 4 +- packages/x-date-pickers/src/locales/trTR.ts | 4 +- packages/x-date-pickers/src/locales/ukUA.ts | 4 +- packages/x-date-pickers/src/locales/urPK.ts | 4 +- packages/x-date-pickers/src/locales/viVN.ts | 6 +- packages/x-date-pickers/src/locales/zhCN.ts | 4 +- packages/x-date-pickers/src/locales/zhHK.ts | 4 +- .../src/internals/models/helpers.ts | 4 +- prettier.config.js | 10 ++- templates/x-data-grid/public/index.html | 2 +- test/e2e/template.html | 2 +- test/regressions/template.html | 2 +- test/utils/typeUtils.ts | 5 +- yarn.lock | 83 ++++++------------- 72 files changed, 292 insertions(+), 389 deletions(-) diff --git a/docs/data/data-grid/editing/ValidateServerNameGrid.js b/docs/data/data-grid/editing/ValidateServerNameGrid.js index 4c76fa35df18b..050f0b161ceb7 100644 --- a/docs/data/data-grid/editing/ValidateServerNameGrid.js +++ b/docs/data/data-grid/editing/ValidateServerNameGrid.js @@ -23,10 +23,13 @@ function validateName(username) { const existingUsers = rows.map((row) => row.name.toLowerCase()); return new Promise((resolve) => { - promiseTimeout = setTimeout(() => { - const exists = existingUsers.includes(username.toLowerCase()); - resolve(exists ? `${username} is already taken.` : null); - }, Math.random() * 500 + 100); // simulate network latency + promiseTimeout = setTimeout( + () => { + const exists = existingUsers.includes(username.toLowerCase()); + resolve(exists ? `${username} is already taken.` : null); + }, + Math.random() * 500 + 100, + ); // simulate network latency }); } diff --git a/docs/data/data-grid/editing/ValidateServerNameGrid.tsx b/docs/data/data-grid/editing/ValidateServerNameGrid.tsx index 4bfbc534c1a9b..0fa47993d1712 100644 --- a/docs/data/data-grid/editing/ValidateServerNameGrid.tsx +++ b/docs/data/data-grid/editing/ValidateServerNameGrid.tsx @@ -30,10 +30,13 @@ function validateName(username: string): Promise { const existingUsers = rows.map((row) => row.name.toLowerCase()); return new Promise((resolve) => { - promiseTimeout = setTimeout(() => { - const exists = existingUsers.includes(username.toLowerCase()); - resolve(exists ? `${username} is already taken.` : null); - }, Math.random() * 500 + 100); // simulate network latency + promiseTimeout = setTimeout( + () => { + const exists = existingUsers.includes(username.toLowerCase()); + resolve(exists ? `${username} is already taken.` : null); + }, + Math.random() * 500 + 100, + ); // simulate network latency }); } diff --git a/docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.tsx b/docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.tsx index 49d58a1967f98..4a0eb124b62af 100644 --- a/docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.tsx +++ b/docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.tsx @@ -27,9 +27,9 @@ function CustomHeaderFilter(props: GridHeaderFilterCellProps) { const publish = React.useCallback( ( - eventName: keyof GridHeaderFilterEventLookup, - propHandler?: React.EventHandler, - ) => + eventName: keyof GridHeaderFilterEventLookup, + propHandler?: React.EventHandler, + ) => (event: React.SyntheticEvent) => { apiRef.current.publishEvent( eventName, diff --git a/docs/data/data-grid/row-ordering/RowOrderingGrid.js b/docs/data/data-grid/row-ordering/RowOrderingGrid.js index dad7b0f4df7c1..6e09aa15ce09f 100644 --- a/docs/data/data-grid/row-ordering/RowOrderingGrid.js +++ b/docs/data/data-grid/row-ordering/RowOrderingGrid.js @@ -4,12 +4,15 @@ import { useDemoData } from '@mui/x-data-grid-generator'; function updateRowPosition(initialIndex, newIndex, rows) { return new Promise((resolve) => { - setTimeout(() => { - const rowsClone = [...rows]; - const row = rowsClone.splice(initialIndex, 1)[0]; - rowsClone.splice(newIndex, 0, row); - resolve(rowsClone); - }, Math.random() * 500 + 100); // simulate network latency + setTimeout( + () => { + const rowsClone = [...rows]; + const row = rowsClone.splice(initialIndex, 1)[0]; + rowsClone.splice(newIndex, 0, row); + resolve(rowsClone); + }, + Math.random() * 500 + 100, + ); // simulate network latency }); } diff --git a/docs/data/data-grid/row-ordering/RowOrderingGrid.tsx b/docs/data/data-grid/row-ordering/RowOrderingGrid.tsx index 10a0bbb3d1282..933089ae6b062 100644 --- a/docs/data/data-grid/row-ordering/RowOrderingGrid.tsx +++ b/docs/data/data-grid/row-ordering/RowOrderingGrid.tsx @@ -12,12 +12,15 @@ function updateRowPosition( rows: Array, ): Promise { return new Promise((resolve) => { - setTimeout(() => { - const rowsClone = [...rows]; - const row = rowsClone.splice(initialIndex, 1)[0]; - rowsClone.splice(newIndex, 0, row); - resolve(rowsClone); - }, Math.random() * 500 + 100); // simulate network latency + setTimeout( + () => { + const rowsClone = [...rows]; + const row = rowsClone.splice(initialIndex, 1)[0]; + rowsClone.splice(newIndex, 0, row); + resolve(rowsClone); + }, + Math.random() * 500 + 100, + ); // simulate network latency }); } diff --git a/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.js b/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.js index 3a6540ab8bb96..61140ac8c5b85 100644 --- a/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.js +++ b/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.js @@ -4,9 +4,12 @@ import { useDemoData, randomInt } from '@mui/x-data-grid-generator'; function loadServerRows(page, data) { return new Promise((resolve) => { - setTimeout(() => { - resolve(data.rows.slice(page * 5, (page + 1) * 5)); - }, randomInt(100, 600)); // simulate network latency + setTimeout( + () => { + resolve(data.rows.slice(page * 5, (page + 1) * 5)); + }, + randomInt(100, 600), + ); // simulate network latency }); } diff --git a/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.tsx b/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.tsx index 9cd691a34f7e9..dfc685abfa595 100644 --- a/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.tsx +++ b/docs/data/data-grid/row-selection/ControlledSelectionServerPaginationGrid.tsx @@ -4,9 +4,12 @@ import { GridDemoData, useDemoData, randomInt } from '@mui/x-data-grid-generator function loadServerRows(page: number, data: GridDemoData): Promise { return new Promise((resolve) => { - setTimeout(() => { - resolve(data.rows.slice(page * 5, (page + 1) * 5)); - }, randomInt(100, 600)); // simulate network latency + setTimeout( + () => { + resolve(data.rows.slice(page * 5, (page + 1) * 5)); + }, + randomInt(100, 600), + ); // simulate network latency }); } diff --git a/docs/data/data-grid/tree-data/TreeDataLazyLoading.js b/docs/data/data-grid/tree-data/TreeDataLazyLoading.js index bf820860f487e..ea3f9c8fd2a41 100644 --- a/docs/data/data-grid/tree-data/TreeDataLazyLoading.js +++ b/docs/data/data-grid/tree-data/TreeDataLazyLoading.js @@ -134,13 +134,16 @@ const getChildren = (parentPath) => { */ const fakeDataFetcher = (parentPath = []) => new Promise((resolve) => { - setTimeout(() => { - const rows = getChildren(parentPath).map((row) => ({ - ...row, - descendantCount: getChildren(row.hierarchy).length, - })); - resolve(rows); - }, 500 + Math.random() * 300); + setTimeout( + () => { + const rows = getChildren(parentPath).map((row) => ({ + ...row, + descendantCount: getChildren(row.hierarchy).length, + })); + resolve(rows); + }, + 500 + Math.random() * 300, + ); }); const LoadingContainer = styled('div')({ diff --git a/docs/data/data-grid/tree-data/TreeDataLazyLoading.tsx b/docs/data/data-grid/tree-data/TreeDataLazyLoading.tsx index 5651199ee1ea4..4eb26369ed095 100644 --- a/docs/data/data-grid/tree-data/TreeDataLazyLoading.tsx +++ b/docs/data/data-grid/tree-data/TreeDataLazyLoading.tsx @@ -154,13 +154,16 @@ const getChildren = (parentPath: string[]) => { */ const fakeDataFetcher = (parentPath: string[] = []) => new Promise[]>((resolve) => { - setTimeout(() => { - const rows = getChildren(parentPath).map((row) => ({ - ...row, - descendantCount: getChildren(row.hierarchy).length, - })); - resolve(rows); - }, 500 + Math.random() * 300); + setTimeout( + () => { + const rows = getChildren(parentPath).map((row) => ({ + ...row, + descendantCount: getChildren(row.hierarchy).length, + })); + resolve(rows); + }, + 500 + Math.random() * 300, + ); }); const LoadingContainer = styled('div')({ diff --git a/docs/data/date-pickers/custom-field/PickerWithAutocompleteField.tsx b/docs/data/date-pickers/custom-field/PickerWithAutocompleteField.tsx index feaaf51b49e6d..6d5cfc980154a 100644 --- a/docs/data/date-pickers/custom-field/PickerWithAutocompleteField.tsx +++ b/docs/data/date-pickers/custom-field/PickerWithAutocompleteField.tsx @@ -115,10 +115,13 @@ function AutocompleteDatePicker(props: AutocompleteDatePickerProps) { const optionsLookup = React.useMemo( () => - options.reduce((acc, option) => { - acc[option.toISOString()] = true; - return acc; - }, {} as Record), + options.reduce( + (acc, option) => { + acc[option.toISOString()] = true; + return acc; + }, + {} as Record, + ), [options], ); diff --git a/docs/data/date-pickers/date-calendar/WeekPicker.tsx b/docs/data/date-pickers/date-calendar/WeekPicker.tsx index 5977e3735837e..88f7fb03e3f6e 100644 --- a/docs/data/date-pickers/date-calendar/WeekPicker.tsx +++ b/docs/data/date-pickers/date-calendar/WeekPicker.tsx @@ -89,7 +89,7 @@ export default function WeekPicker() { hoveredDay, onPointerEnter: () => setHoveredDay(ownerState.day), onPointerLeave: () => setHoveredDay(null), - } as any), + }) as any, }} /> diff --git a/docs/data/date-pickers/date-calendar/WeekPicker.tsx.preview b/docs/data/date-pickers/date-calendar/WeekPicker.tsx.preview index dc79aff4a8384..39b413a952c10 100644 --- a/docs/data/date-pickers/date-calendar/WeekPicker.tsx.preview +++ b/docs/data/date-pickers/date-calendar/WeekPicker.tsx.preview @@ -11,6 +11,6 @@ hoveredDay, onPointerEnter: () => setHoveredDay(ownerState.day), onPointerLeave: () => setHoveredDay(null), - } as any), + }) as any, }} /> \ No newline at end of file diff --git a/docs/data/date-pickers/lifecycle/ServerInteraction.js b/docs/data/date-pickers/lifecycle/ServerInteraction.js index 86733860cc21c..e3ce3e846db61 100644 --- a/docs/data/date-pickers/lifecycle/ServerInteraction.js +++ b/docs/data/date-pickers/lifecycle/ServerInteraction.js @@ -24,8 +24,8 @@ function DisplayEvents(props) { value === null ? 'null' : value.isValid() - ? value.format('DD/MM/YYYY') - : 'Invalid Date' + ? value.format('DD/MM/YYYY') + : 'Invalid Date' }`, ) .join('\n')} diff --git a/docs/data/date-pickers/lifecycle/ServerInteraction.tsx b/docs/data/date-pickers/lifecycle/ServerInteraction.tsx index 6a09f4fbb8a0a..0795fab5891ff 100644 --- a/docs/data/date-pickers/lifecycle/ServerInteraction.tsx +++ b/docs/data/date-pickers/lifecycle/ServerInteraction.tsx @@ -28,8 +28,8 @@ function DisplayEvents(props: DisplayEventsProps) { value === null ? 'null' : value.isValid() - ? value.format('DD/MM/YYYY') - : 'Invalid Date' + ? value.format('DD/MM/YYYY') + : 'Invalid Date' }`, ) .join('\n')} diff --git a/docs/scripts/formattedTSDemos.js b/docs/scripts/formattedTSDemos.js index 5742549d9a7f7..586c5f9e8565c 100644 --- a/docs/scripts/formattedTSDemos.js +++ b/docs/scripts/formattedTSDemos.js @@ -46,9 +46,7 @@ async function getFiles(root) { try { await Promise.all( - ( - await fse.readdir(root) - ).map(async (name) => { + (await fse.readdir(root)).map(async (name) => { const filePath = path.join(root, name); const stat = await fse.stat(filePath); diff --git a/docs/scripts/populatePickersDemos.js b/docs/scripts/populatePickersDemos.js index ba84a70aee0a2..5bc403bf58d8c 100644 --- a/docs/scripts/populatePickersDemos.js +++ b/docs/scripts/populatePickersDemos.js @@ -21,9 +21,7 @@ async function getFiles(root) { try { await Promise.all( - ( - await fse.readdir(root) - ).map(async (name) => { + (await fse.readdir(root)).map(async (name) => { const filePath = path.join(root, name); const stat = await fse.stat(filePath); diff --git a/package.json b/package.json index 40252e4e3e5b0..a4fcc6ffd66b6 100644 --- a/package.json +++ b/package.json @@ -158,8 +158,8 @@ "nyc": "^15.1.0", "patch-package": "^7.0.2", "postinstall-postinstall": "^2.1.0", - "prettier": "^2.8.8", - "pretty-quick": "^3.1.3", + "prettier": "^3.2.4", + "pretty-quick": "^4.0.0", "process": "^0.11.10", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/packages/grid/x-data-grid-premium/src/tests/clipboard.DataGridPremium.test.tsx b/packages/grid/x-data-grid-premium/src/tests/clipboard.DataGridPremium.test.tsx index 35cf72bac9314..ccf2a87d78f2f 100644 --- a/packages/grid/x-data-grid-premium/src/tests/clipboard.DataGridPremium.test.tsx +++ b/packages/grid/x-data-grid-premium/src/tests/clipboard.DataGridPremium.test.tsx @@ -39,7 +39,7 @@ describe(' - Clipboard', () => { ...column, type: 'string', editable: true, - } as GridColDef), + }) as GridColDef, ), }; }, [rowLength, colLength]); diff --git a/packages/grid/x-data-grid-pro/src/components/GridRowReorderCell.tsx b/packages/grid/x-data-grid-pro/src/components/GridRowReorderCell.tsx index a0cbacfe00788..36b9ff0e1439c 100644 --- a/packages/grid/x-data-grid-pro/src/components/GridRowReorderCell.tsx +++ b/packages/grid/x-data-grid-pro/src/components/GridRowReorderCell.tsx @@ -53,9 +53,9 @@ function GridRowReorderCell(params: GridRenderCellParams) { const publish = React.useCallback( ( - eventName: keyof GridRowEventLookup, - propHandler?: React.MouseEventHandler | undefined, - ): React.MouseEventHandler => + eventName: keyof GridRowEventLookup, + propHandler?: React.MouseEventHandler | undefined, + ): React.MouseEventHandler => (event) => { // Ignore portal if (isEventTargetInPortal(event)) { diff --git a/packages/grid/x-data-grid/src/components/GridFooter.tsx b/packages/grid/x-data-grid/src/components/GridFooter.tsx index 8a013ae22b229..23e6a8dcfc85e 100644 --- a/packages/grid/x-data-grid/src/components/GridFooter.tsx +++ b/packages/grid/x-data-grid/src/components/GridFooter.tsx @@ -9,46 +9,45 @@ import { GridSelectedRowCount } from './GridSelectedRowCount'; import { GridFooterContainer, GridFooterContainerProps } from './containers/GridFooterContainer'; import { useGridRootProps } from '../hooks/utils/useGridRootProps'; -const GridFooter = React.forwardRef(function GridFooter( - props, - ref, -) { - const apiRef = useGridApiContext(); - const rootProps = useGridRootProps(); - const totalTopLevelRowCount = useGridSelector(apiRef, gridTopLevelRowCountSelector); - const selectedRowCount = useGridSelector(apiRef, selectedGridRowsCountSelector); - const visibleTopLevelRowCount = useGridSelector(apiRef, gridFilteredTopLevelRowCountSelector); +const GridFooter = React.forwardRef( + function GridFooter(props, ref) { + const apiRef = useGridApiContext(); + const rootProps = useGridRootProps(); + const totalTopLevelRowCount = useGridSelector(apiRef, gridTopLevelRowCountSelector); + const selectedRowCount = useGridSelector(apiRef, selectedGridRowsCountSelector); + const visibleTopLevelRowCount = useGridSelector(apiRef, gridFilteredTopLevelRowCountSelector); - const selectedRowCountElement = - !rootProps.hideFooterSelectedRowCount && selectedRowCount > 0 ? ( - - ) : ( -
- ); + const selectedRowCountElement = + !rootProps.hideFooterSelectedRowCount && selectedRowCount > 0 ? ( + + ) : ( +
+ ); - const rowCountElement = - !rootProps.hideFooterRowCount && !rootProps.pagination ? ( - - ) : null; + const rowCountElement = + !rootProps.hideFooterRowCount && !rootProps.pagination ? ( + + ) : null; - const paginationElement = rootProps.pagination && - !rootProps.hideFooterPagination && - rootProps.slots.pagination && ( - - ); + const paginationElement = rootProps.pagination && + !rootProps.hideFooterPagination && + rootProps.slots.pagination && ( + + ); - return ( - - {selectedRowCountElement} - {rowCountElement} - {paginationElement} - - ); -}); + return ( + + {selectedRowCountElement} + {rowCountElement} + {paginationElement} + + ); + }, +); GridFooter.propTypes = { // ----------------------------- Warning -------------------------------- diff --git a/packages/grid/x-data-grid/src/components/GridRow.tsx b/packages/grid/x-data-grid/src/components/GridRow.tsx index e18d3d8ca67d9..c66b72793ff3e 100644 --- a/packages/grid/x-data-grid/src/components/GridRow.tsx +++ b/packages/grid/x-data-grid/src/components/GridRow.tsx @@ -211,9 +211,9 @@ const GridRow = React.forwardRef(function GridRow( const publish = React.useCallback( ( - eventName: keyof GridRowEventLookup, - propHandler: React.MouseEventHandler | undefined, - ): React.MouseEventHandler => + eventName: keyof GridRowEventLookup, + propHandler: React.MouseEventHandler | undefined, + ): React.MouseEventHandler => (event) => { // Ignore portal if (isEventTargetInPortal(event)) { diff --git a/packages/grid/x-data-grid/src/components/GridRowCount.tsx b/packages/grid/x-data-grid/src/components/GridRowCount.tsx index b2e1677a03c01..bbff5190068b5 100644 --- a/packages/grid/x-data-grid/src/components/GridRowCount.tsx +++ b/packages/grid/x-data-grid/src/components/GridRowCount.tsx @@ -40,35 +40,34 @@ const GridRowCountRoot = styled('div', { margin: theme.spacing(0, 2), })); -const GridRowCount = React.forwardRef(function GridRowCount( - props, - ref, -) { - const { className, rowCount, visibleRowCount, ...other } = props; - const apiRef = useGridApiContext(); - const ownerState = useGridRootProps(); - const classes = useUtilityClasses(ownerState); +const GridRowCount = React.forwardRef( + function GridRowCount(props, ref) { + const { className, rowCount, visibleRowCount, ...other } = props; + const apiRef = useGridApiContext(); + const ownerState = useGridRootProps(); + const classes = useUtilityClasses(ownerState); - if (rowCount === 0) { - return null; - } + if (rowCount === 0) { + return null; + } - const text = - visibleRowCount < rowCount - ? apiRef.current.getLocaleText('footerTotalVisibleRows')(visibleRowCount, rowCount) - : rowCount.toLocaleString(); + const text = + visibleRowCount < rowCount + ? apiRef.current.getLocaleText('footerTotalVisibleRows')(visibleRowCount, rowCount) + : rowCount.toLocaleString(); - return ( - - {apiRef.current.getLocaleText('footerTotalRows')} {text} - - ); -}); + return ( + + {apiRef.current.getLocaleText('footerTotalRows')} {text} + + ); + }, +); GridRowCount.propTypes = { // ----------------------------- Warning -------------------------------- diff --git a/packages/grid/x-data-grid/src/components/toolbar/GridToolbar.tsx b/packages/grid/x-data-grid/src/components/toolbar/GridToolbar.tsx index 4b537fbaef2f5..aa86e75b367df 100644 --- a/packages/grid/x-data-grid/src/components/toolbar/GridToolbar.tsx +++ b/packages/grid/x-data-grid/src/components/toolbar/GridToolbar.tsx @@ -26,48 +26,47 @@ export interface GridToolbarProps quickFilterProps?: GridToolbarQuickFilterProps; } -const GridToolbar = React.forwardRef(function GridToolbar( - props, - ref, -) { - // TODO v7: think about where export option should be passed. - // from slotProps={{ toolbarExport: { ...exportOption } }} seems to be more appropriate - const { - className, - csvOptions, - printOptions, - excelOptions, - showQuickFilter = false, - quickFilterProps = {}, - ...other - } = props; - const rootProps = useGridRootProps(); +const GridToolbar = React.forwardRef( + function GridToolbar(props, ref) { + // TODO v7: think about where export option should be passed. + // from slotProps={{ toolbarExport: { ...exportOption } }} seems to be more appropriate + const { + className, + csvOptions, + printOptions, + excelOptions, + showQuickFilter = false, + quickFilterProps = {}, + ...other + } = props; + const rootProps = useGridRootProps(); - if ( - rootProps.disableColumnFilter && - rootProps.disableColumnSelector && - rootProps.disableDensitySelector && - !showQuickFilter - ) { - return null; - } + if ( + rootProps.disableColumnFilter && + rootProps.disableColumnSelector && + rootProps.disableDensitySelector && + !showQuickFilter + ) { + return null; + } - return ( - - - - - - - {showQuickFilter && } - - ); -}); + return ( + + + + + + + {showQuickFilter && } + + ); + }, +); GridToolbar.propTypes = { // ----------------------------- Warning -------------------------------- diff --git a/packages/grid/x-data-grid/src/hooks/features/virtualization/useGridVirtualScroller.tsx b/packages/grid/x-data-grid/src/hooks/features/virtualization/useGridVirtualScroller.tsx index 03871736f1d57..f84849ac0f60a 100644 --- a/packages/grid/x-data-grid/src/hooks/features/virtualization/useGridVirtualScroller.tsx +++ b/packages/grid/x-data-grid/src/hooks/features/virtualization/useGridVirtualScroller.tsx @@ -442,7 +442,7 @@ export const useGridVirtualScroller = () => { ({ overflowX: !needsHorizontalScrollbar ? 'hidden' : undefined, overflowY: rootProps.autoHeight ? 'hidden' : undefined, - } as React.CSSProperties), + }) as React.CSSProperties, [needsHorizontalScrollbar, rootProps.autoHeight], ); diff --git a/packages/grid/x-data-grid/src/hooks/utils/useGridSelector.ts b/packages/grid/x-data-grid/src/hooks/utils/useGridSelector.ts index d5ac46af55e4e..a5337ea3c74cc 100644 --- a/packages/grid/x-data-grid/src/hooks/utils/useGridSelector.ts +++ b/packages/grid/x-data-grid/src/hooks/utils/useGridSelector.ts @@ -30,7 +30,7 @@ function applySelector( const defaultCompare = Object.is; export const objectShallowCompare = fastObjectShallowCompare; -const createRefs = () => ({ state: null, equals: null, selector: null } as any); +const createRefs = () => ({ state: null, equals: null, selector: null }) as any; export const useGridSelector = ( apiRef: React.MutableRefObject, diff --git a/packages/grid/x-data-grid/src/models/events/gridEventPublisher.ts b/packages/grid/x-data-grid/src/models/events/gridEventPublisher.ts index f8e3531ecc4c7..f7ff115683213 100644 --- a/packages/grid/x-data-grid/src/models/events/gridEventPublisher.ts +++ b/packages/grid/x-data-grid/src/models/events/gridEventPublisher.ts @@ -28,8 +28,8 @@ type GridEventPublisherArg = T extends { } ? PublisherArgsEvent : T extends { params: any } - ? PublisherArgsParams - : PublisherArgsNoParams; + ? PublisherArgsParams + : PublisherArgsNoParams; export type GridEventPublisher = ( ...params: GridEventPublisherArg diff --git a/packages/x-charts/src/ChartsLegend/ChartsLegend.tsx b/packages/x-charts/src/ChartsLegend/ChartsLegend.tsx index 169f62412e5b9..7ab77fe2f4f98 100644 --- a/packages/x-charts/src/ChartsLegend/ChartsLegend.tsx +++ b/packages/x-charts/src/ChartsLegend/ChartsLegend.tsx @@ -171,7 +171,7 @@ function DefaultChartsLegend(props: LegendRendererProps) { fill: (theme.vars || theme).palette.text.primary, lineHeight: 1, ...inLabelStyle, - } as ChartsTextStyle), // To say to TS that the dominantBaseline and textAnchor are correct + }) as ChartsTextStyle, // To say to TS that the dominantBaseline and textAnchor are correct [inLabelStyle, theme], ); diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/MultiSectionDigitalClock.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/MultiSectionDigitalClock.tsx index 8b6785fb880fb..0f4fbe64df7ba 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/MultiSectionDigitalClock.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/MultiSectionDigitalClock.tsx @@ -391,9 +391,12 @@ export const MultiSectionDigitalClock = React.forwardRef(function MultiSectionDi ); const viewTimeOptions = React.useMemo(() => { - return views.reduce((result, currentView) => { - return { ...result, [currentView]: buildViewProps(currentView) }; - }, {} as Record>); + return views.reduce( + (result, currentView) => { + return { ...result, [currentView]: buildViewProps(currentView) }; + }, + {} as Record>, + ); }, [views, buildViewProps]); const ownerState = props; diff --git a/packages/x-date-pickers/src/PickersTextField/PickersTextField.types.ts b/packages/x-date-pickers/src/PickersTextField/PickersTextField.types.ts index db8883d0254f2..ceb5909d56d5f 100644 --- a/packages/x-date-pickers/src/PickersTextField/PickersTextField.types.ts +++ b/packages/x-date-pickers/src/PickersTextField/PickersTextField.types.ts @@ -77,5 +77,5 @@ export type PickersTextFieldProps() => { ({ ...localization, localeText, - } as Omit, 'localeText'> & { + }) as Omit, 'localeText'> & { localeText: PickersLocaleText; - }), + }, [localization, localeText], ); }; diff --git a/packages/x-date-pickers/src/internals/hooks/useValidation.ts b/packages/x-date-pickers/src/internals/hooks/useValidation.ts index eaa4d4fbaaf6f..1742634d63b5b 100644 --- a/packages/x-date-pickers/src/internals/hooks/useValidation.ts +++ b/packages/x-date-pickers/src/internals/hooks/useValidation.ts @@ -22,9 +22,10 @@ export type ValidationProps = Valid > & TValidationProps; -export type InferError = TProps extends Pick, 'onError'> - ? Parameters>[0] - : never; +export type InferError = + TProps extends Pick, 'onError'> + ? Parameters>[0] + : never; export type Validator = (params: { adapter: MuiPickersAdapterContextValue; diff --git a/packages/x-date-pickers/src/internals/utils/validation/extractValidationProps.ts b/packages/x-date-pickers/src/internals/utils/validation/extractValidationProps.ts index c0e91aa1029d4..a2d90cde15101 100644 --- a/packages/x-date-pickers/src/internals/utils/validation/extractValidationProps.ts +++ b/packages/x-date-pickers/src/internals/utils/validation/extractValidationProps.ts @@ -56,9 +56,12 @@ type ValidationPropNames = (typeof VALIDATION_PROP_NAMES)[number]; * Limit the risk of forgetting some of them and reduce the bundle size. */ export const extractValidationProps = (props: Props) => - VALIDATION_PROP_NAMES.reduce((extractedProps, propName) => { - if (props.hasOwnProperty(propName)) { - extractedProps[propName] = props[propName]; - } - return extractedProps; - }, {} as Pick); + VALIDATION_PROP_NAMES.reduce( + (extractedProps, propName) => { + if (props.hasOwnProperty(propName)) { + extractedProps[propName] = props[propName]; + } + return extractedProps; + }, + {} as Pick, + ); diff --git a/packages/x-date-pickers/src/locales/beBY.ts b/packages/x-date-pickers/src/locales/beBY.ts index ff290e09184b1..169d8c2ad4a12 100644 --- a/packages/x-date-pickers/src/locales/beBY.ts +++ b/packages/x-date-pickers/src/locales/beBY.ts @@ -41,9 +41,7 @@ const beBYPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Абярыце ${views[view]}. ${ - time === null ? 'Час не абраны' : `Абраны час ${adapter.format(time, 'fullTime')}` - }`, + `Абярыце ${views[view]}. ${time === null ? 'Час не абраны' : `Абраны час ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} гадзін`, minutesClockNumberText: (minutes) => `${minutes} хвілін`, secondsClockNumberText: (seconds) => `${seconds} секунд`, diff --git a/packages/x-date-pickers/src/locales/caES.ts b/packages/x-date-pickers/src/locales/caES.ts index ad82c3f7c3ec8..27298775567d2 100644 --- a/packages/x-date-pickers/src/locales/caES.ts +++ b/packages/x-date-pickers/src/locales/caES.ts @@ -40,11 +40,7 @@ const caESPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Seleccione ${views[view]}. ${ - time === null - ? 'Sense temps seleccionat' - : `El temps seleccionat és ${adapter.format(time, 'fullTime')}` - }`, + `Seleccione ${views[view]}. ${time === null ? 'Sense temps seleccionat' : `El temps seleccionat és ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} hores`, minutesClockNumberText: (minutes) => `${minutes} minuts`, secondsClockNumberText: (seconds) => `${seconds} segons`, diff --git a/packages/x-date-pickers/src/locales/csCZ.ts b/packages/x-date-pickers/src/locales/csCZ.ts index baab53b389af8..b8f410479356c 100644 --- a/packages/x-date-pickers/src/locales/csCZ.ts +++ b/packages/x-date-pickers/src/locales/csCZ.ts @@ -41,9 +41,7 @@ const csCZPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view] ?? view} vybrány. ${ - time === null ? 'Není vybrán čas' : `Vybraný čas je ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view] ?? view} vybrány. ${time === null ? 'Není vybrán čas' : `Vybraný čas je ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} hodin`, minutesClockNumberText: (minutes) => `${minutes} minut`, secondsClockNumberText: (seconds) => `${seconds} sekund`, diff --git a/packages/x-date-pickers/src/locales/daDK.ts b/packages/x-date-pickers/src/locales/daDK.ts index 45be74c3579f0..ca9fe102970e5 100644 --- a/packages/x-date-pickers/src/locales/daDK.ts +++ b/packages/x-date-pickers/src/locales/daDK.ts @@ -41,11 +41,7 @@ const daDKPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Vælg ${timeViews[view] ?? view}. ${ - time === null - ? 'Intet tidspunkt valgt' - : `Valgte tidspunkt er ${adapter.format(time, 'fullTime')}` - }`, + `Vælg ${timeViews[view] ?? view}. ${time === null ? 'Intet tidspunkt valgt' : `Valgte tidspunkt er ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} timer`, minutesClockNumberText: (minutes) => `${minutes} minutter`, secondsClockNumberText: (seconds) => `${seconds} sekunder`, diff --git a/packages/x-date-pickers/src/locales/deDE.ts b/packages/x-date-pickers/src/locales/deDE.ts index e911966993717..e127b943f0fd6 100644 --- a/packages/x-date-pickers/src/locales/deDE.ts +++ b/packages/x-date-pickers/src/locales/deDE.ts @@ -41,11 +41,7 @@ const deDEPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view] ?? view} auswählen. ${ - time === null - ? 'Keine Uhrzeit ausgewählt' - : `Gewählte Uhrzeit ist ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view] ?? view} auswählen. ${time === null ? 'Keine Uhrzeit ausgewählt' : `Gewählte Uhrzeit ist ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} ${timeViews.hours}`, minutesClockNumberText: (minutes) => `${minutes} ${timeViews.minutes}`, secondsClockNumberText: (seconds) => `${seconds} ${timeViews.seconds}`, diff --git a/packages/x-date-pickers/src/locales/elGR.ts b/packages/x-date-pickers/src/locales/elGR.ts index 2c4ae628dc829..26c5967eedd92 100644 --- a/packages/x-date-pickers/src/locales/elGR.ts +++ b/packages/x-date-pickers/src/locales/elGR.ts @@ -40,11 +40,7 @@ const elGRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Επιλέξτε ${views[view]}. ${ - time === null - ? 'Δεν έχει επιλεγεί ώρα' - : `Η επιλεγμένη ώρα είναι ${adapter.format(time, 'fullTime')}` - }`, + `Επιλέξτε ${views[view]}. ${time === null ? 'Δεν έχει επιλεγεί ώρα' : `Η επιλεγμένη ώρα είναι ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} ώρες`, minutesClockNumberText: (minutes) => `${minutes} λεπτά`, secondsClockNumberText: (seconds) => `${seconds} δευτερόλεπτα`, diff --git a/packages/x-date-pickers/src/locales/esES.ts b/packages/x-date-pickers/src/locales/esES.ts index c355724c62c79..3c3e77a8f503a 100644 --- a/packages/x-date-pickers/src/locales/esES.ts +++ b/packages/x-date-pickers/src/locales/esES.ts @@ -40,11 +40,7 @@ const esESPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Seleccione ${views[view]}. ${ - time === null - ? 'No hay hora seleccionada' - : `La hora seleccionada es ${adapter.format(time, 'fullTime')}` - }`, + `Seleccione ${views[view]}. ${time === null ? 'No hay hora seleccionada' : `La hora seleccionada es ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} horas`, minutesClockNumberText: (minutes) => `${minutes} minutos`, secondsClockNumberText: (seconds) => `${seconds} segundos`, diff --git a/packages/x-date-pickers/src/locales/eu.ts b/packages/x-date-pickers/src/locales/eu.ts index d99e2febb7a18..b881101612371 100644 --- a/packages/x-date-pickers/src/locales/eu.ts +++ b/packages/x-date-pickers/src/locales/eu.ts @@ -40,11 +40,7 @@ const euPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Aukeratu ${views[view]}. ${ - time === null - ? 'Ez da ordurik aukertau' - : `Aukeratutako ordua ${adapter.format(time, 'fullTime')} da` - }`, + `Aukeratu ${views[view]}. ${time === null ? 'Ez da ordurik aukertau' : `Aukeratutako ordua ${adapter.format(time, 'fullTime')} da`}`, hoursClockNumberText: (hours) => `${hours} ordu`, minutesClockNumberText: (minutes) => `${minutes} minutu`, secondsClockNumberText: (seconds) => `${seconds} segundu`, diff --git a/packages/x-date-pickers/src/locales/faIR.ts b/packages/x-date-pickers/src/locales/faIR.ts index 64545ebd2a264..d7b8a0cc2d867 100644 --- a/packages/x-date-pickers/src/locales/faIR.ts +++ b/packages/x-date-pickers/src/locales/faIR.ts @@ -40,11 +40,7 @@ const faIRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - ` را انتخاب کنید ${timeViews[view]}. ${ - time === null - ? 'هیچ ساعتی انتخاب نشده است' - : `ساعت انتخاب ${adapter.format(time, 'fullTime')} می باشد` - }`, + ` را انتخاب کنید ${timeViews[view]}. ${time === null ? 'هیچ ساعتی انتخاب نشده است' : `ساعت انتخاب ${adapter.format(time, 'fullTime')} می باشد`}`, hoursClockNumberText: (hours) => `${hours} ساعت ها`, minutesClockNumberText: (minutes) => `${minutes} دقیقه ها`, secondsClockNumberText: (seconds) => `${seconds} ثانیه ها`, diff --git a/packages/x-date-pickers/src/locales/fiFI.ts b/packages/x-date-pickers/src/locales/fiFI.ts index 9bcca993f08bf..91467255f533c 100644 --- a/packages/x-date-pickers/src/locales/fiFI.ts +++ b/packages/x-date-pickers/src/locales/fiFI.ts @@ -40,9 +40,7 @@ const fiFIPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Valitse ${views[view]}. ${ - time === null ? 'Ei aikaa valittuna' : `Valittu aika on ${adapter.format(time, 'fullTime')}` - }`, + `Valitse ${views[view]}. ${time === null ? 'Ei aikaa valittuna' : `Valittu aika on ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} tuntia`, minutesClockNumberText: (minutes) => `${minutes} minuuttia`, secondsClockNumberText: (seconds) => `${seconds} sekunttia`, diff --git a/packages/x-date-pickers/src/locales/frFR.ts b/packages/x-date-pickers/src/locales/frFR.ts index 6fdb39d1e9ba1..db81e7b1eeaca 100644 --- a/packages/x-date-pickers/src/locales/frFR.ts +++ b/packages/x-date-pickers/src/locales/frFR.ts @@ -40,11 +40,7 @@ const frFRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Choix des ${views[view]}. ${ - time === null - ? 'Aucune heure choisie' - : `L'heure choisie est ${adapter.format(time, 'fullTime')}` - }`, + `Choix des ${views[view]}. ${time === null ? 'Aucune heure choisie' : `L'heure choisie est ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} heures`, minutesClockNumberText: (minutes) => `${minutes} minutes`, secondsClockNumberText: (seconds) => `${seconds} secondes`, diff --git a/packages/x-date-pickers/src/locales/heIL.ts b/packages/x-date-pickers/src/locales/heIL.ts index 98f438249a0cb..ebd976ce5e8f8 100644 --- a/packages/x-date-pickers/src/locales/heIL.ts +++ b/packages/x-date-pickers/src/locales/heIL.ts @@ -40,9 +40,7 @@ const heILPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `בחירת ${views[view]}. ${ - time === null ? 'לא נבחרה שעה' : `השעה הנבחרת היא ${adapter.format(time, 'fullTime')}` - }`, + `בחירת ${views[view]}. ${time === null ? 'לא נבחרה שעה' : `השעה הנבחרת היא ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} שעות`, minutesClockNumberText: (minutes) => `${minutes} דקות`, secondsClockNumberText: (seconds) => `${seconds} שניות`, diff --git a/packages/x-date-pickers/src/locales/huHU.ts b/packages/x-date-pickers/src/locales/huHU.ts index 3738aa46e1af9..aa1fe6d53e2ff 100644 --- a/packages/x-date-pickers/src/locales/huHU.ts +++ b/packages/x-date-pickers/src/locales/huHU.ts @@ -41,11 +41,7 @@ const huHUPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view] ?? view} kiválasztása. ${ - time === null - ? 'Nincs kiválasztva idő' - : `A kiválasztott idő ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view] ?? view} kiválasztása. ${time === null ? 'Nincs kiválasztva idő' : `A kiválasztott idő ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} ${timeViews.hours.toLowerCase()}`, minutesClockNumberText: (minutes) => `${minutes} ${timeViews.minutes.toLowerCase()}`, secondsClockNumberText: (seconds) => `${seconds} ${timeViews.seconds.toLowerCase()}`, diff --git a/packages/x-date-pickers/src/locales/isIS.ts b/packages/x-date-pickers/src/locales/isIS.ts index e478eefdd3f3f..cd67cfd53792d 100644 --- a/packages/x-date-pickers/src/locales/isIS.ts +++ b/packages/x-date-pickers/src/locales/isIS.ts @@ -40,9 +40,7 @@ const isISPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Velja ${timeViews[view]}. ${ - time === null ? 'Enginn tími valinn' : `Valinn tími er ${adapter.format(time, 'fullTime')}` - }`, + `Velja ${timeViews[view]}. ${time === null ? 'Enginn tími valinn' : `Valinn tími er ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} klukkustundir`, minutesClockNumberText: (minutes) => `${minutes} mínútur`, secondsClockNumberText: (seconds) => `${seconds} sekúndur`, diff --git a/packages/x-date-pickers/src/locales/itIT.ts b/packages/x-date-pickers/src/locales/itIT.ts index e7ac7b62703b5..0486b52fc0358 100644 --- a/packages/x-date-pickers/src/locales/itIT.ts +++ b/packages/x-date-pickers/src/locales/itIT.ts @@ -40,11 +40,7 @@ const itITPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Seleziona ${views[view]}. ${ - time === null - ? 'Nessun orario selezionato' - : `L'ora selezionata è ${adapter.format(time, 'fullTime')}` - }`, + `Seleziona ${views[view]}. ${time === null ? 'Nessun orario selezionato' : `L'ora selezionata è ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} ore`, minutesClockNumberText: (minutes) => `${minutes} minuti`, secondsClockNumberText: (seconds) => `${seconds} secondi`, diff --git a/packages/x-date-pickers/src/locales/jaJP.ts b/packages/x-date-pickers/src/locales/jaJP.ts index 0d822813e62de..16c6df2f3cf4d 100644 --- a/packages/x-date-pickers/src/locales/jaJP.ts +++ b/packages/x-date-pickers/src/locales/jaJP.ts @@ -41,11 +41,7 @@ const jaJPPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view] ?? view}を選択してください ${ - time === null - ? '時間が選択されていません' - : `選択した時間は ${adapter.format(time, 'fullTime')} です` - }`, + `${timeViews[view] ?? view}を選択してください ${time === null ? '時間が選択されていません' : `選択した時間は ${adapter.format(time, 'fullTime')} です`}`, hoursClockNumberText: (hours) => `${hours} ${timeViews.hours}`, minutesClockNumberText: (minutes) => `${minutes} ${timeViews.minutes}`, secondsClockNumberText: (seconds) => `${seconds} ${timeViews.seconds}`, diff --git a/packages/x-date-pickers/src/locales/koKR.ts b/packages/x-date-pickers/src/locales/koKR.ts index 51c64f0c4bb49..924c221844483 100644 --- a/packages/x-date-pickers/src/locales/koKR.ts +++ b/packages/x-date-pickers/src/locales/koKR.ts @@ -40,11 +40,7 @@ const koKRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${views[view]} 선택하세요. ${ - time === null - ? '시간을 선택하지 않았습니다.' - : `현재 선택된 시간은 ${adapter.format(time, 'fullTime')}입니다.` - }`, + `${views[view]} 선택하세요. ${time === null ? '시간을 선택하지 않았습니다.' : `현재 선택된 시간은 ${adapter.format(time, 'fullTime')}입니다.`}`, hoursClockNumberText: (hours) => `${hours}시간`, minutesClockNumberText: (minutes) => `${minutes}분`, secondsClockNumberText: (seconds) => `${seconds}초`, diff --git a/packages/x-date-pickers/src/locales/kzKZ.ts b/packages/x-date-pickers/src/locales/kzKZ.ts index c27450d3df48a..182969bd12163 100644 --- a/packages/x-date-pickers/src/locales/kzKZ.ts +++ b/packages/x-date-pickers/src/locales/kzKZ.ts @@ -41,9 +41,7 @@ const kzKZPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view]} таңдау. ${ - time === null ? 'Уақыт таңдалмаған' : `Таңдалған уақыт ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view]} таңдау. ${time === null ? 'Уақыт таңдалмаған' : `Таңдалған уақыт ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} сағат`, minutesClockNumberText: (minutes) => `${minutes} минут`, secondsClockNumberText: (seconds) => `${seconds} секунд`, diff --git a/packages/x-date-pickers/src/locales/mk.ts b/packages/x-date-pickers/src/locales/mk.ts index ec45ce7f53610..b8e81d03bc95a 100644 --- a/packages/x-date-pickers/src/locales/mk.ts +++ b/packages/x-date-pickers/src/locales/mk.ts @@ -34,9 +34,7 @@ const mkPickers: PickersLocaleText = { // Clock labels clockLabelText: (view, time, adapter) => - `Select ${view}. ${ - time === null ? 'Нема избрано време' : `Избраното време е ${adapter.format(time, 'fullTime')}` - }`, + `Select ${view}. ${time === null ? 'Нема избрано време' : `Избраното време е ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} часа`, minutesClockNumberText: (minutes) => `${minutes} минути`, secondsClockNumberText: (seconds) => `${seconds} секунди`, diff --git a/packages/x-date-pickers/src/locales/nbNO.ts b/packages/x-date-pickers/src/locales/nbNO.ts index 68b44e72e9c2b..71ed7150cf06d 100644 --- a/packages/x-date-pickers/src/locales/nbNO.ts +++ b/packages/x-date-pickers/src/locales/nbNO.ts @@ -40,9 +40,7 @@ const nbNOPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Velg ${timeViews[view]}. ${ - time === null ? 'Ingen tid valgt' : `Valgt tid er ${adapter.format(time, 'fullTime')}` - }`, + `Velg ${timeViews[view]}. ${time === null ? 'Ingen tid valgt' : `Valgt tid er ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} timer`, minutesClockNumberText: (minutes) => `${minutes} minutter`, secondsClockNumberText: (seconds) => `${seconds} sekunder`, diff --git a/packages/x-date-pickers/src/locales/nlNL.ts b/packages/x-date-pickers/src/locales/nlNL.ts index 56477a3234d5c..569a055be8ecf 100644 --- a/packages/x-date-pickers/src/locales/nlNL.ts +++ b/packages/x-date-pickers/src/locales/nlNL.ts @@ -40,11 +40,7 @@ const nlNLPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Selecteer ${timeViews[view]}. ${ - time === null - ? 'Geen tijd geselecteerd' - : `Geselecteerde tijd is ${adapter.format(time, 'fullTime')}` - }`, + `Selecteer ${timeViews[view]}. ${time === null ? 'Geen tijd geselecteerd' : `Geselecteerde tijd is ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} uren`, minutesClockNumberText: (minutes) => `${minutes} minuten`, secondsClockNumberText: (seconds) => `${seconds} seconden`, diff --git a/packages/x-date-pickers/src/locales/plPL.ts b/packages/x-date-pickers/src/locales/plPL.ts index dc2133f322d66..09b6c3ed16791 100644 --- a/packages/x-date-pickers/src/locales/plPL.ts +++ b/packages/x-date-pickers/src/locales/plPL.ts @@ -40,9 +40,7 @@ const plPLPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Wybierz ${timeViews[view]}. ${ - time === null ? 'Nie wybrano czasu' : `Wybrany czas to ${adapter.format(time, 'fullTime')}` - }`, + `Wybierz ${timeViews[view]}. ${time === null ? 'Nie wybrano czasu' : `Wybrany czas to ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} godzin`, minutesClockNumberText: (minutes) => `${minutes} minut`, secondsClockNumberText: (seconds) => `${seconds} sekund`, diff --git a/packages/x-date-pickers/src/locales/ptBR.ts b/packages/x-date-pickers/src/locales/ptBR.ts index 4b0d4ccfa96ce..f85c47e588f3a 100644 --- a/packages/x-date-pickers/src/locales/ptBR.ts +++ b/packages/x-date-pickers/src/locales/ptBR.ts @@ -40,11 +40,7 @@ const ptBRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Selecione ${timeViews[view]}. ${ - time === null - ? 'Hora não selecionada' - : `Selecionado a hora ${adapter.format(time, 'fullTime')}` - }`, + `Selecione ${timeViews[view]}. ${time === null ? 'Hora não selecionada' : `Selecionado a hora ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} horas`, minutesClockNumberText: (minutes) => `${minutes} minutos`, secondsClockNumberText: (seconds) => `${seconds} segundos`, diff --git a/packages/x-date-pickers/src/locales/roRO.ts b/packages/x-date-pickers/src/locales/roRO.ts index 2334197303aed..8fec3086a5915 100644 --- a/packages/x-date-pickers/src/locales/roRO.ts +++ b/packages/x-date-pickers/src/locales/roRO.ts @@ -41,11 +41,7 @@ const roROPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Selectați ${timeViews[view] ?? view}. ${ - time === null - ? 'Nicio oră selectată' - : `Ora selectată este ${adapter.format(time, 'fullTime')}` - }`, + `Selectați ${timeViews[view] ?? view}. ${time === null ? 'Nicio oră selectată' : `Ora selectată este ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} ${timeViews.hours}`, minutesClockNumberText: (minutes) => `${minutes} ${timeViews.minutes}`, secondsClockNumberText: (seconds) => `${seconds} ${timeViews.seconds}`, diff --git a/packages/x-date-pickers/src/locales/ruRU.ts b/packages/x-date-pickers/src/locales/ruRU.ts index 51ac1279c05bc..60e0a7472b9c4 100644 --- a/packages/x-date-pickers/src/locales/ruRU.ts +++ b/packages/x-date-pickers/src/locales/ruRU.ts @@ -41,9 +41,7 @@ const ruRUPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Выбрать ${timeViews[view]}. ${ - time === null ? 'Время не выбрано' : `Выбрано время ${adapter.format(time, 'fullTime')}` - }`, + `Выбрать ${timeViews[view]}. ${time === null ? 'Время не выбрано' : `Выбрано время ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} часов`, minutesClockNumberText: (minutes) => `${minutes} минут`, secondsClockNumberText: (seconds) => `${seconds} секунд`, diff --git a/packages/x-date-pickers/src/locales/skSK.ts b/packages/x-date-pickers/src/locales/skSK.ts index 96cdfd13bde1b..50dedc467da6b 100644 --- a/packages/x-date-pickers/src/locales/skSK.ts +++ b/packages/x-date-pickers/src/locales/skSK.ts @@ -41,9 +41,7 @@ const skSKPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view] ?? view} vybraný. ${ - time === null ? 'Nie je vybraný čas' : `Vybraný čas je ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view] ?? view} vybraný. ${time === null ? 'Nie je vybraný čas' : `Vybraný čas je ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} hodín`, minutesClockNumberText: (minutes) => `${minutes} minút`, secondsClockNumberText: (seconds) => `${seconds} sekúnd`, diff --git a/packages/x-date-pickers/src/locales/svSE.ts b/packages/x-date-pickers/src/locales/svSE.ts index 498c02df0c2b9..deaf8e181a30d 100644 --- a/packages/x-date-pickers/src/locales/svSE.ts +++ b/packages/x-date-pickers/src/locales/svSE.ts @@ -40,9 +40,7 @@ const svSEPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Välj ${timeViews[view]}. ${ - time === null ? 'Ingen tid vald' : `Vald tid är ${adapter.format(time, 'fullTime')}` - }`, + `Välj ${timeViews[view]}. ${time === null ? 'Ingen tid vald' : `Vald tid är ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} timmar`, minutesClockNumberText: (minutes) => `${minutes} minuter`, secondsClockNumberText: (seconds) => `${seconds} sekunder`, diff --git a/packages/x-date-pickers/src/locales/trTR.ts b/packages/x-date-pickers/src/locales/trTR.ts index 948c0cc1e2b0b..3d0d969d33a4b 100644 --- a/packages/x-date-pickers/src/locales/trTR.ts +++ b/packages/x-date-pickers/src/locales/trTR.ts @@ -40,9 +40,7 @@ const trTRPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view]} seç. ${ - time === null ? 'Zaman seçilmedi' : `Seçilen zaman: ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view]} seç. ${time === null ? 'Zaman seçilmedi' : `Seçilen zaman: ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} saat`, minutesClockNumberText: (minutes) => `${minutes} dakika`, secondsClockNumberText: (seconds) => `${seconds} saniye`, diff --git a/packages/x-date-pickers/src/locales/ukUA.ts b/packages/x-date-pickers/src/locales/ukUA.ts index d9895177ac12c..dc1834f35fd03 100644 --- a/packages/x-date-pickers/src/locales/ukUA.ts +++ b/packages/x-date-pickers/src/locales/ukUA.ts @@ -40,9 +40,7 @@ const ukUAPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Вибрати ${timeViews[view]}. ${ - time === null ? 'Час не вибраний' : `Вибрано час ${adapter.format(time, 'fullTime')}` - }`, + `Вибрати ${timeViews[view]}. ${time === null ? 'Час не вибраний' : `Вибрано час ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} годин`, minutesClockNumberText: (minutes) => `${minutes} хвилин`, secondsClockNumberText: (seconds) => `${seconds} секунд`, diff --git a/packages/x-date-pickers/src/locales/urPK.ts b/packages/x-date-pickers/src/locales/urPK.ts index ab0043a0aef98..5e084d321531b 100644 --- a/packages/x-date-pickers/src/locales/urPK.ts +++ b/packages/x-date-pickers/src/locales/urPK.ts @@ -40,9 +40,7 @@ const urPKPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `${timeViews[view]} منتخب کریں ${ - time === null ? 'کوئی وقت منتخب نہیں' : `منتخب وقت ہے ${adapter.format(time, 'fullTime')}` - }`, + `${timeViews[view]} منتخب کریں ${time === null ? 'کوئی وقت منتخب نہیں' : `منتخب وقت ہے ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} گھنٹے`, minutesClockNumberText: (minutes) => `${minutes} منٹ`, secondsClockNumberText: (seconds) => `${seconds} سیکنڈ`, diff --git a/packages/x-date-pickers/src/locales/viVN.ts b/packages/x-date-pickers/src/locales/viVN.ts index 638f4c58fdf6b..4cf2360aae0db 100644 --- a/packages/x-date-pickers/src/locales/viVN.ts +++ b/packages/x-date-pickers/src/locales/viVN.ts @@ -40,11 +40,7 @@ const viVNPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `Chọn ${views[view]}. ${ - time === null - ? 'Không có giờ được chọn' - : `Giờ được chọn là ${adapter.format(time, 'fullTime')}` - }`, + `Chọn ${views[view]}. ${time === null ? 'Không có giờ được chọn' : `Giờ được chọn là ${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours} giờ`, minutesClockNumberText: (minutes) => `${minutes} phút`, secondsClockNumberText: (seconds) => `${seconds} giây`, diff --git a/packages/x-date-pickers/src/locales/zhCN.ts b/packages/x-date-pickers/src/locales/zhCN.ts index ec77887c5bed7..20a417ef8e0f2 100644 --- a/packages/x-date-pickers/src/locales/zhCN.ts +++ b/packages/x-date-pickers/src/locales/zhCN.ts @@ -38,9 +38,7 @@ const zhCNPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `选择 ${views[view]}. ${ - time === null ? '未选择时间' : `已选择${adapter.format(time, 'fullTime')}` - }`, + `选择 ${views[view]}. ${time === null ? '未选择时间' : `已选择${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours}小时`, minutesClockNumberText: (minutes) => `${minutes}分钟`, secondsClockNumberText: (seconds) => `${seconds}秒`, diff --git a/packages/x-date-pickers/src/locales/zhHK.ts b/packages/x-date-pickers/src/locales/zhHK.ts index c06008ad29164..47ed29b16abbb 100644 --- a/packages/x-date-pickers/src/locales/zhHK.ts +++ b/packages/x-date-pickers/src/locales/zhHK.ts @@ -38,9 +38,7 @@ const zhHKPickers: Partial> = { // Clock labels clockLabelText: (view, time, adapter) => - `選擇 ${views[view]}. ${ - time === null ? '未選擇時間' : `已選擇${adapter.format(time, 'fullTime')}` - }`, + `選擇 ${views[view]}. ${time === null ? '未選擇時間' : `已選擇${adapter.format(time, 'fullTime')}`}`, hoursClockNumberText: (hours) => `${hours}小時`, minutesClockNumberText: (minutes) => `${minutes}分鐘`, secondsClockNumberText: (seconds) => `${seconds}秒`, diff --git a/packages/x-tree-view/src/internals/models/helpers.ts b/packages/x-tree-view/src/internals/models/helpers.ts index fd75bd4e83203..127a5e29cb679 100644 --- a/packages/x-tree-view/src/internals/models/helpers.ts +++ b/packages/x-tree-view/src/internals/models/helpers.ts @@ -13,8 +13,8 @@ type IsAny = 0 extends 1 & T ? true : false; export type OptionalIfEmpty = keyof B extends never ? Partial> : IsAny extends true - ? Partial> - : Record; + ? Partial> + : Record; export type MergePluginsProperty< TPlugins extends readonly any[], diff --git a/prettier.config.js b/prettier.config.js index c7922673c7d37..7193b2e61f63f 100644 --- a/prettier.config.js +++ b/prettier.config.js @@ -2,5 +2,13 @@ const baseline = require('@mui/monorepo/prettier.config'); module.exports = { ...baseline, - overrides: [...baseline.overrides], + overrides: [ + ...baseline.overrides, + { + files: ['**/*.json'], + options: { + trailingComma: 'none', + }, + }, + ], }; diff --git a/templates/x-data-grid/public/index.html b/templates/x-data-grid/public/index.html index 607c9c672d56d..0a7ab2d3bbbca 100644 --- a/templates/x-data-grid/public/index.html +++ b/templates/x-data-grid/public/index.html @@ -1,4 +1,4 @@ - + DataGridProDemo demo — MUI X diff --git a/test/e2e/template.html b/test/e2e/template.html index 697cf295764b1..081f21ed377a0 100644 --- a/test/e2e/template.html +++ b/test/e2e/template.html @@ -1,4 +1,4 @@ - + Playwright end-to-end test diff --git a/test/regressions/template.html b/test/regressions/template.html index b5067aff9f5b8..0c2940920a764 100644 --- a/test/regressions/template.html +++ b/test/regressions/template.html @@ -1,4 +1,4 @@ - + vrtest diff --git a/test/utils/typeUtils.ts b/test/utils/typeUtils.ts index 5df6b96d07e05..5611fefed4093 100644 --- a/test/utils/typeUtils.ts +++ b/test/utils/typeUtils.ts @@ -1,5 +1,4 @@ export type Expect = T; -export type Equal = (() => T extends X ? 1 : 2) extends () => T extends Y ? 1 : 2 - ? true - : false; +export type Equal = + (() => T extends X ? 1 : 2) extends () => T extends Y ? 1 : 2 ? true : false; diff --git a/yarn.lock b/yarn.lock index dc0d60009e735..e68ec8864c4d5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1868,7 +1868,7 @@ "@mui/monorepo@https://github.com/mui/material-ui.git#master": version "5.15.6" - resolved "https://github.com/mui/material-ui.git#8c039dd027216bccaf85fe34797b91becc29b4c6" + resolved "https://github.com/mui/material-ui.git#b63fb955e6cfab340fdc3597fbb399493d39d81d" dependencies: "@googleapis/sheets" "^5.0.5" "@slack/bolt" "^3.17.1" @@ -4954,14 +4954,6 @@ chalk@^2.3.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" @@ -7026,21 +7018,6 @@ execa@5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -execa@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" - integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - execa@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -7693,7 +7670,7 @@ get-stream@6.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.0.tgz#3e0012cb6827319da2706e601a1583e8629a6718" integrity sha512-A1B3Bh1UmL0bidM/YX2NsCOTnGJePL9rO/M+Mw3m9f2gUpfokS0hi5Eah0WSUEWZdZhIZtMjkIYS7mDfOqNHbg== -get-stream@^5.0.0, get-stream@^5.1.0: +get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== @@ -8341,11 +8318,6 @@ https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.2: agent-base "^7.0.2" debug "4" -human-signals@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== - human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -8401,7 +8373,7 @@ ignore-walk@^6.0.4: dependencies: minimatch "^9.0.0" -ignore@^5.0.4, ignore@^5.0.5, ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4: +ignore@^5.0.4, ignore@^5.0.5, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== @@ -10695,7 +10667,7 @@ moo@^0.5.0: resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c" integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q== -mri@^1.1.5: +mri@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== @@ -10731,17 +10703,6 @@ multimatch@5.0.0: arrify "^2.0.1" minimatch "^3.0.4" -multimatch@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" - integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ== - dependencies: - "@types/minimatch" "^3.0.3" - array-differ "^3.0.0" - array-union "^2.1.0" - arrify "^2.0.1" - minimatch "^3.0.4" - multipipe@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-1.0.2.tgz#cc13efd833c9cda99f224f868461b8e1a3fd939d" @@ -11134,7 +11095,7 @@ npm-registry-fetch@^16.0.0: npm-package-arg "^11.0.0" proc-log "^3.0.0" -npm-run-path@^4.0.0, npm-run-path@^4.0.1: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -11933,6 +11894,11 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== +picomatch@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-3.0.1.tgz#817033161def55ec9638567a2f3bbc876b3e7516" + integrity sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag== + pify@5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" @@ -12080,10 +12046,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.2.4: + version "3.2.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283" + integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ== pretty-error@^4.0.0: version "4.0.0" @@ -12111,17 +12077,18 @@ pretty-format@^29.7.0: ansi-styles "^5.0.0" react-is "^18.0.0" -pretty-quick@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.3.tgz#15281108c0ddf446675157ca40240099157b638e" - integrity sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA== +pretty-quick@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-4.0.0.tgz#ea5cce85a5804bfbec7327b0e064509155d03f39" + integrity sha512-M+2MmeufXb/M7Xw3Afh1gxcYpj+sK0AxEfnfF958ktFeAyi5MsKY5brymVURQLgPLV1QaF5P4pb2oFJ54H3yzQ== dependencies: - chalk "^3.0.0" - execa "^4.0.0" - find-up "^4.1.0" - ignore "^5.1.4" - mri "^1.1.5" - multimatch "^4.0.0" + execa "^5.1.1" + find-up "^5.0.0" + ignore "^5.3.0" + mri "^1.2.0" + picocolors "^1.0.0" + picomatch "^3.0.1" + tslib "^2.6.2" prettyjson@^1.2.1: version "1.2.5"