Skip to content

[code-infra] Optimize dependency definition #22006

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasTy merged 1 commit into from
Apr 8, 2026
Merged

[code-infra] Optimize dependency definition #22006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"link-check": "tsx ./scripts/reportBrokenLinks.mts"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.7",
"@atlaskit/pragmatic-drag-and-drop": "catalog:",
"@babel/core": "catalog:",
"@babel/runtime": "catalog:",
"@date-fns/tz": "catalog:",
Expand Down
6 changes: 2 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@
"@playwright/test": "catalog:",
"@types/babel__core": "7.20.5",
"@types/babel__traverse": "7.28.0",
"@types/chai-dom": "1.11.3",
"@types/node": "22.19.3",
"@types/react": "catalog:",
"@types/react-dom": "catalog:",
Expand All @@ -101,7 +100,6 @@
"babel-plugin-react-remove-properties": "catalog:",
"babel-plugin-search-and-replace": "1.1.1",
"babel-plugin-transform-replace-expressions": "0.2.0",
"chai-dom": "1.12.1",
"concurrently": "9.2.1",
"cross-env": "catalog:",
"danger": "13.0.5",
Expand All @@ -113,9 +111,9 @@
"eslint-plugin-consistent-default-export-name": "0.0.15",
"eslint-plugin-jsdoc": "62.5.2",
"eslint-plugin-mui-x": "workspace:^",
"execa": "9.6.1",
"execa": "catalog:",
"globby": "16.1.1",
"jsdom": "26.1.0",
"jsdom": "catalog:",
"lerna": "9.0.4",
"markdownlint-cli2": "0.21.0",
"moment": "catalog:",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts-vendor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"@babel/plugin-transform-modules-commonjs": "7.28.6",
"@babel/plugin-transform-runtime": "catalog:",
"babel-plugin-module-resolver": "5.0.2",
"execa": "9.6.1",
"execa": "catalog:",
"rimraf": "catalog:"
},
"publishConfig": {
Expand Down
2 changes: 1 addition & 1 deletion packages/x-data-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"@mui/internal-test-utils": "catalog:",
"@mui/material": "catalog:",
"@mui/system": "catalog:",
"@mui/types": "7.4.12",
"@mui/types": "catalog:",
"@types/prop-types": "catalog:",
"@types/use-sync-external-store": "catalog:",
"react": "catalog:",
Expand Down
3 changes: 2 additions & 1 deletion packages/x-data-grid/src/tests/layout.DataGrid.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,8 @@ describe('<DataGrid /> - Layout & warnings', () => {
}).toErrorDev([
reactMajor >= 19 &&
'The Data Grid component requires all rows to have a unique `id` property',
reactMajor < 19 && 'The above error occurred in the <ForwardRef(DataGrid2)> component',
// `ForwardRef(DataGrid)` on newer `@vitejs/plugin-react`, `ForwardRef(DataGrid2)` on older ones.
Copy link
Copy Markdown
Member

@JCQuintas JCQuintas Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we ever use older plugins? Can't we just use the value without the 2 at the end now? <ForwardRef(DataGrid)>

Copy link
Copy Markdown
Member Author

@LukasTy LukasTy Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We currently use the older plugin, which builds the name with 2.
After upgrading to the latest plugin, it's to without the 2.
So, this prepares for the plugin bump, when other packages are read and don't break when running browser tests.

Are you suggesting ditching the comment altogether?

Copy link
Copy Markdown
Member

@JCQuintas JCQuintas Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I was under the impression we were using the newer plugin. It is fine then until we change.

reactMajor < 19 && 'The above error occurred in the <ForwardRef(DataGrid',
Copy link
Copy Markdown
Member

@Janpot Janpot Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding a displayName to the grid should stabilize this

]);
expect((errorRef.current as any).errors).to.have.length(1);
expect((errorRef.current as any).errors[0].toString()).to.include(
Expand Down
3 changes: 2 additions & 1 deletion packages/x-data-grid/src/tests/slots.DataGrid.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ describe('<DataGrid /> - Slots', () => {
}).toErrorDev([
reactMajor >= 19 &&
'MUI X Data Grid: useGridRootProps should only be used inside a Data Grid component. The component must be a child of DataGrid, DataGridPro, or DataGridPremium. Ensure your component is properly nested within a Data Grid.',
reactMajor < 19 && 'The above error occurred in the <ForwardRef(GridOverlay2)> component',
// `ForwardRef(GridOverlay)` on newer `@vitejs/plugin-react`, `ForwardRef(GridOverlay2)` on older ones.
reactMajor < 19 && 'The above error occurred in the <ForwardRef(GridOverlay',
]);
});

Expand Down
2 changes: 1 addition & 1 deletion packages/x-scheduler-headless-premium/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@babel/runtime": "catalog:",
"@base-ui/react": "^1.3.0",
"@base-ui/react": "catalog:",
"@base-ui/utils": "catalog:",
"@mui/x-scheduler-headless": "workspace:*",
"@mui/x-internals": "workspace:*",
Expand Down
4 changes: 2 additions & 2 deletions packages/x-scheduler-headless/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@
"directory": "packages/x-scheduler"
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.7.7",
"@atlaskit/pragmatic-drag-and-drop": "catalog:",
"@atlaskit/pragmatic-drag-and-drop-auto-scroll": "^2.1.2",
"@babel/runtime": "catalog:",
"@base-ui/react": "^1.3.0",
"@base-ui/react": "catalog:",
"@base-ui/utils": "catalog:",
"@date-fns/tz": "catalog:",
"@floating-ui/react": "^0.27.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-scheduler-premium/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"dependencies": {
"@babel/runtime": "catalog:",
"@base-ui/react": "^1.3.0",
"@base-ui/react": "catalog:",
"@base-ui/utils": "catalog:",
"@mui/x-scheduler": "workspace:*",
"@mui/x-scheduler-headless": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/x-scheduler/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
},
"dependencies": {
"@babel/runtime": "catalog:",
"@base-ui/react": "^1.3.0",
"@base-ui/react": "catalog:",
"@base-ui/utils": "catalog:",
"@mui/utils": "catalog:",
"@mui/x-internals": "workspace:*",
Expand Down
10 changes: 6 additions & 4 deletions packages/x-tree-view/src/internals/plugins/items/TreeViewItemsPlugin.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ Alternatively, you can use the \`getItemId\` prop to specify a custom id for eac
Two items were provided with the same id in the \`items\` prop: "1"`,
reactMajor >= 19 &&
'Alternatively, you can use the `getItemId` prop to specify a custom id for each item',
reactMajor < 19 && `The above error occurred in the <ForwardRef(TreeItem2)> component`,
reactMajor < 19 && `The above error occurred in the <ForwardRef(TreeItem2)> component`,
// `ForwardRef(TreeItem)` on newer `@vitejs/plugin-react`, `ForwardRef(TreeItem2)` on older ones.
reactMajor < 19 && `The above error occurred in the <ForwardRef(TreeItem`,
// `ForwardRef(TreeItem)` on newer `@vitejs/plugin-react`, `ForwardRef(TreeItem2)` on older ones.
reactMajor < 19 && `The above error occurred in the <ForwardRef(TreeItem`,
]);
} else {
// eslint-disable-next-line vitest/no-conditional-expect
Expand All @@ -32,8 +34,8 @@ Two items were provided with the same id in the \`items\` prop: "1"`,
).toErrorDev([
reactMajor >= 19 &&
`MUI X Tree View: All items must have a unique \`id\` property. The id "1" is used by multiple items. Use the \`getItemId\` prop to specify a custom id for each item if needed.`,
reactMajor < 19 &&
`The above error occurred in the <ForwardRef(${treeViewComponentName}2)> component`,
// `ForwardRef(${treeViewComponentName})` on newer `@vitejs/plugin-react`, `ForwardRef(${treeViewComponentName}2)` on older ones.
reactMajor < 19 && `The above error occurred in the <ForwardRef(${treeViewComponentName}`,
]);
}
});
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
},
"devDependencies": {
"@mui/internal-test-utils": "catalog:",
"@mui/types": "7.4.12",
"@mui/types": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"rimraf": "catalog:"
Expand Down
2 changes: 1 addition & 1 deletion packages/x-virtualizer/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"types": ["@mui/internal-test-utils/initMatchers", "chai-dom", "node"]
"types": ["@mui/internal-test-utils/initMatchers", "node"]
},
"include": ["src/**/*"]
}
46 changes: 28 additions & 18 deletions pnpm-lock.yaml
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions pnpm-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@ packages:
- bundle-size

catalog:
'@atlaskit/pragmatic-drag-and-drop': ^1.7.7
'@babel/cli': ^7.28.6
'@babel/core': ^7.29.0
'@babel/plugin-transform-runtime': ^7.29.0
'@babel/preset-typescript': ^7.28.5
'@babel/runtime': ^7.28.6
'@babel/traverse': ^7.29.0
'@base-ui/react': ^1.3.0
'@base-ui/utils': ^0.2.6
'@date-fns/tz': ^1.2.0
'@emotion/cache': ^11.14.0
Expand All @@ -22,6 +24,7 @@ catalog:
'@mui/material': 9.0.0-beta.1
'@mui/stylis-plugin-rtl': 9.0.0-beta.0
'@mui/system': 9.0.0-beta.1
'@mui/types': 7.4.12
'@mui/utils': 9.0.0-beta.1
'@mui/x-internal-exceljs-fork': 4.4.5
'@playwright/test': ^1.58.2
Expand Down Expand Up @@ -53,7 +56,9 @@ catalog:
date-fns-jalali: ^4.1.0-0
dayjs: ^1.11.20
es-toolkit: ^1.45.1
execa: 9.6.1
jscodeshift: 17.3.0
jsdom: 26.1.0
luxon: ^3.7.2
moment: ^2.30.1
moment-hijri: ^3.0.0
Expand Down
1 change: 1 addition & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>mui/mui-public//renovate/default"],
"ignorePaths": ["**/bug-reproductions/**"],
"schedule": "* 0-4 * * 1",
"lockFileMaintenance": {
"schedule": "* 0-4 2 * *"
Expand Down
2 changes: 1 addition & 1 deletion test/performance-charts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@vitejs/plugin-react-swc": "catalog:",
"@vitest/browser-playwright": "catalog:",
"@vitest/ui": "catalog:",
"jsdom": "26.1.0",
"jsdom": "catalog:",
"react": "catalog:",
"react-dom": "catalog:",
"vitest": "catalog:"
Expand Down
Loading