diff --git a/.changeset/weak-snails-spar.md b/.changeset/weak-snails-spar.md new file mode 100644 index 0000000000..3cd930d5b0 --- /dev/null +++ b/.changeset/weak-snails-spar.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-techdocs-addons-test-utils': patch +--- + +Avoiding re-running tests on cleanup. diff --git a/.changeset/weak-snails-spark.md b/.changeset/weak-snails-spark.md new file mode 100644 index 0000000000..c82626ea39 --- /dev/null +++ b/.changeset/weak-snails-spark.md @@ -0,0 +1,5 @@ +--- +'@backstage/test-utils': minor +--- + +Test App Wrapper is now using `UnifiedThemeProvider` for supporting MUI v5 next to MUI v4 in tests. diff --git a/.changeset/weak-snails-sparkl.md b/.changeset/weak-snails-sparkl.md new file mode 100644 index 0000000000..9bbc7d843b --- /dev/null +++ b/.changeset/weak-snails-sparkl.md @@ -0,0 +1,17 @@ +--- +'@backstage/app-defaults': minor +'@backstage/theme': minor +--- + +**MUI v5 Support:** Adding platform-wide support for MUI v5 allowing a transition phase for migrating central plugins & components over. We still support v4 instances & plugins by adding a + +To allow the future support of plugins & components using MUI v5 you want to upgrade your `AppTheme`'s to using the `UnifiedThemeProvider` + +```diff + Provider: ({ children }) => ( +- +- {children} +- ++ + ), +``` diff --git a/.changeset/weak-snails-sparkle.md b/.changeset/weak-snails-sparkle.md index 947c20117b..95a2255e56 100644 --- a/.changeset/weak-snails-sparkle.md +++ b/.changeset/weak-snails-sparkle.md @@ -1,24 +1,5 @@ --- -'@backstage/app-defaults': minor -'@backstage/test-utils': minor -'@backstage/theme': minor -'@backstage/plugin-techdocs-addons-test-utils': patch '@backstage/cli': patch --- -**MUI v5 Support:** Adding platform-wide support for MUI v5 allowing a transition phase for migrating central plugins & components over. We still support v4 instances & plugins by adding a - -To allow the future support of plugins & components using MUI v5 you want to upgrade your `AppTheme`'s to using the `UnifiedThemeProvider` - -```diff - Provider: ({ children }) => ( -- -- {children} -- -+ - ), -``` - -**'@backstage/test-utils':** Test App Wrapper is using `UnifiedThemeProvider` for tests now. -**'@backstage/plugin-techdocs-addons-test-utils':** Fix tests by avoiding re-running theme on cleanup. -**'@backstage/cli':** Enforcing MUI v5 specific linting to minimize bundle size. +Enforcing MUI v5 specific linting to minimize bundle size. diff --git a/packages/theme/package.json b/packages/theme/package.json index 0e73918072..52def665d6 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -42,11 +42,6 @@ "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 cc32ce9a0e..2e6f814cf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9636,9 +9636,6 @@ __metadata: "@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 languageName: unknown linkType: soft