fix(nx/forge): get forge building to actually run

This commit is contained in:
Elian Doran 2025-04-25 17:46:50 +03:00
parent 506935b365
commit 4257da62fd
No known key found for this signature in database
3 changed files with 7 additions and 7 deletions

1
apps/desktop/.npmrc Normal file
View File

@ -0,0 +1 @@
node-linker = hoisted

View File

@ -18,9 +18,7 @@ const windowsSignConfiguration = process.env.WINDOWS_SIGN_EXECUTABLE ? {
} : undefined; } : undefined;
module.exports = { module.exports = {
// we run electron-forge inside the ./build folder, outDir: "out",
// to have it output to ./dist, we need to go up a directory first
outDir: "../dist",
packagerConfig: { packagerConfig: {
executableName: EXECUTABLE_NAME, executableName: EXECUTABLE_NAME,
name: PRODUCT_NAME, name: PRODUCT_NAME,

View File

@ -2,8 +2,8 @@
"name": "@triliumnext/desktop", "name": "@triliumnext/desktop",
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"dependencies": { "main": "dist/main.js",
"electron": "35.1.5", "dependencies": {
"@electron/remote": "2.1.2", "@electron/remote": "2.1.2",
"@triliumnext/server": "workspace:*", "@triliumnext/server": "workspace:*",
"better-sqlite3": "^11.9.1", "better-sqlite3": "^11.9.1",
@ -13,7 +13,8 @@
}, },
"devDependencies": { "devDependencies": {
"@types/electron-squirrel-startup": "1.0.2", "@types/electron-squirrel-startup": "1.0.2",
"copy-webpack-plugin": "13.0.0", "copy-webpack-plugin": "13.0.0",
"electron": "35.1.5",
"@electron/rebuild": "3.7.2", "@electron/rebuild": "3.7.2",
"@electron-forge/cli": "7.8.0", "@electron-forge/cli": "7.8.0",
"@electron-forge/maker-deb": "7.8.0", "@electron-forge/maker-deb": "7.8.0",
@ -62,7 +63,7 @@
}, },
"make": { "make": {
"dependsOn": [ "build" ], "dependsOn": [ "build" ],
"command": "pnpm --filter @triliumnext/desktop exec electron-forge make apps/desktop/dist" "command": "pnpm --filter @triliumnext/desktop exec electron-forge make ."
} }
} }
} }