Merge branch 'master' into feature/entity-dependencies-card-enhancements

Signed-off-by: Abhay-soni-developer <abhaysoni.developer@gmail.com>

.changeset/thin-countries-battle.md

@@ -0,0 +1,5 @@
+---
+'@backstage/core-plugin-api': patch
+---
+
+Change `IconComponent` type to be compatible with Material UI v5 icons.

packages/core-plugin-api/api-report.md

@@ -502,9 +502,14 @@ export const googleAuthApiRef: ApiRef<
 >;
 
 // @public
-export type IconComponent = ComponentType<{
-  fontSize?: 'default' | 'small' | 'large';
-}>;
+export type IconComponent = ComponentType<
+  | {
+      fontSize?: 'large' | 'small' | 'default';
+    }
+  | {
+      fontSize?: 'medium' | 'large' | 'small';
+    }
+>;
 
 // @public
 export type IdentityApi = {

packages/core-plugin-api/src/icons/types.ts

@@ -32,6 +32,14 @@ import { ComponentType } from 'react';
  *
  * @public
  */
-export type IconComponent = ComponentType<{
-  fontSize?: 'default' | 'small' | 'large';
-}>;
+
+export type IconComponent = ComponentType<
+  /* MUI v4 */
+  | {
+      fontSize?: 'large' | 'small' | 'default';
+    }
+  /* MUI v5: https://mui.com/material-ui/migration/v5-component-changes/#icon */
+  | {
+      fontSize?: 'medium' | 'large' | 'small';
+    }
+>;