From 98ebae758d945b908d166cf2e94d27d4b56e5248 Mon Sep 17 00:00:00 2001 From: Olivier Tassinari Date: Tue, 5 Sep 2023 00:03:38 +0200 Subject: [PATCH] [core] Move @mui/base from peer dependency to dependency (#10215) --- packages/x-charts/package.json | 1 + packages/x-charts/src/BarChart/BarElement.tsx | 2 +- packages/x-charts/src/LineChart/AreaElement.tsx | 2 +- packages/x-charts/src/LineChart/LineElement.tsx | 2 +- packages/x-date-pickers-pro/README.md | 1 - packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/README.md | 1 - packages/x-date-pickers/package.json | 2 +- packages/x-tree-view/README.md | 1 - packages/x-tree-view/package.json | 2 +- yarn.lock | 2 +- 11 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index df72753f03d9..8b72541ff998 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -39,6 +39,7 @@ }, "dependencies": { "@babel/runtime": "^7.22.11", + "@mui/base": "^5.0.0-alpha.87", "clsx": "^2.0.0", "d3-color": "^3.1.0", "d3-scale": "^4.0.2", diff --git a/packages/x-charts/src/BarChart/BarElement.tsx b/packages/x-charts/src/BarChart/BarElement.tsx index 9bf662529041..9a80fa64ea6e 100644 --- a/packages/x-charts/src/BarChart/BarElement.tsx +++ b/packages/x-charts/src/BarChart/BarElement.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import composeClasses from '@mui/utils/composeClasses'; -import { SlotComponentProps } from '@mui/base'; +import type { SlotComponentProps } from '@mui/base'; import { useSlotProps } from '@mui/base/utils'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import { styled } from '@mui/material/styles'; diff --git a/packages/x-charts/src/LineChart/AreaElement.tsx b/packages/x-charts/src/LineChart/AreaElement.tsx index d37bb7216f13..fde55d6102ba 100644 --- a/packages/x-charts/src/LineChart/AreaElement.tsx +++ b/packages/x-charts/src/LineChart/AreaElement.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import composeClasses from '@mui/utils/composeClasses'; -import { SlotComponentProps } from '@mui/base'; +import type { SlotComponentProps } from '@mui/base'; import { useSlotProps } from '@mui/base/utils'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import { styled } from '@mui/material/styles'; diff --git a/packages/x-charts/src/LineChart/LineElement.tsx b/packages/x-charts/src/LineChart/LineElement.tsx index bb4e78206f42..46e8987a38b3 100644 --- a/packages/x-charts/src/LineChart/LineElement.tsx +++ b/packages/x-charts/src/LineChart/LineElement.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import PropTypes from 'prop-types'; import { color as d3Color } from 'd3-color'; import composeClasses from '@mui/utils/composeClasses'; -import { SlotComponentProps } from '@mui/base'; +import type { SlotComponentProps } from '@mui/base'; import { useSlotProps } from '@mui/base/utils'; import generateUtilityClass from '@mui/utils/generateUtilityClass'; import { styled } from '@mui/material/styles'; diff --git a/packages/x-date-pickers-pro/README.md b/packages/x-date-pickers-pro/README.md index 5fe6e0a6e55c..2aae5c90d51c 100644 --- a/packages/x-date-pickers-pro/README.md +++ b/packages/x-date-pickers-pro/README.md @@ -34,7 +34,6 @@ This component has the following peer dependencies that you will need to install ```json "peerDependencies": { - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "react": "^17.0.0 || ^18.0.0", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 9157145194ea..3a098e59954d 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -42,6 +42,7 @@ }, "dependencies": { "@babel/runtime": "^7.22.11", + "@mui/base": "^5.0.0-alpha.87", "@mui/utils": "^5.14.7", "@mui/x-date-pickers": "6.12.1", "@mui/x-license-pro": "6.10.2", @@ -52,7 +53,6 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "date-fns": "^2.25.0", diff --git a/packages/x-date-pickers/README.md b/packages/x-date-pickers/README.md index f0aa61366656..6b57a47cb8a0 100644 --- a/packages/x-date-pickers/README.md +++ b/packages/x-date-pickers/README.md @@ -34,7 +34,6 @@ This component has the following peer dependencies that you will need to install ```json "peerDependencies": { - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "react": "^17.0.0 || ^18.0.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 99891993faa1..1fa2f076b36d 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -45,6 +45,7 @@ }, "dependencies": { "@babel/runtime": "^7.22.11", + "@mui/base": "^5.0.0-alpha.87", "@mui/utils": "^5.14.7", "@types/react-transition-group": "^4.4.6", "clsx": "^2.0.0", @@ -54,7 +55,6 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "date-fns": "^2.25.0", diff --git a/packages/x-tree-view/README.md b/packages/x-tree-view/README.md index 86c1afca31b8..77c8330f5b06 100644 --- a/packages/x-tree-view/README.md +++ b/packages/x-tree-view/README.md @@ -21,7 +21,6 @@ This component has the following peer dependencies that you will need to install ```json "peerDependencies": { - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "react": "^17.0.0 || ^18.0.0", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 4e4a3e4d64d7..ef325ff66cf7 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -43,6 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.22.11", + "@mui/base": "^5.0.0-alpha.87", "@mui/utils": "^5.14.7", "@types/react-transition-group": "^4.4.6", "clsx": "^2.0.0", @@ -52,7 +53,6 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/base": "^5.0.0-alpha.87", "@mui/material": "^5.8.6", "@mui/system": "^5.8.0", "react": "^17.0.0 || ^18.0.0", diff --git a/yarn.lock b/yarn.lock index fc0ffd259603..ed948a9a502e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1789,7 +1789,7 @@ react-test-renderer "^18.0.0" semver "^5.7.0" -"@mui/base@5.0.0-beta.13", "@mui/base@^5.0.0-beta.13": +"@mui/base@5.0.0-beta.13", "@mui/base@^5.0.0-alpha.87", "@mui/base@^5.0.0-beta.13": version "5.0.0-beta.13" resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.13.tgz#3bae94c39752546d84a67d4ca73486b7c4923a89" integrity sha512-uC0l97pBspfDAp+iz2cJq8YZ8Sd9i73V77+WzUiOAckIVEyCm5dyVDZCCO2/phmzckVEeZCGcytybkjMQuhPQw==