Remove desktop workspace due to packager not recognizing hoisted modules

Author: Shellishack

.github/workflows/build-desktop.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -43,10 +43,12 @@ jobs:
         run: npm install --workspace=web
 
       - name: Install desktop dependencies
-        run: npm install --workspace=desktop
+        run: npm install
+        working-directory: desktop
 
       - name: Rebuild native modules
-        run: npm run rebuild-native --workspace=desktop
+        run: npm run rebuild-native
+        working-directory: desktop
 
       - name: Build Electron App
         run: |

.github/workflows/build-mobile.yml

@@ -25,10 +25,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: "17"
+          java-version: "21"
           distribution: "temurin"
 
       - name: Setup Android SDK
@@ -43,6 +43,7 @@ jobs:
         run: |
           mkdir .keystore 
           echo ${{ secrets.ANDROID_KEYSTORE }} | base64 --decode > .keystore/keystore.jks
+        working-directory: mobile
 
       - name: Setup Node.js
         uses: actions/setup-node@v4
@@ -78,5 +79,6 @@ jobs:
         working-directory: mobile
 
       - name: Build Capacitor App
-        run: npx cap build android --keystorepath .keystore/keystore.jks --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
+        run: npx cap build android --keystorepath ./.keystore/keystore.jks --keystorepass ${{ secrets.ANDROID_KEYSTORE_PASS }} --androidreleasetype APK
         working-directory: mobile
+ 

desktop/forge.config.ts

@@ -5,7 +5,7 @@ import fs from "fs-extra";
 function moveModule(moduleList: string[], resourcePath: string) {
   moduleList.forEach((module) => {
     fs.moveSync(
-      path.join(resourcePath, module),
+      path.join("./node_modules", module),
       path.join(resourcePath, "app/node_modules", module)
     );
   });
@@ -20,7 +20,7 @@ const config: ForgeConfig = {
     icon: path.join(__dirname, "../shared-assets/icons/electron/pulse_editor"),
     // Copy the electron modules and the nextjs build to the electron build.
     extraResource: electronModules
-      .map((module) => `../node_modules/${module}`)
+      .map((module) => `./node_modules/${module}`)
       .concat("../build/next"),
     afterComplete: [
       (extractPath, electronVersion, platform, arch, done) => {
@@ -34,7 +34,6 @@ const config: ForgeConfig = {
             path.join(extractPath, "pulse-editor.app/Contents/Resources")
           );
         } else if (platform === "linux") {
-          moveModule(electronModules, path.join(extractPath, "resources"));
         }
 
         done();