From ee422ee51433fd10d5b979c59fa8097736c1a134 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 19 Apr 2025 10:21:59 +0300
Subject: [PATCH] fix(monorepo/electron): reintroduce app icons

---
 .../desktop/assets/app-icon}/icon.icns            | Bin
 .../desktop/assets/app-icon}/icon.ico             | Bin
 .../desktop/assets/setup-icon}/setup-banner.gif   | Bin
 .../desktop/assets/setup-icon}/setup.ico          | Bin
 apps/desktop/forge.config.cjs                     |  14 +++++++-------
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename {_regroup/images/app-icons => apps/desktop/assets/app-icon}/icon.icns (100%)
 rename {_regroup/images/app-icons => apps/desktop/assets/app-icon}/icon.ico (100%)
 rename {_regroup/images/app-icons/win => apps/desktop/assets/setup-icon}/setup-banner.gif (100%)
 rename {_regroup/images/app-icons/win => apps/desktop/assets/setup-icon}/setup.ico (100%)

diff --git a/_regroup/images/app-icons/icon.icns b/apps/desktop/assets/app-icon/icon.icns
similarity index 100%
rename from _regroup/images/app-icons/icon.icns
rename to apps/desktop/assets/app-icon/icon.icns
diff --git a/_regroup/images/app-icons/icon.ico b/apps/desktop/assets/app-icon/icon.ico
similarity index 100%
rename from _regroup/images/app-icons/icon.ico
rename to apps/desktop/assets/app-icon/icon.ico
diff --git a/_regroup/images/app-icons/win/setup-banner.gif b/apps/desktop/assets/setup-icon/setup-banner.gif
similarity index 100%
rename from _regroup/images/app-icons/win/setup-banner.gif
rename to apps/desktop/assets/setup-icon/setup-banner.gif
diff --git a/_regroup/images/app-icons/win/setup.ico b/apps/desktop/assets/setup-icon/setup.ico
similarity index 100%
rename from _regroup/images/app-icons/win/setup.ico
rename to apps/desktop/assets/setup-icon/setup.ico
diff --git a/apps/desktop/forge.config.cjs b/apps/desktop/forge.config.cjs
index c366092ad..418d09076 100644
--- a/apps/desktop/forge.config.cjs
+++ b/apps/desktop/forge.config.cjs
@@ -7,7 +7,7 @@ const BIN_PATH = path.normalize("./bin/electron-forge");
 
 const extraResourcesForPlatform = getExtraResourcesForPlatform();
 const baseLinuxMakerConfigOptions = {
-  icon: "./images/app-icons/png/128x128.png",
+  icon: "./assets/app-icon/png/128x128.png",
   desktopTemplate: path.resolve(path.join(BIN_PATH, "desktop.ejs")),
   categories: ["Office", "Utility"]
 };
@@ -24,7 +24,7 @@ module.exports = {
         name: APP_NAME,
         overwrite: true,
         asar: true,
-        icon: "./images/app-icons/icon",
+        icon: "./assets/app-icon/icon",
         osxSign: {},
         osxNotarize: {
             appleId: process.env.APPLE_ID,
@@ -127,15 +127,15 @@ module.exports = {
             name: "@electron-forge/maker-squirrel",
             config: {
                 iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
-                setupIcon: "./images/app-icons/win/setup.ico",
-                loadingGif: "./images/app-icons/win/setup-banner.gif",
+                setupIcon: "./assets/setup-icon/setup.ico",
+                loadingGif: "./assets/setup-icon/setup-banner.gif",
                 windowsSign: windowsSignConfiguration
             }
         },
         {
             name: "@electron-forge/maker-dmg",
             config: {
-                icon: "./images/app-icons/icon.icns"
+                icon: "./assets/app-icon/icon.icns"
             }
         },
         {
@@ -143,7 +143,7 @@ module.exports = {
             config: {
                 options: {
                     iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
-                    icon: "./images/app-icons/icon.ico"
+                    icon: "./assets/app-icon/icon.ico"
                 }
             }
         }
@@ -196,7 +196,7 @@ function getExtraResourcesForPlatform() {
             resources.push(...getScriptRessources())
             break;
         case "linux":
-            resources.push(...getScriptRessources(), "images/app-icons/png/256x256.png");
+            resources.push(...getScriptRessources(), "assets/app-icon/png/256x256.png");
             break;
         default:
             break;