From d7043ddc9fe2ad867436f35e79c3e7db01ef8e80 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskii Date: Wed, 7 Aug 2024 16:16:42 +0200 Subject: [PATCH] [DataGrid] Support Yarn PnP (#14126) --- packages/x-data-grid-generator/package.json | 10 +++++++++ packages/x-data-grid-premium/package.json | 10 +++++++++ packages/x-data-grid-pro/package.json | 10 +++++++++ packages/x-data-grid/package.json | 10 +++++++++ packages/x-tree-view-pro/package.json | 8 +++++++ packages/x-tree-view/package.json | 8 +++++++ pnpm-lock.yaml | 24 +++++++++++++++++++++ 7 files changed, 80 insertions(+) diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 11da83bbec09d..8c06b4881ce7c 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -44,10 +44,20 @@ "rimraf": "^5.0.9" }, "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", "@mui/icons-material": "^5.4.1", "@mui/material": "^5.15.14", "react": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "engines": { "node": ">=14.0.0" } diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 357adba42c5d1..b3ee6b5cd5663 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -57,10 +57,20 @@ "reselect": "^4.1.8" }, "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "devDependencies": { "@mui/internal-test-utils": "^1.0.5", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 97fb042a5ed2d..9e474409fadf3 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -55,10 +55,20 @@ "reselect": "^4.1.8" }, "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "devDependencies": { "@mui/internal-test-utils": "^1.0.5", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 4018bbb601cb0..52d8c9cf88f12 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -56,10 +56,20 @@ "reselect": "^4.1.8" }, "peerDependencies": { + "@emotion/react": "^11.9.0", + "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "devDependencies": { "@mui/internal-test-utils": "^1.0.5", "@mui/joy": "^5.0.0-beta.48", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index b2f2f014f6d18..aeb8fb154b442 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -60,6 +60,14 @@ "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "devDependencies": { "@mui/internal-test-utils": "^1.0.5", "@types/prop-types": "^15.7.12", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 0ab596434f568..ffb743b995f32 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -59,6 +59,14 @@ "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, + "peerDependenciesMeta": { + "@emotion/react": { + "optional": true + }, + "@emotion/styled": { + "optional": true + } + }, "devDependencies": { "@mui/internal-test-utils": "^1.0.5", "@types/prop-types": "^15.7.12", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 20305cd7e0a3a..4e9482e02060c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -952,6 +952,12 @@ importers: '@babel/runtime': specifier: ^7.25.0 version: 7.25.0 + '@emotion/react': + specifier: ^11.9.0 + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': + specifier: ^11.8.1 + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: ^5.15.14 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1002,6 +1008,12 @@ importers: '@babel/runtime': specifier: ^7.25.0 version: 7.25.0 + '@emotion/react': + specifier: ^11.9.0 + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': + specifier: ^11.8.1 + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': specifier: ^5.4.1 version: 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1037,6 +1049,12 @@ importers: '@babel/runtime': specifier: ^7.25.0 version: 7.25.0 + '@emotion/react': + specifier: ^11.9.0 + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': + specifier: ^11.8.1 + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: ^5.15.14 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1099,6 +1117,12 @@ importers: '@babel/runtime': specifier: ^7.25.0 version: 7.25.0 + '@emotion/react': + specifier: ^11.9.0 + version: 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': + specifier: ^11.8.1 + version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: ^5.15.14 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)