oh boy

coder · aslilac · Dec 20, 2023 · Dec 18, 2023 · Dec 18, 2023 · Dec 18, 2023
commit 405d0f3497e99609137fc48619975fd90ebd3a0e
diff --git a/site/src/@types/mui.d.ts b/site/src/@types/mui.d.ts
@@ -2,10 +2,6 @@ import type { PaletteColor, PaletteColorOptions } from "@mui/material/styles";
 import type { NewTheme } from "theme/experimental";
 
 declare module "@mui/material/styles" {
-  interface Theme {
-    experimental: NewTheme;
-  }
-
   interface Palette {
     neutral: PaletteColor;
   }

diff --git a/site/src/components/ProxyStatusLatency/ProxyStatusLatency.tsx b/site/src/components/ProxyStatusLatency/ProxyStatusLatency.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from "@mui/material/styles";
+import { useTheme } from "@emotion/react";
 import HelpOutline from "@mui/icons-material/HelpOutline";
 import Tooltip from "@mui/material/Tooltip";
 import { type FC } from "react";

diff --git a/site/src/components/Resources/AgentLatency.tsx b/site/src/components/Resources/AgentLatency.tsx
@@ -1,6 +1,5 @@
 import { type FC, useRef, useState } from "react";
-import { useTheme } from "@emotion/react";
-import { Theme } from "@mui/material/styles";
+import { type Theme, useTheme } from "@emotion/react";
 import type { WorkspaceAgent, DERPRegion } from "api/typesGenerated";
 import {
   HelpTooltipText,
@@ -29,7 +28,11 @@ const getDisplayLatency = (theme: Theme, agent: WorkspaceAgent) => {
   };
 };
 
-export const AgentLatency: FC<{ agent: WorkspaceAgent }> = ({ agent }) => {
+interface AgentLatencyProps {
+  agent: WorkspaceAgent;
+}
+
+export const AgentLatency: FC<AgentLatencyProps> = ({ agent }) => {
   const theme = useTheme();
   const anchorRef = useRef<HTMLButtonElement>(null);
   const [isOpen, setIsOpen] = useState(false);

diff --git a/site/src/pages/HealthPage/DERPRegionPage.tsx b/site/src/pages/HealthPage/DERPRegionPage.tsx
@@ -1,4 +1,19 @@
+import Tooltip from "@mui/material/Tooltip";
+import CodeOutlined from "@mui/icons-material/CodeOutlined";
+import TagOutlined from "@mui/icons-material/TagOutlined";
+import ArrowBackOutlined from "@mui/icons-material/ArrowBackOutlined";
+import { useTheme } from "@emotion/react";
+import { type FC } from "react";
+import { Helmet } from "react-helmet-async";
 import { Link, useOutletContext, useParams } from "react-router-dom";
+import type {
+  HealthMessage,
+  HealthSeverity,
+  HealthcheckReport,
+} from "api/typesGenerated";
+import { getLatencyColor } from "utils/latency";
+import { Alert } from "components/Alert/Alert";
+import { pageTitle } from "utils/page";
 import {
   Header,
   HeaderTitle,
@@ -8,22 +23,8 @@ import {
   Logs,
   HealthyDot,
 } from "./Content";
-import {
-  HealthMessage,
-  HealthSeverity,
-  HealthcheckReport,
-} from "api/typesGenerated";
-import CodeOutlined from "@mui/icons-material/CodeOutlined";
-import TagOutlined from "@mui/icons-material/TagOutlined";
-import Tooltip from "@mui/material/Tooltip";
-import { useTheme } from "@mui/material/styles";
-import ArrowBackOutlined from "@mui/icons-material/ArrowBackOutlined";
-import { getLatencyColor } from "utils/latency";
-import { Alert } from "components/Alert/Alert";
-import { Helmet } from "react-helmet-async";
-import { pageTitle } from "utils/page";
 
-export const DERPRegionPage = () => {
+export const DERPRegionPage: FC = () => {
   const theme = useTheme();
   const healthStatus = useOutletContext<HealthcheckReport>();
   const params = useParams() as { regionId: string };

diff --git a/site/src/theme/dark/monaco.ts b/site/src/theme/dark/monaco.ts
@@ -34,4 +34,4 @@ export default {
     "editor.foreground": muiTheme.palette.text.primary,
     "editor.background": muiTheme.palette.background.paper,
   },
-} satisfies monaco.editor.IStandaloneThemeData;
+} satisfies monaco.editor.IStandaloneThemeData as monaco.editor.IStandaloneThemeData;
diff --git a/site/src/theme/darkBlue/monaco.ts b/site/src/theme/darkBlue/monaco.ts
@@ -34,4 +34,4 @@ export default {
     "editor.foreground": muiTheme.palette.text.primary,
     "editor.background": muiTheme.palette.background.paper,
   },
-} satisfies monaco.editor.IStandaloneThemeData;
+} satisfies monaco.editor.IStandaloneThemeData as monaco.editor.IStandaloneThemeData;
diff --git a/site/src/theme/light/monaco.ts b/site/src/theme/light/monaco.ts
@@ -34,4 +34,4 @@ export default {
     "editor.foreground": muiTheme.palette.text.primary,
     "editor.background": muiTheme.palette.background.paper,
   },
-} satisfies monaco.editor.IStandaloneThemeData;
+} satisfies monaco.editor.IStandaloneThemeData as monaco.editor.IStandaloneThemeData;
diff --git a/site/src/utils/latency.ts b/site/src/utils/latency.ts
@@ -1,4 +1,4 @@
-import { Theme } from "@mui/material/styles";
+import type { Theme } from "@emotion/react";
 
 export const getLatencyColor = (theme: Theme, latency?: number) => {
   if (!latency) {