From 637f4c0688a18d2012dca49d8cfc80cd86fb8e88 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Wed, 4 Feb 2026 18:58:01 -0800 Subject: [PATCH 1/2] fix(desktop): convert unnecessary dynamic imports to static imports --- apps/desktop/src/lib/trpc/index.ts | 32 ++++++++----------- apps/desktop/src/lib/trpc/routers/window.ts | 5 ++- apps/desktop/src/renderer/lib/sentry.ts | 6 ++-- .../TabsContent/Terminal/helpers.ts | 18 +++++------ .../Terminal/hooks/useTerminalLifecycle.ts | 7 ++-- 5 files changed, 29 insertions(+), 39 deletions(-) diff --git a/apps/desktop/src/lib/trpc/index.ts b/apps/desktop/src/lib/trpc/index.ts index d3347837899..9ab709a1212 100644 --- a/apps/desktop/src/lib/trpc/index.ts +++ b/apps/desktop/src/lib/trpc/index.ts @@ -1,3 +1,4 @@ +import * as Sentry from "@sentry/electron/main"; import { createTRPCReact } from "@trpc/react-query"; import { initTRPC } from "@trpc/server"; import superjson from "superjson"; @@ -19,26 +20,21 @@ const sentryMiddleware = t.middleware(async ({ next, path, type }) => { const result = await next(); if (!result.ok) { - try { - const Sentry = await import("@sentry/electron/main"); - const error = result.error; + const error = result.error; - // Get the original error if it's wrapped in a TRPCError - const originalError = error.cause instanceof Error ? error.cause : error; + // Get the original error if it's wrapped in a TRPCError + const originalError = error.cause instanceof Error ? error.cause : error; - Sentry.captureException(originalError, { - tags: { - trpc_path: path, - trpc_type: type, - trpc_code: error.code, - }, - extra: { - trpc_message: error.message, - }, - }); - } catch { - // Sentry not available - } + Sentry.captureException(originalError, { + tags: { + trpc_path: path, + trpc_type: type, + trpc_code: error.code, + }, + extra: { + trpc_message: error.message, + }, + }); } return result; diff --git a/apps/desktop/src/lib/trpc/routers/window.ts b/apps/desktop/src/lib/trpc/routers/window.ts index e050e1847cd..f1c9da3e902 100644 --- a/apps/desktop/src/lib/trpc/routers/window.ts +++ b/apps/desktop/src/lib/trpc/routers/window.ts @@ -1,4 +1,6 @@ +import fs from "node:fs/promises"; import { homedir } from "node:os"; +import path from "node:path"; import type { BrowserWindow } from "electron"; import { dialog } from "electron"; import { publicProcedure, router } from ".."; @@ -72,9 +74,6 @@ export const createWindowRouter = (getWindow: () => BrowserWindow | null) => { return { canceled: true, dataUrl: null }; } - // Read the file and convert to base64 data URL - const fs = await import("node:fs/promises"); - const path = await import("node:path"); const filePath = result.filePaths[0]; const buffer = await fs.readFile(filePath); const ext = path.extname(filePath).slice(1).toLowerCase(); diff --git a/apps/desktop/src/renderer/lib/sentry.ts b/apps/desktop/src/renderer/lib/sentry.ts index 7e025a1c38a..0d1d2829c7d 100644 --- a/apps/desktop/src/renderer/lib/sentry.ts +++ b/apps/desktop/src/renderer/lib/sentry.ts @@ -1,8 +1,9 @@ +import * as Sentry from "@sentry/electron/renderer"; import { env } from "../env.renderer"; let sentryInitialized = false; -export async function initSentry(): Promise { +export function initSentry(): void { if (sentryInitialized) return; if (!env.SENTRY_DSN_DESKTOP || env.NODE_ENV !== "production") { @@ -10,9 +11,6 @@ export async function initSentry(): Promise { } try { - // Dynamic import to avoid bundler issues - const Sentry = await import("@sentry/electron/renderer"); - Sentry.init({ dsn: env.SENTRY_DSN_DESKTOP, environment: env.NODE_ENV, diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts index 12437e260fc..e7b43725a6e 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/helpers.ts @@ -2,6 +2,7 @@ import { toast } from "@superset/ui/sonner"; import { ClipboardAddon } from "@xterm/addon-clipboard"; import { FitAddon } from "@xterm/addon-fit"; import { ImageAddon } from "@xterm/addon-image"; +import { LigaturesAddon } from "@xterm/addon-ligatures"; import { Unicode11Addon } from "@xterm/addon-unicode11"; import { WebglAddon } from "@xterm/addon-webgl"; import type { ITheme } from "@xterm/xterm"; @@ -221,16 +222,13 @@ export function createTerminalInstance( rendererRef.current = loadRenderer(xterm); }); - import("@xterm/addon-ligatures") - .then(({ LigaturesAddon }) => { - if (isDisposed) return; - try { - xterm.loadAddon(new LigaturesAddon()); - } catch { - // Ligatures not supported by current font - } - }) - .catch(() => {}); + try { + if (!isDisposed) { + xterm.loadAddon(new LigaturesAddon()); + } + } catch { + // Ligatures not supported by current font + } const cleanupQuerySuppression = suppressQueryResponses(xterm); diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalLifecycle.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalLifecycle.ts index 3d13cfeec6e..8ff9b56dd16 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalLifecycle.ts +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/hooks/useTerminalLifecycle.ts @@ -1,5 +1,5 @@ import type { FitAddon } from "@xterm/addon-fit"; -import type { SearchAddon } from "@xterm/addon-search"; +import { SearchAddon } from "@xterm/addon-search"; import type { IDisposable, ITheme, Terminal as XTerm } from "@xterm/xterm"; import type { MutableRefObject, RefObject } from "react"; import { useCallback, useEffect, useRef, useState } from "react"; @@ -239,12 +239,11 @@ export function useTerminalLifecycle({ xterm.focus(); } - import("@xterm/addon-search").then(({ SearchAddon }) => { - if (isUnmounted) return; + if (!isUnmounted) { const searchAddon = new SearchAddon(); xterm.loadAddon(searchAddon); searchAddonRef.current = searchAddon; - }); + } // Wait for first render before applying restoration let renderDisposable: IDisposable | null = null; From 94016d6798228708575f0d25452a1268c641ac4e Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Wed, 4 Feb 2026 23:19:44 -0800 Subject: [PATCH 2/2] revert: keep sentry dynamic imports as-is --- apps/desktop/src/lib/trpc/index.ts | 32 ++++++++++++++----------- apps/desktop/src/renderer/lib/sentry.ts | 6 +++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/apps/desktop/src/lib/trpc/index.ts b/apps/desktop/src/lib/trpc/index.ts index 9ab709a1212..d3347837899 100644 --- a/apps/desktop/src/lib/trpc/index.ts +++ b/apps/desktop/src/lib/trpc/index.ts @@ -1,4 +1,3 @@ -import * as Sentry from "@sentry/electron/main"; import { createTRPCReact } from "@trpc/react-query"; import { initTRPC } from "@trpc/server"; import superjson from "superjson"; @@ -20,21 +19,26 @@ const sentryMiddleware = t.middleware(async ({ next, path, type }) => { const result = await next(); if (!result.ok) { - const error = result.error; + try { + const Sentry = await import("@sentry/electron/main"); + const error = result.error; - // Get the original error if it's wrapped in a TRPCError - const originalError = error.cause instanceof Error ? error.cause : error; + // Get the original error if it's wrapped in a TRPCError + const originalError = error.cause instanceof Error ? error.cause : error; - Sentry.captureException(originalError, { - tags: { - trpc_path: path, - trpc_type: type, - trpc_code: error.code, - }, - extra: { - trpc_message: error.message, - }, - }); + Sentry.captureException(originalError, { + tags: { + trpc_path: path, + trpc_type: type, + trpc_code: error.code, + }, + extra: { + trpc_message: error.message, + }, + }); + } catch { + // Sentry not available + } } return result; diff --git a/apps/desktop/src/renderer/lib/sentry.ts b/apps/desktop/src/renderer/lib/sentry.ts index 0d1d2829c7d..7e025a1c38a 100644 --- a/apps/desktop/src/renderer/lib/sentry.ts +++ b/apps/desktop/src/renderer/lib/sentry.ts @@ -1,9 +1,8 @@ -import * as Sentry from "@sentry/electron/renderer"; import { env } from "../env.renderer"; let sentryInitialized = false; -export function initSentry(): void { +export async function initSentry(): Promise { if (sentryInitialized) return; if (!env.SENTRY_DSN_DESKTOP || env.NODE_ENV !== "production") { @@ -11,6 +10,9 @@ export function initSentry(): void { } try { + // Dynamic import to avoid bundler issues + const Sentry = await import("@sentry/electron/renderer"); + Sentry.init({ dsn: env.SENTRY_DSN_DESKTOP, environment: env.NODE_ENV,