From 6ce41a1bd3a295982e1922099fb61caa8fab5047 Mon Sep 17 00:00:00 2001 From: Siriwat K Date: Tue, 8 Oct 2024 16:07:41 +0700 Subject: [PATCH] [core] Support `@mui/utils` v6 (#14867) Co-authored-by: Lukas --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-internals/package.json | 2 +- packages/x-license/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 22 +++++++++++----------- 12 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 06ef85a380051..c1cb4dcf40328 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", "@mui/x-internals": "workspace:*", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 7465f171dbf24..19bf9b128ca83 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-charts-vendor": "workspace:*", "@mui/x-internals": "workspace:*", "@react-spring/rafz": "^9.7.4", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 5a178c616ec1f..07f38acf80c64 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", "@mui/x-internals": "workspace:*", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 1da249a3a304f..5504d4e612ec6 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index f8d2948ea22f6..ba5f1ef9eb65f 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", "prop-types": "^15.8.1", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 7753ffc383910..e8936b60e3a8f 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-date-pickers": "workspace:*", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 5cdb528ab85ce..23c7765f14c05 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", diff --git a/packages/x-internals/package.json b/packages/x-internals/package.json index 8c61e6e3784aa..7918338925f48 100644 --- a/packages/x-internals/package.json +++ b/packages/x-internals/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6" + "@mui/utils": "^5.16.6 || ^6.0.0" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" diff --git a/packages/x-license/package.json b/packages/x-license/package.json index 40a58259e56a1..423cf538f5fb0 100644 --- a/packages/x-license/package.json +++ b/packages/x-license/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6" + "@mui/utils": "^5.16.6 || ^6.0.0" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 80a9065ad5049..668892b9dd45c 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", "@mui/x-tree-view": "workspace:*", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 5bd360a86fbf9..dea0bc5e9a990 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.7", - "@mui/utils": "^5.16.6", + "@mui/utils": "^5.16.6 || ^6.0.0", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a3464bc7627c2..efb4718321468 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -740,7 +740,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-charts-vendor': specifier: workspace:* @@ -805,7 +805,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-charts': specifier: workspace:* @@ -990,7 +990,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-internals': specifier: workspace:* @@ -1087,7 +1087,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* @@ -1155,7 +1155,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* @@ -1214,7 +1214,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-internals': specifier: workspace:* @@ -1300,7 +1300,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-date-pickers': specifier: workspace:* @@ -1374,7 +1374,7 @@ importers: specifier: ^7.25.7 version: 7.25.7 '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 @@ -1394,7 +1394,7 @@ importers: specifier: ^7.25.7 version: 7.25.7 '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 @@ -1420,7 +1420,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-internals': specifier: workspace:* @@ -1473,7 +1473,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.3(@types/react@18.3.4)(react@18.3.1))(@types/react@18.3.4)(react@18.3.1) '@mui/utils': - specifier: ^5.16.6 + specifier: ^5.16.6 || ^6.0.0 version: 5.16.6(@types/react@18.3.4)(react@18.3.1) '@mui/x-internals': specifier: workspace:*