From 457bf2bf5e03ce30ba06b2f18d229e567e2078fe Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Fri, 25 Apr 2025 18:23:52 +0300
Subject: [PATCH] chore(nx/server): get electron-forge up to "Finalizing
 package"

---
 apps/desktop/package.json       |  2 +-
 apps/desktop/webpack.config.cjs |  2 +-
 apps/server/webpack.config.cjs  |  2 +-
 pnpm-lock.yaml                  |  6 +++---
 pnpm-workspace.yaml             | 25 ++++++++++++++-----------
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 6866fee2f..07ad6823e 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -63,7 +63,7 @@
       },
       "make": {
         "dependsOn": [ "build" ],
-        "command": "pnpm --filter @triliumnext/desktop exec electron-forge make ."
+        "command": "pnpm exec electron-forge make apps/desktop"
       }
     }
   }
diff --git a/apps/desktop/webpack.config.cjs b/apps/desktop/webpack.config.cjs
index 605d5f63a..6e61d2842 100644
--- a/apps/desktop/webpack.config.cjs
+++ b/apps/desktop/webpack.config.cjs
@@ -42,7 +42,7 @@ module.exports = {
                 to: join(outputDir, "assets")
             },
             {
-              from: "node_modules/@electron/remote",
+              from: "../../node_modules/@electron/remote",
               to: join(outputDir, "node_modules/@electron/remote")
             }
         ]
diff --git a/apps/server/webpack.config.cjs b/apps/server/webpack.config.cjs
index 05b506c89..f8dccf323 100644
--- a/apps/server/webpack.config.cjs
+++ b/apps/server/webpack.config.cjs
@@ -36,7 +36,7 @@ function buildFilesToCopy() {
 
   for (const nodePath of nodePaths) {
     files.push({
-      from: join("node_modules", nodePath),
+      from: join("..", "..", "node_modules", nodePath),
       to: join(outputDir, "node_modules", nodePath)
     })
   }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index da1e0ce64..aa7bb8c20 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -291,9 +291,6 @@ importers:
       better-sqlite3:
         specifier: ^11.9.1
         version: 11.9.1
-      electron:
-        specifier: 35.1.5
-        version: 35.1.5
       electron-debug:
         specifier: 4.1.0
         version: 4.1.0
@@ -337,6 +334,9 @@ importers:
       copy-webpack-plugin:
         specifier: 13.0.0
         version: 13.0.0(webpack@5.99.6(@swc/core@1.5.29(@swc/helpers@0.5.17))(esbuild@0.19.12)(webpack-cli@5.1.4))
+      electron:
+        specifier: 35.1.5
+        version: 35.1.5
 
   apps/desktop-e2e: {}
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index dfe4d5d98..92bbd5ba6 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,16 +1,19 @@
 packages:
-  - packages/*
-  - apps/*
+- packages/*
+- apps/*
 
 ignoredBuiltDependencies:
-  - '@parcel/watcher'
-  - '@scarf/scarf'
-  - '@swc/core'
-  - core-js-pure
-  - esbuild
-  - nx
+- '@parcel/watcher'
+- '@scarf/scarf'
+- '@swc/core'
+- core-js-pure
+- esbuild
+- nx
 
 onlyBuiltDependencies:
-  - better-sqlite3
-  - electron
-  - electron-winstaller
+- better-sqlite3
+- electron
+- electron-winstaller
+
+nodeLinker: hoisted
+linkWorkspacePackages: true