diff --git a/apps/desktop/.npmrc b/apps/desktop/.npmrc new file mode 100644 index 000000000..1d6a0d53c --- /dev/null +++ b/apps/desktop/.npmrc @@ -0,0 +1 @@ +node-linker = hoisted \ No newline at end of file diff --git a/_regroup_monorepo/apps/desktop/forge.config.cjs b/apps/desktop/forge.config.cjs similarity index 98% rename from _regroup_monorepo/apps/desktop/forge.config.cjs rename to apps/desktop/forge.config.cjs index 8052d6bfe..cec903389 100644 --- a/_regroup_monorepo/apps/desktop/forge.config.cjs +++ b/apps/desktop/forge.config.cjs @@ -18,9 +18,7 @@ const windowsSignConfiguration = process.env.WINDOWS_SIGN_EXECUTABLE ? { } : undefined; module.exports = { - // we run electron-forge inside the ./build folder, - // to have it output to ./dist, we need to go up a directory first - outDir: "../dist", + outDir: "out", packagerConfig: { executableName: EXECUTABLE_NAME, name: PRODUCT_NAME, diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 38d63389e..6866fee2f 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -2,8 +2,8 @@ "name": "@triliumnext/desktop", "version": "0.0.1", "private": true, - "dependencies": { - "electron": "35.1.5", + "main": "dist/main.js", + "dependencies": { "@electron/remote": "2.1.2", "@triliumnext/server": "workspace:*", "better-sqlite3": "^11.9.1", @@ -13,7 +13,8 @@ }, "devDependencies": { "@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-forge/cli": "7.8.0", "@electron-forge/maker-deb": "7.8.0", @@ -62,7 +63,7 @@ }, "make": { "dependsOn": [ "build" ], - "command": "pnpm --filter @triliumnext/desktop exec electron-forge make apps/desktop/dist" + "command": "pnpm --filter @triliumnext/desktop exec electron-forge make ." } } }