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/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;