From 88878a46728d7de009dc7c2013a8c7b7bf39e932 Mon Sep 17 00:00:00 2001 From: Aditya Kumar Date: Thu, 14 Mar 2024 15:28:05 +0530 Subject: [PATCH 1/3] Added Material UI 4 import rule to plugins/circleci Signed-off-by: Aditya Kumar --- .changeset/fuzzy-weeks-press.md | 5 +++++ plugins/circleci/.eslintrc.js | 7 ++++++- .../BuildWithStepsPage/BuildWithStepsPage.tsx | 4 +++- .../lib/ActionOutput/ActionOutput.tsx | 10 ++++------ .../src/components/BuildsPage/BuildsPage.tsx | 2 +- .../components/BuildsPage/lib/CITable/CITable.tsx | 14 ++++++-------- 6 files changed, 25 insertions(+), 17 deletions(-) create mode 100644 .changeset/fuzzy-weeks-press.md diff --git a/.changeset/fuzzy-weeks-press.md b/.changeset/fuzzy-weeks-press.md new file mode 100644 index 0000000000..36a2074de1 --- /dev/null +++ b/.changeset/fuzzy-weeks-press.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-circleci': patch +--- + +Added an optional ESLint rule - no-top-level-material-ui-4-imports -in circleci plugin which has an auto fix function to migrate the imports and used it to migrate the Material UI imports for plugins/circleci. diff --git a/plugins/circleci/.eslintrc.js b/plugins/circleci/.eslintrc.js index e2a53a6ad2..a70295ae42 100644 --- a/plugins/circleci/.eslintrc.js +++ b/plugins/circleci/.eslintrc.js @@ -1 +1,6 @@ -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', + }, + }); + \ No newline at end of file diff --git a/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx b/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx index 8a5dc1c47f..e541669774 100644 --- a/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx +++ b/plugins/circleci/src/components/BuildWithStepsPage/BuildWithStepsPage.tsx @@ -17,7 +17,9 @@ import React, { useEffect } from 'react'; import { useParams } from 'react-router-dom'; import { BuildWithSteps, BuildStepAction } from '../../api'; -import { Grid, Box, Typography } from '@material-ui/core'; +import Grid from '@material-ui/core/Grid'; +import Box from '@material-ui/core/Box'; +import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import { ActionOutput } from './lib/ActionOutput/ActionOutput'; import LaunchIcon from '@material-ui/icons/Launch'; diff --git a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx index 4a4a8a45f2..a40503552f 100644 --- a/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx +++ b/plugins/circleci/src/components/BuildWithStepsPage/lib/ActionOutput/ActionOutput.tsx @@ -15,12 +15,10 @@ */ import { LogViewer } from '@backstage/core-components'; -import { - Accordion, - AccordionDetails, - AccordionSummary, - Typography, -} from '@material-ui/core'; +import Accordion from '@material-ui/core/Accordion'; +import AccordionDetails from '@material-ui/core/AccordionDetails'; +import AccordionSummary from '@material-ui/core/AccordionSummary'; +import Typography from '@material-ui/core/Typography'; import { makeStyles } from '@material-ui/core/styles'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import { BuildStepAction } from 'circleci-api'; diff --git a/plugins/circleci/src/components/BuildsPage/BuildsPage.tsx b/plugins/circleci/src/components/BuildsPage/BuildsPage.tsx index 8d786cf483..e66254510a 100644 --- a/plugins/circleci/src/components/BuildsPage/BuildsPage.tsx +++ b/plugins/circleci/src/components/BuildsPage/BuildsPage.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; import { Builds } from './lib/Builds'; -import { Grid } from '@material-ui/core'; +import Grid from '@material-ui/core/Grid'; export const BuildsPage = () => ( diff --git a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx index 248275fb77..d271b21bc9 100644 --- a/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx +++ b/plugins/circleci/src/components/BuildsPage/lib/CITable/CITable.tsx @@ -15,14 +15,12 @@ */ import React from 'react'; -import { - Avatar, - Typography, - Box, - IconButton, - makeStyles, - Tooltip, -} from '@material-ui/core'; +import Avatar from '@material-ui/core/Avatar'; +import Typography from '@material-ui/core/Typography'; +import Box from '@material-ui/core/Box'; +import IconButton from '@material-ui/core/IconButton'; +import Tooltip from '@material-ui/core/Tooltip'; +import { makeStyles } from '@material-ui/core/styles'; import RetryIcon from '@material-ui/icons/Replay'; import GitHubIcon from '@material-ui/icons/GitHub'; import LaunchIcon from '@material-ui/icons/Launch'; From faea1dd664f961ee192daa333112b35dc0c7ad50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 14 Mar 2024 11:37:24 +0100 Subject: [PATCH 2/3] Update .changeset/fuzzy-weeks-press.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- .changeset/fuzzy-weeks-press.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/fuzzy-weeks-press.md b/.changeset/fuzzy-weeks-press.md index 36a2074de1..8d65436de3 100644 --- a/.changeset/fuzzy-weeks-press.md +++ b/.changeset/fuzzy-weeks-press.md @@ -2,4 +2,4 @@ '@backstage/plugin-circleci': patch --- -Added an optional ESLint rule - no-top-level-material-ui-4-imports -in circleci plugin which has an auto fix function to migrate the imports and used it to migrate the Material UI imports for plugins/circleci. +Added an optional ESLint rule - no-top-level-material-ui-4-imports - in CircleCI plugin which has an auto fix function to migrate the imports and used it to migrate the Material UI imports for `plugins/circleci`. From a524ce7240424e85367105f7965ac1f7c709134a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Thu, 14 Mar 2024 11:37:30 +0100 Subject: [PATCH 3/3] Update plugins/circleci/.eslintrc.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- plugins/circleci/.eslintrc.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/circleci/.eslintrc.js b/plugins/circleci/.eslintrc.js index a70295ae42..9d5b45a010 100644 --- a/plugins/circleci/.eslintrc.js +++ b/plugins/circleci/.eslintrc.js @@ -2,5 +2,4 @@ module.exports = require('@backstage/cli/config/eslint-factory')(__dirname, { rules: { '@backstage/no-top-level-material-ui-4-imports': 'error', }, - }); - \ No newline at end of file + }); \ No newline at end of file