fix(nx/forge): get forge command to execute

_regroup_monorepo/apps/client/package.json

@@ -24,8 +24,7 @@
     "test": "vitest"
   },
   "devDependencies": {
-    "autoprefixer": "10.4.21",
-    "copy-webpack-plugin": "13.0.0",
+    "autoprefixer": "10.4.21",    
     "mini-css-extract-plugin": "2.9.2",
     "ts-loader": "9.5.2",
     "tsx": "4.19.3",

_regroup_monorepo/apps/desktop/package.json

@@ -35,14 +35,6 @@
     "@triliumnext/server": "0.0.1"
   },
   "devDependencies": {        
-    "tsx": "4.19.3",
-    "@electron-forge/cli": "7.8.0",
-    "@electron-forge/maker-deb": "7.8.0",
-    "@electron-forge/maker-dmg": "7.8.0",
-    "@electron-forge/maker-flatpak": "7.8.0",
-    "@electron-forge/maker-rpm": "7.8.0",
-    "@electron-forge/maker-squirrel": "7.8.0",
-    "@electron-forge/maker-zip": "7.8.0",
-    "@electron-forge/plugin-auto-unpack-natives": "7.8.0"
+    "tsx": "4.19.3"
   }
 }

apps/desktop/package.json

@@ -13,8 +13,16 @@
   },
   "devDependencies": {
     "@types/electron-squirrel-startup": "1.0.2",
-    "copy-webpack-plugin": "13.0.0",
-    "@electron/rebuild": "3.7.2"
+    "copy-webpack-plugin": "13.0.0",    
+    "@electron/rebuild": "3.7.2",
+    "@electron-forge/cli": "7.8.0",
+    "@electron-forge/maker-deb": "7.8.0",
+    "@electron-forge/maker-dmg": "7.8.0",
+    "@electron-forge/maker-flatpak": "7.8.0",
+    "@electron-forge/maker-rpm": "7.8.0",
+    "@electron-forge/maker-squirrel": "7.8.0",
+    "@electron-forge/maker-zip": "7.8.0",
+    "@electron-forge/plugin-auto-unpack-natives": "7.8.0"
   },
   "scripts": {
     "start-prod": "nx build desktop && cross-env TRILIUM_DATA_DIR=data TRILIUM_RESOURCE_DIR=dist TRILIUM_PORT=37841 electron dist/main.js",
@@ -51,6 +59,10 @@
             ]
           }
         ]
+      },
+      "make": {
+        "dependsOn": [ "build" ],
+        "command": "pnpm --filter @triliumnext/desktop exec electron-forge make apps/desktop/dist"
       }
     }
   }

apps/server/package.json

@@ -119,7 +119,8 @@
     "webpack": "5.99.6",
     "ws": "8.18.1",
     "xml2js": "0.6.2",
-    "yauzl": "3.2.0"
+    "yauzl": "3.2.0",
+    "copy-webpack-plugin": "13.0.0"
   },
   "nx": {
     "targets": {

pnpm-workspace.yaml

@@ -1,15 +1,16 @@
 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:
-- electron
-- better-sqlite3
+  - better-sqlite3
+  - electron
+  - electron-winstaller