diff --git a/apps/server/src/services/utils.ts b/apps/server/src/services/utils.ts index 2ef921f35..89aad1bbb 100644 --- a/apps/server/src/services/utils.ts +++ b/apps/server/src/services/utils.ts @@ -9,8 +9,6 @@ import escape from "escape-html"; import sanitize from "sanitize-filename"; import mimeTypes from "mime-types"; import path from "path"; -import { fileURLToPath } from "url"; -import { dirname, join } from "path"; import type NoteMeta from "./meta/note_meta.js"; import log from "./log.js"; import { t } from "i18next"; @@ -299,7 +297,7 @@ export function getResourceDir() { return path.dirname(process.argv[1]); } - return join(dirname(fileURLToPath(import.meta.url)), ".."); + return path.join(__dirname, ".."); } // TODO: Deduplicate with src/public/app/services/utils.ts diff --git a/apps/server/src/services/window.ts b/apps/server/src/services/window.ts index b62240be9..a803e150d 100644 --- a/apps/server/src/services/window.ts +++ b/apps/server/src/services/window.ts @@ -10,10 +10,8 @@ import keyboardActionsService from "./keyboard_actions.js"; import electron from "electron"; import type { App, BrowserWindowConstructorOptions, BrowserWindow, WebContents } from "electron"; import { formatDownloadTitle, isDev, isMac, isWindows } from "./utils.js"; - -import { fileURLToPath } from "url"; -import { dirname } from "path"; import { t } from "i18next"; +import { RESOURCE_DIR } from "./resource_dir.js"; // Prevent the window being garbage collected let mainWindow: BrowserWindow | null; @@ -259,7 +257,7 @@ async function configureWebContents(webContents: WebContents, spellcheckEnabled: } function getIcon() { - return path.join(dirname(fileURLToPath(import.meta.url)), "../../images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png"); + return path.join(RESOURCE_DIR, "images/app-icons/png/256x256" + (isDev ? "-dev" : "") + ".png"); } async function createSetupWindow() {