diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/icon.icns b/apps/desktop/electron-forge/app-icon/icon.icns similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/icon.icns rename to apps/desktop/electron-forge/app-icon/icon.icns diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/icon.ico b/apps/desktop/electron-forge/app-icon/icon.ico similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/icon.ico rename to apps/desktop/electron-forge/app-icon/icon.ico diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/ios/apple-touch-icon.png b/apps/desktop/electron-forge/app-icon/ios/apple-touch-icon.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/ios/apple-touch-icon.png rename to apps/desktop/electron-forge/app-icon/ios/apple-touch-icon.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/1000x1000.png b/apps/desktop/electron-forge/app-icon/png/1000x1000.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/1000x1000.png rename to apps/desktop/electron-forge/app-icon/png/1000x1000.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/1024x1024.png b/apps/desktop/electron-forge/app-icon/png/1024x1024.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/1024x1024.png rename to apps/desktop/electron-forge/app-icon/png/1024x1024.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/128x128.png b/apps/desktop/electron-forge/app-icon/png/128x128.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/128x128.png rename to apps/desktop/electron-forge/app-icon/png/128x128.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/16x16-dev.png b/apps/desktop/electron-forge/app-icon/png/16x16-dev.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/16x16-dev.png rename to apps/desktop/electron-forge/app-icon/png/16x16-dev.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/16x16.png b/apps/desktop/electron-forge/app-icon/png/16x16.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/16x16.png rename to apps/desktop/electron-forge/app-icon/png/16x16.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/256x256-dev.png b/apps/desktop/electron-forge/app-icon/png/256x256-dev.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/256x256-dev.png rename to apps/desktop/electron-forge/app-icon/png/256x256-dev.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/256x256.png b/apps/desktop/electron-forge/app-icon/png/256x256.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/256x256.png rename to apps/desktop/electron-forge/app-icon/png/256x256.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/32x32-dev.png b/apps/desktop/electron-forge/app-icon/png/32x32-dev.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/32x32-dev.png rename to apps/desktop/electron-forge/app-icon/png/32x32-dev.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/32x32.png b/apps/desktop/electron-forge/app-icon/png/32x32.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/32x32.png rename to apps/desktop/electron-forge/app-icon/png/32x32.png diff --git a/_regroup_monorepo/apps/desktop/assets/app-icon/png/512x512.png b/apps/desktop/electron-forge/app-icon/png/512x512.png similarity index 100% rename from _regroup_monorepo/apps/desktop/assets/app-icon/png/512x512.png rename to apps/desktop/electron-forge/app-icon/png/512x512.png diff --git a/apps/desktop/electron-forge/forge.config.cjs b/apps/desktop/electron-forge/forge.config.cjs index 0febb4a5e..f4808a194 100644 --- a/apps/desktop/electron-forge/forge.config.cjs +++ b/apps/desktop/electron-forge/forge.config.cjs @@ -1,17 +1,18 @@ const path = require("path"); const fs = require("fs-extra"); -const ELECTRON_FORGE_DIR = "apps/desktop/electron-forge"; +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(); const baseLinuxMakerConfigOptions = { name: EXECUTABLE_NAME, productName: PRODUCT_NAME, - icon: "./assets/app-icon/png/128x128.png", + icon: path.join(APP_ICON_PATH, "png/128x128.png"), desktopTemplate: path.resolve(path.join(BIN_PATH, "desktop.ejs")), categories: ["Office", "Utility"] }; @@ -27,10 +28,9 @@ module.exports = { name: PRODUCT_NAME, overwrite: true, asar: true, - icon: "./assets/app-icon/icon", + icon: path.join(APP_ICON_PATH, "icon"), osxSign: {}, osxNotarize: { - appleId: process.env.APPLE_ID, appleIdPassword: process.env.APPLE_ID_PASSWORD, teamId: process.env.APPLE_TEAM_ID }, @@ -154,7 +154,7 @@ module.exports = { { name: "@electron-forge/maker-dmg", config: { - icon: "./assets/app-icon/icon.icns" + icon: path.join(APP_ICON_PATH, "icon.icns") } }, { @@ -162,7 +162,7 @@ module.exports = { config: { options: { iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", - icon: "./assets/app-icon/icon.ico" + icon: path.join(APP_ICON_PATH, "icon.ico") } } } @@ -215,7 +215,7 @@ function getExtraResourcesForPlatform() { resources.push(...getScriptRessources()) break; case "linux": - resources.push(...getScriptRessources(), "assets/app-icon/png/256x256.png"); + resources.push(...getScriptRessources(), path.join(APP_ICON_PATH, "png/256x256.png")); break; default: break;