chore(nx/server): get electron-forge up to "Finalizing package"

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"
       }
     }
   }

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")
             }
         ]

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)
     })
   }

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: {}
 

pnpm-workspace.yaml

@@ -1,16 +1,19 @@
 packages:
-  - packages/*
+- packages/*
-  - apps/*
+- apps/*
 
 ignoredBuiltDependencies:
-  - '@parcel/watcher'
+- '@parcel/watcher'
-  - '@scarf/scarf'
+- '@scarf/scarf'
-  - '@swc/core'
+- '@swc/core'
-  - core-js-pure
+- core-js-pure
-  - esbuild
+- esbuild
-  - nx
+- nx
 
 onlyBuiltDependencies:
-  - better-sqlite3
+- better-sqlite3
-  - electron
+- electron
-  - electron-winstaller
+- electron-winstaller
+
+nodeLinker: hoisted
+linkWorkspacePackages: true