diff --git a/biome.jsonc b/biome.jsonc index 9d369e6dab6df..42a920eeeaf77 100644 --- a/biome.jsonc +++ b/biome.jsonc @@ -45,7 +45,6 @@ "options": { "paths": { "@mui/material": "Use @mui/material/ instead. See: https://material-ui.com/guides/minimizing-bundle-size/.", - "@mui/icons-material": "Use @mui/icons-material/ instead. See: https://material-ui.com/guides/minimizing-bundle-size/.", "@mui/material/Avatar": "Use components/Avatar/Avatar instead.", "@mui/material/Alert": "Use components/Alert/Alert instead.", "@mui/material/Popover": "Use components/Popover/Popover instead.", diff --git a/site/package.json b/site/package.json index 62b2b8dd64981..bbabb4e1d444a 100644 --- a/site/package.json +++ b/site/package.json @@ -47,7 +47,6 @@ "@fontsource/jetbrains-mono": "5.2.5", "@fontsource/source-code-pro": "5.2.5", "@monaco-editor/react": "4.7.0", - "@mui/icons-material": "5.18.0", "@mui/material": "5.18.0", "@mui/system": "5.18.0", "@mui/utils": "5.17.1", diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index e788524025aeb..96373e373f23b 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -55,9 +55,6 @@ importers: '@monaco-editor/react': specifier: 4.7.0 version: 4.7.0(monaco-editor@0.53.0)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - '@mui/icons-material': - specifier: 5.18.0 - version: 5.18.0(@mui/material@5.18.0(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.17)(react@19.1.1) '@mui/material': specifier: 5.18.0 version: 5.18.0(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) @@ -1378,17 +1375,6 @@ packages: '@mui/core-downloads-tracker@5.18.0': resolution: {integrity: sha512-jbhwoQ1AY200PSSOrNXmrFCaSDSJWP7qk6urkTmIirvRXDROkqe+QwcLlUiw/PrREwsIF/vm3/dAXvjlMHF0RA==, tarball: https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.18.0.tgz} - '@mui/icons-material@5.18.0': - resolution: {integrity: sha512-1s0vEZj5XFXDMmz3Arl/R7IncFqJ+WQ95LDp1roHWGDE2oCO3IS4/hmiOv1/8SD9r6B7tv9GLiqVZYHo+6PkTg==, tarball: https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.18.0.tgz} - engines: {node: '>=12.0.0'} - peerDependencies: - '@mui/material': ^5.0.0 - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@mui/material@5.18.0': resolution: {integrity: sha512-bbH/HaJZpFtXGvWg3TsBWG4eyt3gah3E7nCNU8GLyRjVoWcA91Vm/T+sjHfUcwgJSw9iLtucfHBoq+qW/T30aA==, tarball: https://registry.npmjs.org/@mui/material/-/material-5.18.0.tgz} engines: {node: '>=12.0.0'} @@ -7595,14 +7581,6 @@ snapshots: '@mui/core-downloads-tracker@5.18.0': {} - '@mui/icons-material@5.18.0(@mui/material@5.18.0(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react-dom@19.1.1(react@19.1.1))(react@19.1.1))(@types/react@19.1.17)(react@19.1.1)': - dependencies: - '@babel/runtime': 7.26.10 - '@mui/material': 5.18.0(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react-dom@19.1.1(react@19.1.1))(react@19.1.1) - react: 19.1.1 - optionalDependencies: - '@types/react': 19.1.17 - '@mui/material@5.18.0(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@emotion/styled@11.14.1(@emotion/react@11.14.0(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react@19.1.1))(@types/react@19.1.17)(react-dom@19.1.1(react@19.1.1))(react@19.1.1)': dependencies: '@babel/runtime': 7.26.10 diff --git a/site/src/pages/LoginPage/OAuthSignInForm.tsx b/site/src/pages/LoginPage/OAuthSignInForm.tsx index e2c08caf69f35..9cf90c9a83b7c 100644 --- a/site/src/pages/LoginPage/OAuthSignInForm.tsx +++ b/site/src/pages/LoginPage/OAuthSignInForm.tsx @@ -1,7 +1,7 @@ -import GitHubIcon from "@mui/icons-material/GitHub"; import { visuallyHidden } from "@mui/utils"; import type { AuthMethods } from "api/typesGenerated"; import { Button } from "components/Button/Button"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { KeyIcon } from "lucide-react"; import { type FC, useId } from "react"; import { Language } from "./Language"; @@ -33,7 +33,7 @@ export const OAuthSignInForm: FC = ({ redirectTo, )}`} > - + {Language.githubSignIn} diff --git a/site/src/pages/SetupPage/SetupPageView.tsx b/site/src/pages/SetupPage/SetupPageView.tsx index 57534ddbe74cd..28e750bfb31dc 100644 --- a/site/src/pages/SetupPage/SetupPageView.tsx +++ b/site/src/pages/SetupPage/SetupPageView.tsx @@ -1,4 +1,3 @@ -import GitHubIcon from "@mui/icons-material/GitHub"; import AlertTitle from "@mui/material/AlertTitle"; import Autocomplete from "@mui/material/Autocomplete"; import Checkbox from "@mui/material/Checkbox"; @@ -10,6 +9,7 @@ import type * as TypesGen from "api/typesGenerated"; import { isAxiosError } from "axios"; import { Alert, AlertDetail } from "components/Alert/Alert"; import { Button } from "components/Button/Button"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { FormFields, VerticalForm } from "components/Form/Form"; import { CoderIcon } from "components/Icons/CoderIcon"; import { PasswordField } from "components/PasswordField/PasswordField"; @@ -98,11 +98,6 @@ const numberOfDevelopersOptions = [ "2500+", ]; -const iconStyles = { - width: 16, - height: 16, -}; - interface SetupPageViewProps { onSubmit: (firstUser: TypesGen.CreateFirstUserRequest) => void; error?: unknown; @@ -174,7 +169,7 @@ export const SetupPageView: FC = ({ <> diff --git a/site/src/pages/TaskPage/TaskStatusLink.tsx b/site/src/pages/TaskPage/TaskStatusLink.tsx index 7fbc74d937d23..c7f53e0a3ef15 100644 --- a/site/src/pages/TaskPage/TaskStatusLink.tsx +++ b/site/src/pages/TaskPage/TaskStatusLink.tsx @@ -1,5 +1,5 @@ -import GitHub from "@mui/icons-material/GitHub"; import { Button } from "components/Button/Button"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { BugIcon, ExternalLinkIcon, @@ -41,7 +41,7 @@ export const TaskStatusLink: FC = ({ uri }) => { : `${org}/${repo} issue`; break; default: - icon = ; + icon = ; if (org && repo) { label = `${org}/${repo}`; } diff --git a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx index 58a4e0e73e1c7..d8f1a51f13d2b 100644 --- a/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx +++ b/site/src/pages/UserSettingsPage/SecurityPage/SingleSignOnSection.tsx @@ -1,5 +1,4 @@ import { useTheme } from "@emotion/react"; -import GitHubIcon from "@mui/icons-material/GitHub"; import Link from "@mui/material/Link"; import TextField from "@mui/material/TextField"; import { API } from "api/api"; @@ -13,6 +12,7 @@ import type { import { Button } from "components/Button/Button"; import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog"; import { EmptyState } from "components/EmptyState/EmptyState"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { Stack } from "components/Stack/Stack"; import { CircleCheck as CircleCheckIcon, KeyIcon } from "lucide-react"; import { type FC, useState } from "react"; @@ -155,7 +155,7 @@ export const SingleSignOnSection: FC = ({ disabled={isUpdating} onClick={() => openConfirmation("github")} > - + GitHub )} @@ -204,7 +204,7 @@ export const SingleSignOnSection: FC = ({
{userLoginType.login_type === "github" ? ( - + ) : ( )} diff --git a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx index a070ad7913a68..c605928dbb059 100644 --- a/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx +++ b/site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx @@ -1,5 +1,4 @@ import type { Interpolation, Theme } from "@emotion/react"; -import GitHub from "@mui/icons-material/GitHub"; import Skeleton from "@mui/material/Skeleton"; import type { GroupsByUserId } from "api/queries/groups"; import type * as TypesGen from "api/typesGenerated"; @@ -16,6 +15,7 @@ import { DropdownMenuTrigger, } from "components/DropdownMenu/DropdownMenu"; import { EmptyState } from "components/EmptyState/EmptyState"; +import { ExternalImage } from "components/ExternalImage/ExternalImage"; import { LastSeen } from "components/LastSeen/LastSeen"; import { TableCell, TableRow } from "components/Table/Table"; import { @@ -269,7 +269,7 @@ const LoginType: FC = ({ authMethods, value }) => { icon = ; } else if (value === "github") { displayName = "GitHub"; - icon = ; + icon = ; } else if (value === "token") { displayName = "Token"; icon = ; diff --git a/site/src/theme/light/mui.ts b/site/src/theme/light/mui.ts index 8fe2e25b6ca0d..d504bcdf77173 100644 --- a/site/src/theme/light/mui.ts +++ b/site/src/theme/light/mui.ts @@ -186,15 +186,6 @@ const muiTheme = createTheme({ }), }, }, - MuiIconButton: { - styleOverrides: { - root: { - "&.Mui-focusVisible": { - boxShadow: `0 0 0 2px ${tw.blue[600]}`, - }, - }, - }, - }, }, }); diff --git a/site/src/theme/mui.ts b/site/src/theme/mui.ts index f7b5ab1bc52ab..95b66520b52f9 100644 --- a/site/src/theme/mui.ts +++ b/site/src/theme/mui.ts @@ -322,14 +322,4 @@ export const components = { }, }, }, - - MuiIconButton: { - styleOverrides: { - root: { - "&.Mui-focusVisible": { - boxShadow: `0 0 0 2px ${tw.blue[400]}`, - }, - }, - }, - }, } satisfies ThemeOptions["components"];