From bee708209411e91a458adb2288b339fb43cdff77 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 5 Jan 2022 01:52:35 +0100
Subject: [PATCH 1/2] cli: detect edge-case for MUI icon imports

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .changeset/rotten-olives-shop.md | 5 +++++
 packages/cli/config/eslint.js    | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 .changeset/rotten-olives-shop.md

diff --git a/.changeset/rotten-olives-shop.md b/.changeset/rotten-olives-shop.md
new file mode 100644
index 0000000000..b7fb51ad06
--- /dev/null
+++ b/.changeset/rotten-olives-shop.md
@@ -0,0 +1,5 @@
+---
+'@backstage/cli': patch
+---
+
+Update `config/eslint.js` to forbid imports of `@material-ui/icons/` as well.
diff --git a/packages/cli/config/eslint.js b/packages/cli/config/eslint.js
index 2a85c307b0..781af13577 100644
--- a/packages/cli/config/eslint.js
+++ b/packages/cli/config/eslint.js
@@ -80,6 +80,10 @@ module.exports = {
             name: '@material-ui/icons',
             message: "Please import '@material-ui/icons/<Icon>' instead.",
           },
+          {
+            name: '@material-ui/icons/', // because this is possible too ._.
+            message: "Please import '@material-ui/icons/<Icon>' instead.",
+          },
           ...require('module').builtinModules,
         ],
         // Avoid cross-package imports

From ed08ab8df650f1774af2039d46b288e726abcf6e Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Wed, 5 Jan 2022 01:54:41 +0100
Subject: [PATCH 2/2] search: fix import of all of MUI/icons

Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 plugins/search/src/components/SearchModal/SearchModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/search/src/components/SearchModal/SearchModal.tsx b/plugins/search/src/components/SearchModal/SearchModal.tsx
index 8b4da51592..c7ca33005d 100644
--- a/plugins/search/src/components/SearchModal/SearchModal.tsx
+++ b/plugins/search/src/components/SearchModal/SearchModal.tsx
@@ -25,7 +25,7 @@ import {
   List,
   Paper,
 } from '@material-ui/core';
-import { Launch } from '@material-ui/icons/';
+import LaunchIcon from '@material-ui/icons/Launch';
 import { makeStyles } from '@material-ui/core/styles';
 import { SearchBar } from '../SearchBar';
 import { DefaultResultListItem } from '../DefaultResultListItem';
@@ -96,7 +96,7 @@ export const Modal = ({ open = true, toggleModal }: SearchModalProps) => {
           <Grid item>
             <Link onClick={toggleModal} to={`${getSearchLink()}?query=${term}`}>
               <span className={classes.viewResultsLink}>View Full Results</span>
-              <Launch color="primary" />
+              <LaunchIcon color="primary" />
             </Link>
           </Grid>
         </Grid>