diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts index c0a7b4bb2bc42d0fedc4030184b15d060bc162ac..d53378dd9471a9e6c33833490366de175d6af344 100644 --- a/apps/desktop/src/main.ts +++ b/apps/desktop/src/main.ts @@ -5,20 +5,11 @@ import net from "node:net"; import os from "node:os"; import path from "node:path"; -import { - app, - BrowserWindow, - dialog, - ipcMain, - Menu, - type MenuItemConstructorOptions, - protocol, - shell, -} from "electron"; +import { app, BrowserWindow, dialog, ipcMain, Menu, protocol, shell } from "electron"; +import type { MenuItemConstructorOptions } from "electron"; import { showDesktopConfirmDialog } from "./confirmDialog"; import { fixPath } from "./fixPath"; -import { resolveDesktopStateDir } from "./stateDir"; fixPath(); @@ -27,7 +18,8 @@ const CONFIRM_CHANNEL = "desktop:confirm"; const CONTEXT_MENU_CHANNEL = "desktop:context-menu"; const OPEN_EXTERNAL_CHANNEL = "desktop:open-external"; const MENU_ACTION_CHANNEL = "desktop:menu-action"; -const STATE_DIR = resolveDesktopStateDir(); +const STATE_DIR = + process.env.T3CODE_STATE_DIR?.trim() ?? path.join(os.homedir(), ".t3", "userdata"); const DESKTOP_SCHEME = "t3"; const ROOT_DIR = path.resolve(__dirname, "../../.."); const isDevelopment = Boolean(process.env.VITE_DEV_SERVER_URL); diff --git a/apps/desktop/src/stateDir.test.ts b/apps/desktop/src/stateDir.test.ts deleted file mode 100644 index 5d52f436b4444cac8d5cd212abdf8d0caa427ad9..0000000000000000000000000000000000000000 --- a/apps/desktop/src/stateDir.test.ts +++ /dev/null @@ -1,23 +0,0 @@ -import os from "node:os"; -import path from "node:path"; - -import { describe, expect, it } from "vitest"; - -import { DEFAULT_DESKTOP_STATE_DIR, resolveDesktopStateDir } from "./stateDir"; - -describe("resolveDesktopStateDir", () => { - it("returns env override when provided", () => { - const resolved = resolveDesktopStateDir({ - T3CODE_STATE_DIR: " /tmp/t3-dev-state ", - }); - - expect(resolved).toBe("/tmp/t3-dev-state"); - }); - - it("falls back to default userdata dir when override is missing", () => { - const resolved = resolveDesktopStateDir({}); - - expect(resolved).toBe(DEFAULT_DESKTOP_STATE_DIR); - expect(resolved).toBe(path.join(os.homedir(), ".t3", "userdata")); - }); -}); diff --git a/apps/desktop/src/stateDir.ts b/apps/desktop/src/stateDir.ts deleted file mode 100644 index b8fb37db80193244f50df166977900daad166668..0000000000000000000000000000000000000000 --- a/apps/desktop/src/stateDir.ts +++ /dev/null @@ -1,12 +0,0 @@ -import os from "node:os"; -import path from "node:path"; - -export const DEFAULT_DESKTOP_STATE_DIR = path.join(os.homedir(), ".t3", "userdata"); - -export function resolveDesktopStateDir(env: NodeJS.ProcessEnv = process.env): string { - const value = env.T3CODE_STATE_DIR?.trim(); - if (value) { - return value; - } - return DEFAULT_DESKTOP_STATE_DIR; -}