From 9507618b60cb3bc3cefdbf014c5ab5bd6bbdefbd Mon Sep 17 00:00:00 2001 From: Timothy Deakin Date: Thu, 14 Mar 2024 14:31:13 +0000 Subject: [PATCH] refactor: update material ui imports Signed-off-by: Timothy Deakin --- .../src/home/components/Grids/DocsCardGrid.tsx | 5 ++++- .../home/components/Grids/EntityListDocsGrid.tsx | 2 +- .../src/home/components/Tables/actions.tsx | 2 +- .../src/home/components/TechDocsCustomHome.tsx | 4 ++-- .../src/reader/components/TechDocsBuildLogs.tsx | 16 ++++++---------- .../TechDocsReaderPage/TechDocsAuthProvider.tsx | 2 +- .../TechDocsReaderPage/context.test.tsx | 2 +- .../TechDocsReaderPageContent.tsx | 3 ++- .../TechDocsReaderPageContentAddons.tsx | 2 +- .../components/TechDocsReaderPageContent/dom.tsx | 3 ++- .../TechDocsReaderPageHeader.tsx | 4 ++-- .../TechDocsReaderPageSubheader.tsx | 10 +--------- .../reader/components/TechDocsStateIndicator.tsx | 6 ++++-- .../src/reader/transformers/copyToClipboard.tsx | 11 ++++------- .../reader/transformers/styles/rules/types.ts | 2 +- .../transformers/styles/rules/variables.ts | 3 ++- .../reader/transformers/styles/transformer.ts | 2 +- .../components/TechDocsSearchResultListItem.tsx | 4 +++- 18 files changed, 39 insertions(+), 44 deletions(-) diff --git a/plugins/techdocs/src/home/components/Grids/DocsCardGrid.tsx b/plugins/techdocs/src/home/components/Grids/DocsCardGrid.tsx index 8843249291..d2947b5f64 100644 --- a/plugins/techdocs/src/home/components/Grids/DocsCardGrid.tsx +++ b/plugins/techdocs/src/home/components/Grids/DocsCardGrid.tsx @@ -23,7 +23,10 @@ import { ItemCardGrid, ItemCardHeader, } from '@backstage/core-components'; -import { Card, CardActions, CardContent, CardMedia } from '@material-ui/core'; +import Card from '@material-ui/core/Card'; +import CardActions from '@material-ui/core/CardActions'; +import CardContent from '@material-ui/core/CardContent'; +import CardMedia from '@material-ui/core/CardMedia'; import React from 'react'; /** diff --git a/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.tsx b/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.tsx index b86dde8226..2f62c24646 100644 --- a/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.tsx +++ b/plugins/techdocs/src/home/components/Grids/EntityListDocsGrid.tsx @@ -28,7 +28,7 @@ import { useEntityList, useEntityOwnership, } from '@backstage/plugin-catalog-react'; -import { Typography } from '@material-ui/core'; +import Typography from '@material-ui/core/Typography'; import React from 'react'; /** diff --git a/plugins/techdocs/src/home/components/Tables/actions.tsx b/plugins/techdocs/src/home/components/Tables/actions.tsx index e722a9929b..c95dd8b94c 100644 --- a/plugins/techdocs/src/home/components/Tables/actions.tsx +++ b/plugins/techdocs/src/home/components/Tables/actions.tsx @@ -17,7 +17,7 @@ import React from 'react'; import ShareIcon from '@material-ui/icons/Share'; import { DocsTableRow } from './types'; -import { withStyles } from '@material-ui/styles'; +import { withStyles } from '@material-ui/core/styles'; import Star from '@material-ui/icons/Star'; import StarBorder from '@material-ui/icons/StarBorder'; diff --git a/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx b/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx index 7023560e83..3cfbc3c257 100644 --- a/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx +++ b/plugins/techdocs/src/home/components/TechDocsCustomHome.tsx @@ -16,8 +16,8 @@ import React, { useState } from 'react'; import useAsync from 'react-use/lib/useAsync'; -import { makeStyles } from '@material-ui/core'; -import { CSSProperties } from '@material-ui/styles'; +import { makeStyles } from '@material-ui/core/styles'; +import CSSProperties from '@material-ui/styles/CSSProperties'; import { CATALOG_FILTER_EXISTS, catalogApiRef, diff --git a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx index 01e638e59c..483c60d607 100644 --- a/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsBuildLogs.tsx @@ -15,16 +15,12 @@ */ import { LogViewer } from '@backstage/core-components'; -import { - Button, - createStyles, - Drawer, - Grid, - IconButton, - makeStyles, - Theme, - Typography, -} from '@material-ui/core'; +import Button from '@material-ui/core/Button'; +import Drawer from '@material-ui/core/Drawer'; +import Grid from '@material-ui/core/Grid'; +import IconButton from '@material-ui/core/IconButton'; +import Typography from '@material-ui/core/Typography'; +import { createStyles, makeStyles, Theme } from '@material-ui/core/styles'; import Close from '@material-ui/icons/Close'; import React, { useState } from 'react'; diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsAuthProvider.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsAuthProvider.tsx index d248af6d1f..baeb809a6c 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsAuthProvider.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/TechDocsAuthProvider.tsx @@ -19,7 +19,7 @@ import { ErrorPanel } from '@backstage/core-components'; import { techdocsApiRef } from '@backstage/plugin-techdocs-react'; import { useApi, useApp } from '@backstage/core-plugin-api'; import useAsyncRetry from 'react-use/lib/useAsyncRetry'; -import { Button } from '@material-ui/core'; +import Button from '@material-ui/core/Button'; type TechDocsRefreshCookieMessage = MessageEvent<{ action: string; diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPage/context.test.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPage/context.test.tsx index 670653ce6b..cc072fc5b1 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPage/context.test.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPage/context.test.tsx @@ -17,7 +17,7 @@ import React from 'react'; import { renderHook, waitFor } from '@testing-library/react'; -import { ThemeProvider } from '@material-ui/core'; +import ThemeProvider from '@material-ui/core/ThemeProvider'; import { lightTheme } from '@backstage/theme'; import { TestApiProvider } from '@backstage/test-utils'; diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx index f4c5ad8745..3692ed22d3 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContent.tsx @@ -16,7 +16,8 @@ import React, { useCallback, useEffect } from 'react'; -import { makeStyles, Grid } from '@material-ui/core'; +import Grid from '@material-ui/core/Grid'; +import { makeStyles } from '@material-ui/core/styles'; import { TechDocsShadowDom, diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContentAddons.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContentAddons.tsx index 744fd8c732..edcc90359d 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContentAddons.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/TechDocsReaderPageContentAddons.tsx @@ -15,7 +15,7 @@ */ import React from 'react'; -import { Portal } from '@material-ui/core'; +import Portal from '@material-ui/core/Portal'; import { useTechDocsAddons, TechDocsAddonLocations as locations, diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx index bf8a1309b2..de2460a543 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageContent/dom.tsx @@ -16,7 +16,8 @@ import { useCallback, useEffect, useState } from 'react'; -import { useTheme, useMediaQuery } from '@material-ui/core'; +import useMediaQuery from '@material-ui/core/useMediaQuery'; +import { useTheme } from '@material-ui/core/styles'; import { CompoundEntityRef } from '@backstage/catalog-model'; import { useAnalytics, useApi } from '@backstage/core-plugin-api'; diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.tsx index d84c5c5347..0399dea4f7 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageHeader/TechDocsReaderPageHeader.tsx @@ -17,8 +17,8 @@ import React, { PropsWithChildren, useEffect } from 'react'; import Helmet from 'react-helmet'; -import { Grid } from '@material-ui/core'; -import { Skeleton } from '@material-ui/lab'; +import Grid from '@material-ui/core/Grid'; +import Skeleton from '@material-ui/lab/Skeleton'; import { useTheme } from '@material-ui/core/styles'; import CodeIcon from '@material-ui/icons/Code'; diff --git a/plugins/techdocs/src/reader/components/TechDocsReaderPageSubheader/TechDocsReaderPageSubheader.tsx b/plugins/techdocs/src/reader/components/TechDocsReaderPageSubheader/TechDocsReaderPageSubheader.tsx index 85f04655fd..eea342cb7d 100644 --- a/plugins/techdocs/src/reader/components/TechDocsReaderPageSubheader/TechDocsReaderPageSubheader.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsReaderPageSubheader/TechDocsReaderPageSubheader.tsx @@ -16,15 +16,7 @@ import React, { MouseEvent, useState, useCallback } from 'react'; -import { - Box, - makeStyles, - Toolbar, - ToolbarProps, - Menu, - Tooltip, - IconButton, -} from '@material-ui/core'; +import Box, { ToolbarProps } from '@material-ui/core/Box'; import SettingsIcon from '@material-ui/icons/Settings'; import { diff --git a/plugins/techdocs/src/reader/components/TechDocsStateIndicator.tsx b/plugins/techdocs/src/reader/components/TechDocsStateIndicator.tsx index 772c92aeff..f27b8e5430 100644 --- a/plugins/techdocs/src/reader/components/TechDocsStateIndicator.tsx +++ b/plugins/techdocs/src/reader/components/TechDocsStateIndicator.tsx @@ -15,8 +15,10 @@ */ import React from 'react'; -import { CircularProgress, Button, makeStyles } from '@material-ui/core'; -import { Alert } from '@material-ui/lab'; +import CircularProgress from '@material-ui/core/CircularProgress'; +import Button from '@material-ui/core/Button'; +import { makeStyles } from '@material-ui/core/styles'; +import Alert from '@material-ui/lab/Alert'; import { TechDocsBuildLogs } from './TechDocsBuildLogs'; import { TechDocsNotFound } from './TechDocsNotFound'; diff --git a/plugins/techdocs/src/reader/transformers/copyToClipboard.tsx b/plugins/techdocs/src/reader/transformers/copyToClipboard.tsx index 1fd9d179a3..a8fc5079ae 100644 --- a/plugins/techdocs/src/reader/transformers/copyToClipboard.tsx +++ b/plugins/techdocs/src/reader/transformers/copyToClipboard.tsx @@ -16,13 +16,10 @@ import React, { useState, useCallback } from 'react'; import { renderReactElement } from './renderReactElement'; -import { - withStyles, - Theme, - ThemeProvider, - SvgIcon, - Tooltip, -} from '@material-ui/core'; +import ThemeProvider from '@material-ui/core/ThemeProvider'; +import SvgIcon from '@material-ui/core/SvgIcon'; +import Tooltip from '@material-ui/core/Tooltip'; +import { withStyles, Theme } from '@material-ui/core/styles'; import IconButton from '@material-ui/core/IconButton'; import type { Transformer } from './transformer'; import useCopyToClipboard from 'react-use/lib/useCopyToClipboard'; diff --git a/plugins/techdocs/src/reader/transformers/styles/rules/types.ts b/plugins/techdocs/src/reader/transformers/styles/rules/types.ts index defdc4ad90..e2747ad85a 100644 --- a/plugins/techdocs/src/reader/transformers/styles/rules/types.ts +++ b/plugins/techdocs/src/reader/transformers/styles/rules/types.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Theme } from '@material-ui/core'; +import { Theme } from '@material-ui/core/styles'; /** * A Backstage sidebar object that contains properties such as its pin state. diff --git a/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts b/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts index 07a667ed8e..bf8117474b 100644 --- a/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts +++ b/plugins/techdocs/src/reader/transformers/styles/rules/variables.ts @@ -14,7 +14,8 @@ * limitations under the License. */ -import { alpha, lighten } from '@material-ui/core'; +import alpha from '@material-ui/core/alpha'; +import lighten from '@material-ui/core/lighten'; import { RuleOptions } from './types'; export default ({ theme }: RuleOptions) => ` diff --git a/plugins/techdocs/src/reader/transformers/styles/transformer.ts b/plugins/techdocs/src/reader/transformers/styles/transformer.ts index dee77fb1ed..b1b1b437c2 100644 --- a/plugins/techdocs/src/reader/transformers/styles/transformer.ts +++ b/plugins/techdocs/src/reader/transformers/styles/transformer.ts @@ -15,7 +15,7 @@ */ import { useCallback, useMemo } from 'react'; -import { useTheme } from '@material-ui/core'; +import { useTheme } from '@material-ui/core/styles'; import { useSidebarPinState } from '@backstage/core-components'; import { Transformer } from '../transformer'; import { rules } from './rules'; diff --git a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx index eae4ee7ce9..4f7deab47c 100644 --- a/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx +++ b/plugins/techdocs/src/search/components/TechDocsSearchResultListItem.tsx @@ -15,7 +15,9 @@ */ import React, { PropsWithChildren, ReactNode } from 'react'; -import { ListItemIcon, ListItemText, makeStyles } from '@material-ui/core'; +import ListItemIcon from '@material-ui/core/ListItemIcon'; +import ListItemText from '@material-ui/core/ListItemText'; +import { makeStyles } from '@material-ui/core/styles'; import Typography from '@material-ui/core/Typography'; import { Link } from '@backstage/core-components'; import { ResultHighlight } from '@backstage/plugin-search-common';