From 3a6e72291e13cd38ca6f53ec8528b89fd90485cc Mon Sep 17 00:00:00 2001 From: Timothy Deakin Date: Thu, 14 Mar 2024 18:24:32 +0000 Subject: [PATCH 1/3] feat: add eslint rule for top level imports Signed-off-by: Timothy Deakin --- plugins/catalog-unprocessed-entities/.eslintrc.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/catalog-unprocessed-entities/.eslintrc.js b/plugins/catalog-unprocessed-entities/.eslintrc.js index e2a53a6ad2..e487f765b2 100644 --- a/plugins/catalog-unprocessed-entities/.eslintrc.js +++ b/plugins/catalog-unprocessed-entities/.eslintrc.js @@ -1 +1,5 @@ -module.exports = require('@backstage/cli/config/eslint-factory')(__dirname); +module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, { + rules: { + '@backstage/no-top-level-material-ui-4-imports': 'error', + }, +}); From a3252b3f8f76f99dd9abbe3c8661c0124180a60d Mon Sep 17 00:00:00 2001 From: Timothy Deakin Date: Thu, 14 Mar 2024 18:27:08 +0000 Subject: [PATCH 2/3] refactor: update material ui imports Signed-off-by: Timothy Deakin --- .../src/components/FailedEntities.tsx | 4 +++- .../src/components/PendingEntities.tsx | 3 ++- .../src/components/UnprocessedEntities.tsx | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/catalog-unprocessed-entities/src/components/FailedEntities.tsx b/plugins/catalog-unprocessed-entities/src/components/FailedEntities.tsx index 2ef52504d7..a1044c6679 100644 --- a/plugins/catalog-unprocessed-entities/src/components/FailedEntities.tsx +++ b/plugins/catalog-unprocessed-entities/src/components/FailedEntities.tsx @@ -23,7 +23,9 @@ import { TableColumn, } from '@backstage/core-components'; import { useApi } from '@backstage/core-plugin-api'; -import { Box, Theme, Typography, makeStyles } from '@material-ui/core'; +import Box from '@material-ui/core/Box'; +import Typography from '@material-ui/core/Typography'; +import { Theme, makeStyles } from '@material-ui/core/styles'; import { UnprocessedEntity } from '../types'; import { EntityDialog } from './EntityDialog'; diff --git a/plugins/catalog-unprocessed-entities/src/components/PendingEntities.tsx b/plugins/catalog-unprocessed-entities/src/components/PendingEntities.tsx index 08e2f3da66..6f38a68816 100644 --- a/plugins/catalog-unprocessed-entities/src/components/PendingEntities.tsx +++ b/plugins/catalog-unprocessed-entities/src/components/PendingEntities.tsx @@ -21,7 +21,8 @@ import { TableColumn, Table, } from '@backstage/core-components'; -import { Theme, Typography, makeStyles } from '@material-ui/core'; +import Typography from '@material-ui/core/Typography'; +import { Theme, makeStyles } from '@material-ui/core/styles'; import { UnprocessedEntity } from '../types'; diff --git a/plugins/catalog-unprocessed-entities/src/components/UnprocessedEntities.tsx b/plugins/catalog-unprocessed-entities/src/components/UnprocessedEntities.tsx index 29f59222d1..92f5760c2e 100644 --- a/plugins/catalog-unprocessed-entities/src/components/UnprocessedEntities.tsx +++ b/plugins/catalog-unprocessed-entities/src/components/UnprocessedEntities.tsx @@ -16,8 +16,11 @@ import React, { useState } from 'react'; import { Page, Header, Content } from '@backstage/core-components'; -import { Tab, makeStyles } from '@material-ui/core'; -import { TabContext, TabList, TabPanel } from '@material-ui/lab'; +import Tab from '@material-ui/core/Tab'; +import { makeStyles } from '@material-ui/core/styles'; +import TabContext from '@material-ui/lab/TabContext'; +import TabList from '@material-ui/lab/TabList'; +import TabPanel from '@material-ui/lab/TabPanel'; import { FailedEntities } from './FailedEntities'; import { PendingEntities } from './PendingEntities'; From 2b397fec7825a2e882ce18f5ac65c4f864378c56 Mon Sep 17 00:00:00 2001 From: Timothy Deakin Date: Thu, 14 Mar 2024 18:35:07 +0000 Subject: [PATCH 3/3] chore: add changeset Signed-off-by: Timothy Deakin --- .changeset/modern-snails-ring.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/modern-snails-ring.md diff --git a/.changeset/modern-snails-ring.md b/.changeset/modern-snails-ring.md new file mode 100644 index 0000000000..2a00edfb34 --- /dev/null +++ b/.changeset/modern-snails-ring.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-catalog-unprocessed-entities': patch +--- + +Added the `no-top-level-material-ui-4-imports` ESLint rule to aid with the migration to Material UI v5