diff --git a/.gitignore b/.gitignore index 861fdd790..00a415ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ vitest.config.*.timestamp* test-output apps/*/data +apps/*/out \ No newline at end of file diff --git a/_regroup_monorepo/apps/desktop/assets/setup-icon/setup-banner.gif b/apps/desktop/electron-forge/setup-icon/setup-banner.gif similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/setup-icon/setup-banner.gif rename to apps/desktop/electron-forge/setup-icon/setup-banner.gif diff --git a/_regroup_monorepo/apps/desktop/assets/setup-icon/setup.ico b/apps/desktop/electron-forge/setup-icon/setup.ico similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/setup-icon/setup.ico rename to apps/desktop/electron-forge/setup-icon/setup.ico diff --git a/apps/desktop/forge.config.cjs b/apps/desktop/forge.config.cjs index cbb6c80dc..c50872362 100644 --- a/apps/desktop/forge.config.cjs +++ b/apps/desktop/forge.config.cjs @@ -1,6 +1,8 @@ const path = require("path"); const fs = require("fs-extra"); +const ELECTRON_FORGE_DIR = "apps/desktop/electron-forge"; + 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"); @@ -34,11 +36,7 @@ module.exports = { windowsSign: windowsSignConfiguration, extraResource: [ // All resources should stay in Resources directory for macOS - ...(process.platform === "darwin" ? [] : extraResourcesForPlatform), - - // These always go in Resources - "../server/translations/", - "../../node_modules/@highlightjs/cdn-assets/styles" + ...(process.platform === "darwin" ? [] : extraResourcesForPlatform) ], afterPrune: [ (buildPath, _electronVersion, _platform, _arch, callback) => { @@ -129,8 +127,8 @@ module.exports = { name: EXECUTABLE_NAME, productName: PRODUCT_NAME, iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", - setupIcon: "./assets/setup-icon/setup.ico", - loadingGif: "./assets/setup-icon/setup-banner.gif", + setupIcon: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup.ico"), + loadingGif: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup-banner.gif"), windowsSign: windowsSignConfiguration } },