From b75382f8b6802a9ca5a26bedccd1e58b8cdfeea4 Mon Sep 17 00:00:00 2001
From: Abdullah Atta <abdullahatta@streetwriters.co>
Date: Sat, 10 Jun 2023 12:51:54 +0500
Subject: [PATCH] ci: change entrypoint before build

---
 .github/workflows/desktop.publish.yml | 16 ++++++++--------
 apps/desktop/package.json             |  1 +
 apps/desktop/scripts/build.mjs        |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/desktop.publish.yml b/.github/workflows/desktop.publish.yml
index 90034176f..bc08c2d1f 100644
--- a/.github/workflows/desktop.publish.yml
+++ b/.github/workflows/desktop.publish.yml
@@ -126,7 +126,7 @@ jobs:
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
         run: |
           npx nx run release --project @notesnook/desktop -- --variant=mas
-          ./node_modules/.bin/electron-builder --mac mas --universal -p never
+          npm run builder -- --mac mas --universal -p never
         working-directory: ./apps/desktop
 
       - name: Build zip and dmg
@@ -140,9 +140,9 @@ jobs:
         run: |
           npx nx run release --project @notesnook/desktop
           if [ ${{ inputs.publish-github }} == true ]; then
-            ./node_modules/.bin/electron-builder --mac zip dmg --arm64 --x64 -p always
+            npm run builder -- --mac zip dmg --arm64 --x64 -p always
           else
-            ./node_modules/.bin/electron-builder --mac zip dmg --arm64 --x64 -p never
+            npm run builder -- --mac zip dmg --arm64 --x64 -p never
           fi
         working-directory: ./apps/desktop
 
@@ -197,7 +197,7 @@ jobs:
       - name: Build snap
         if: inputs.publish-snap
         run: |
-          ./node_modules/.bin/electron-builder --linux snap:x64 -p never
+          npm run builder -- --linux snap:x64 -p never
         working-directory: ./apps/desktop
 
       - name: Build AppImage
@@ -205,9 +205,9 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if [ ${{ inputs.publish-github }} == true ]; then
-            ./node_modules/.bin/electron-builder --linux AppImage:x64 AppImage:arm64 -p always
+            npm run builder -- --linux AppImage:x64 AppImage:arm64 -p always
           else
-            ./node_modules/.bin/electron-builder --linux AppImage:x64 AppImage:arm64 -p never
+            npm run builder -- --linux AppImage:x64 AppImage:arm64 -p never
           fi
         working-directory: ./apps/desktop
 
@@ -249,8 +249,8 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           if ($${{ inputs.publish-github }} -eq $true) {
-            ./node_modules/.bin/electron-builder --win --publish always
+            npm run builder -- --win --publish always
           } else {
-            ./node_modules/.bin/electron-builder --win --publish never
+            npm run builder -- --win --publish never
           }
         working-directory: ./apps/desktop
\ No newline at end of file
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 02642a834..b79aa640d 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -42,6 +42,7 @@
     "build": "tsc",
     "bundle": "esbuild electron=./src/main.ts ./src/preload.ts --external:electron --external:fsevents --minify --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=false --define:RELEASE=true",
     "bundle:mas": "esbuild electron=./src/main.ts ./src/preload.ts --minify --external:electron --external:fsevents --bundle --outdir=./build --platform=node --tsconfig=tsconfig.json --define:MAC_APP_STORE=true --define:RELEASE=true",
+    "builder": "./node_modules/.bin/electron-builder -c.extraMetadata.main=./build/electron.js",
     "postinstall": "patch-package"
   },
   "author": {
diff --git a/apps/desktop/scripts/build.mjs b/apps/desktop/scripts/build.mjs
index 9607f01a5..c8a1db566 100644
--- a/apps/desktop/scripts/build.mjs
+++ b/apps/desktop/scripts/build.mjs
@@ -66,7 +66,7 @@ await fs.cp(
 );
 
 if (argv.run) {
-  await $`yarn electron-builder -c.extraMetadata.main=./build/electron.js --linux AppImage:x64`;
+  await $`npm run builder -- --linux AppImage:x64`;
 
   await $`./output/notesnook_linux_x86_64.AppImage`;
 }