From bbec21801ad71fab4e7fed83c503df823b1a71ae Mon Sep 17 00:00:00 2001 From: Lukas Tyla Date: Thu, 7 Nov 2024 15:12:50 +0200 Subject: [PATCH 1/2] fix(extensions): resolve transitive `@mui/system` dependency on `@mui/x-*` packages Related issue: https://github.com/mui/mui-x/issues/15267 All `@mui/x-*` packages depend on `@mui/material`, which directly depends on `@mui/system`. The `@mui/system` package has a singleton. Hence, it is listed as a peer dependency on the `@mui/x-*` packages. I'm proposing to add these rules to the `yarnpkg` extensions, because Yarn PnP fails to resolve this transitive dependency and --- packages/yarnpkg-extensions/sources/index.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/yarnpkg-extensions/sources/index.ts b/packages/yarnpkg-extensions/sources/index.ts index 7dbc35f7fea4..617e3e9fbf2d 100644 --- a/packages/yarnpkg-extensions/sources/index.ts +++ b/packages/yarnpkg-extensions/sources/index.ts @@ -995,4 +995,23 @@ export const packageExtensions: Array<[string, PackageExtensionData]> = [ resolve: `^1.22.8`, }, }], + // https://github.com/mui/mui-x/issues/15267 + ...[ + `@mui/x-charts-pro@>=7.0.0-alpha.3`, + `@mui/x-charts@>=7.15.0`, + `@mui/x-data-grid-premium@>=7.15.0`, + `@mui/x-data-grid-pro@>=7.15.0`, + `@mui/x-data-grid@>=7.15.0`, + `@mui/x-date-pickers-pro@>=7.15.0`, + `@mui/x-date-pickers@>=7.15.0`, + `@mui/x-tree-view-pro@>=7.15.0`, + `@mui/x-tree-view@>=7.15.0`, + ].map<[string, PackageExtensionData]>(descriptorString => [ + descriptorString, + { + dependencies: { + '@mui/system': `>=5.15.14`, + }, + }, + ]), ]; From 030916e05eefa3cfc607cdac4ed3e071564ba75b Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 7 Nov 2024 18:24:54 +0200 Subject: [PATCH 2/2] Run `version check --interactive` --- .yarn/versions/a718858e.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .yarn/versions/a718858e.yml diff --git a/.yarn/versions/a718858e.yml b/.yarn/versions/a718858e.yml new file mode 100644 index 000000000000..fdd7264e3def --- /dev/null +++ b/.yarn/versions/a718858e.yml @@ -0,0 +1,24 @@ +releases: + "@yarnpkg/cli": patch + "@yarnpkg/extensions": patch + "@yarnpkg/plugin-compat": patch + +declined: + - "@yarnpkg/plugin-constraints" + - "@yarnpkg/plugin-dlx" + - "@yarnpkg/plugin-essentials" + - "@yarnpkg/plugin-init" + - "@yarnpkg/plugin-interactive-tools" + - "@yarnpkg/plugin-nm" + - "@yarnpkg/plugin-npm-cli" + - "@yarnpkg/plugin-pack" + - "@yarnpkg/plugin-patch" + - "@yarnpkg/plugin-pnp" + - "@yarnpkg/plugin-pnpm" + - "@yarnpkg/plugin-stage" + - "@yarnpkg/plugin-typescript" + - "@yarnpkg/plugin-version" + - "@yarnpkg/plugin-workspace-tools" + - "@yarnpkg/builder" + - "@yarnpkg/core" + - "@yarnpkg/doctor"