fix(nx/forge): setup icon

This commit is contained in:
Elian Doran 2025-04-26 01:09:28 +03:00
parent b6b9ca1ab5
commit de4fc4735b
No known key found for this signature in database
4 changed files with 6 additions and 7 deletions

1
.gitignore vendored
View File

@ -46,3 +46,4 @@ vitest.config.*.timestamp*
test-output test-output
apps/*/data apps/*/data
apps/*/out

View File

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

View File

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 109 KiB

View File

@ -1,6 +1,8 @@
const path = require("path"); const path = require("path");
const fs = require("fs-extra"); 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 EXECUTABLE_NAME = "trilium"; // keep in sync with server's package.json -> packagerConfig.executableName
const PRODUCT_NAME = "TriliumNext Notes"; const PRODUCT_NAME = "TriliumNext Notes";
const BIN_PATH = path.normalize("./scripts/electron-forge"); const BIN_PATH = path.normalize("./scripts/electron-forge");
@ -34,11 +36,7 @@ module.exports = {
windowsSign: windowsSignConfiguration, windowsSign: windowsSignConfiguration,
extraResource: [ extraResource: [
// All resources should stay in Resources directory for macOS // All resources should stay in Resources directory for macOS
...(process.platform === "darwin" ? [] : extraResourcesForPlatform), ...(process.platform === "darwin" ? [] : extraResourcesForPlatform)
// These always go in Resources
"../server/translations/",
"../../node_modules/@highlightjs/cdn-assets/styles"
], ],
afterPrune: [ afterPrune: [
(buildPath, _electronVersion, _platform, _arch, callback) => { (buildPath, _electronVersion, _platform, _arch, callback) => {
@ -129,8 +127,8 @@ module.exports = {
name: EXECUTABLE_NAME, name: EXECUTABLE_NAME,
productName: PRODUCT_NAME, productName: PRODUCT_NAME,
iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico", iconUrl: "https://raw.githubusercontent.com/TriliumNext/Notes/develop/images/app-icons/icon.ico",
setupIcon: "./assets/setup-icon/setup.ico", setupIcon: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup.ico"),
loadingGif: "./assets/setup-icon/setup-banner.gif", loadingGif: path.join(ELECTRON_FORGE_DIR, "setup-icon/setup-banner.gif"),
windowsSign: windowsSignConfiguration windowsSign: windowsSignConfiguration
} }
}, },