From d2d90b1d30c1227a8f8cbfd97fe281e60ef30cfc Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Sat, 7 Jan 2023 15:56:01 +0100 Subject: [PATCH] theme: make MUI v4 an optional peer dep Signed-off-by: Patrik Oldsberg --- packages/theme/package.json | 8 +++++++- yarn.lock | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/theme/package.json b/packages/theme/package.json index b47c5e256d..3d9e6fa132 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -34,14 +34,20 @@ "dependencies": { "@emotion/react": "^11.10.5", "@emotion/styled": "^11.10.5", - "@material-ui/core": "^4.12.2", "@mui/material": "^5.11.2", "@mui/styles": "^5.11.2" }, "peerDependencies": { + "@material-ui/core": "^4.12.2", + "@types/react": "^16.13.1 || ^17.0.0", "react": "^16.13.1 || ^17.0.0", "react-dom": "^16.13.1 || ^17.0.0" }, + "peerDependenciesMeta": { + "@material-ui/core": { + "optional": true + } + }, "devDependencies": { "@backstage/cli": "workspace:^", "@types/react": "^16.13.1 || ^17.0.0" diff --git a/yarn.lock b/yarn.lock index 9e1a19ab4f..2c0ecbd030 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9639,13 +9639,23 @@ __metadata: "@backstage/cli": "workspace:^" "@emotion/react": ^11.10.5 "@emotion/styled": ^11.10.5 - "@material-ui/core": ^4.12.2 "@mui/material": ^5.11.2 "@mui/styles": ^5.11.2 +<<<<<<< HEAD +======= + peerDependencies: + "@material-ui/core": ^4.12.2 +>>>>>>> f1f6a256b36 (theme: make MUI v4 an optional peer dep) "@types/react": ^16.13.1 || ^17.0.0 peerDependencies: react: ^16.13.1 || ^17.0.0 +<<<<<<< HEAD react-dom: ^16.13.1 || ^17.0.0 +======= + peerDependenciesMeta: + "@material-ui/core": + optional: true +>>>>>>> f1f6a256b36 (theme: make MUI v4 an optional peer dep) languageName: unknown linkType: soft