From 345e5cfaf0d543bd8339f72370b6080c05387c8c Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 26 Apr 2025 09:58:42 +0300 Subject: [PATCH] fix(nx/forge): path to electron-forge binaries --- .../scripts => apps/desktop}/electron-forge/desktop.ejs | 0 apps/desktop/electron-forge/forge.config.cjs | 5 ++--- .../scripts => apps/desktop}/electron-forge/sign-windows.cjs | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename {_regroup_monorepo/apps/desktop/scripts => apps/desktop}/electron-forge/desktop.ejs (100%) rename {_regroup_monorepo/apps/desktop/scripts => apps/desktop}/electron-forge/sign-windows.cjs (100%) diff --git a/_regroup_monorepo/apps/desktop/scripts/electron-forge/desktop.ejs b/apps/desktop/electron-forge/desktop.ejs similarity index 100% rename from _regroup_monorepo/apps/desktop/scripts/electron-forge/desktop.ejs rename to apps/desktop/electron-forge/desktop.ejs diff --git a/apps/desktop/electron-forge/forge.config.cjs b/apps/desktop/electron-forge/forge.config.cjs index f4808a194..d2fd0bd66 100644 --- a/apps/desktop/electron-forge/forge.config.cjs +++ b/apps/desktop/electron-forge/forge.config.cjs @@ -5,7 +5,6 @@ const ELECTRON_FORGE_DIR = __dirname; const EXECUTABLE_NAME = "trilium"; // keep in sync with server's package.json -> packagerConfig.executableName const PRODUCT_NAME = "TriliumNext Notes"; -const BIN_PATH = path.normalize("./scripts/electron-forge"); const APP_ICON_PATH = path.join(ELECTRON_FORGE_DIR, "app-icon"); const extraResourcesForPlatform = getExtraResourcesForPlatform(); @@ -13,11 +12,11 @@ const baseLinuxMakerConfigOptions = { name: EXECUTABLE_NAME, productName: PRODUCT_NAME, icon: path.join(APP_ICON_PATH, "png/128x128.png"), - desktopTemplate: path.resolve(path.join(BIN_PATH, "desktop.ejs")), + desktopTemplate: path.resolve(path.join(ELECTRON_FORGE_DIR, "desktop.ejs")), categories: ["Office", "Utility"] }; const windowsSignConfiguration = process.env.WINDOWS_SIGN_EXECUTABLE ? { - hookModulePath: path.join(BIN_PATH, "sign-windows.cjs") + hookModulePath: path.join(ELECTRON_FORGE_DIR, "sign-windows.cjs") } : undefined; module.exports = { diff --git a/_regroup_monorepo/apps/desktop/scripts/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs similarity index 100% rename from _regroup_monorepo/apps/desktop/scripts/electron-forge/sign-windows.cjs rename to apps/desktop/electron-forge/sign-windows.cjs