feat: add auto install env

Author: Maidang1

.DS_Store

@@ -31,13 +31,11 @@ jobs:
             npm_script: build:mac-arm64
             artifacts: |
               release/app/darwin-arm64/**/*.dmg
-              release/app/darwin-arm64/**/*.zip
           - os: macos-15-intel
             build_target: darwin-x64
             npm_script: build:mac-x64
             artifacts: |
               release/app/darwin-x64/**/*.dmg
-              release/app/darwin-x64/**/*.zip
           - os: windows-latest
             build_target: win32
             npm_script: build:win32

.github/workflows/build.yml

@@ -6,7 +6,17 @@ require("dotenv").config({
 });
 
 const buildEnv = process.env?.BUILD_ENV || "production"; // production, staging, development
-const buildTarget = process.env?.BUILD_TARGET || process.env?.ENV_FILE || "unknown";
+const buildTarget =
+  process.env?.BUILD_TARGET || process.env?.ENV_FILE || "unknown";
+
+// Determine which architectures to build based on BUILD_TARGET
+const getMacArch = () => {
+  if (buildTarget === "darwin-x64") return ["x64"];
+  if (buildTarget === "darwin-arm64") return ["arm64"];
+  // darwin (universal) or fallback: build both
+  return ["x64", "arm64"];
+};
+
 const dir = buildTarget + "/" + dayjs().format("YYYY_MM_DD_HH_mm_ss");
 const versionArr = version.split("-");
 const bundleShortVersion = versionArr[0];
@@ -15,7 +25,9 @@ const bundleVersion = versionArr[1] || versionArr[0];
 const productName = process.env?._PRODUCT_NAME ?? name;
 
 const getAppId = () => {
-  const baseId = process.env?._APP_ID || `com.yourcompany.${name.replace(/[^a-z0-9]/gi, '')}`;
+  const baseId =
+    process.env?._APP_ID ||
+    `com.yourcompany.${name.replace(/[^a-z0-9]/gi, "")}`;
   if (buildEnv === "development") return `${baseId}.dev`;
   if (buildEnv === "staging") return `${baseId}.staging`;
   return baseId;
@@ -39,56 +51,6 @@ const config = {
       to: "assets/icons",
     },
   ],
-  afterPack: async (context) => {
-    const fs = require('fs');
-    const path = require('path');
-    
-    // Electron Builder Arch: 0=ia32, 1=x64, 3=arm64
-    const archMap = {
-      0: 'ia32',
-      1: 'x64',
-      3: 'arm64'
-    };
-    
-    const archName = archMap[context.arch];
-    if (!archName) {
-       console.log(`[afterPack] Skipping unknown arch: ${context.arch}`);
-       return;
-    }
-    
-    const platform = context.electronPlatformName; // 'darwin', 'win32', 'linux'
-    const binaryName = platform === 'win32' ? 'node.exe' : 'node';
-    
-    // Source: resources/node_bin/<arch>/node
-    // Note: for ia32 we use 'ia32' folder, but download script uses 'ia32' too (mapped from x86 logic if I updated it correctly, let's check).
-    // In download script: if (arch === 'ia32') distArch = 'x86'; folderArch = 'ia32'. Yes.
-    
-    const sourceNode = path.resolve(__dirname, `./resources/node_bin/${archName}/${binaryName}`);
-    
-    if (!fs.existsSync(sourceNode)) {
-        console.warn(`[afterPack] Warning: Node binary not found at ${sourceNode}. Skipping copy.`);
-        return;
-    }
-
-    // Destination
-    let destNodeDir;
-    if (platform === 'darwin') {
-        destNodeDir = path.join(context.appOutDir, 'Contents/Resources/node_bin');
-    } else {
-        destNodeDir = path.join(context.appOutDir, 'resources/node_bin');
-    }
-    
-    if (!fs.existsSync(destNodeDir)) {
-        fs.mkdirSync(destNodeDir, { recursive: true });
-    }
-    
-    const destNode = path.join(destNodeDir, binaryName);
-    fs.copyFileSync(sourceNode, destNode);
-    if (platform !== 'win32') {
-        fs.chmodSync(destNode, 0o755);
-    }
-    console.log(`[afterPack] Copied ${archName} node binary to ${destNode}`);
-  },
   icon: resolve(__dirname, `./public/assets/icons/icon.icns`),
   asarUnpack: "**\\*.{node,dll}",
   mac: {
@@ -106,11 +68,11 @@ const config = {
     target: [
       {
         target: "dmg",
-        arch: ["x64", "arm64"],
+        arch: getMacArch(),
       },
       {
         target: "zip",
-        arch: ["x64", "arm64"],
+        arch: getMacArch(),
       },
     ],
   },

builder.js

@@ -22,7 +22,7 @@
     "rebuild:main": "pnpm run build:main && electron ./release/dist/main/index.js",
     "build:main": "rsbuild build --config ./builder/rsbuild.main.ts",
     "build:render": "rsbuild build --config ./builder/rsbuild.render.ts",
-    "postinstall": "node node_modules/electron/install.js && electron-builder install-app-deps && node scripts/download-node.js",
+    "postinstall": "node node_modules/electron/install.js && electron-builder install-app-deps",
     "icon": "electron-icon-builder -i=./public/assets/icons/icon.png -o=./public/assets/icons -f",
     "lint": "bun biome check --write ./src"
   },

package.json

@@ -118,7 +118,6 @@ const onBuilder = (platform) => {
   }
   const buildArch = resolveBuildArch(platform);
   const nodeEnv = ` BUILD_ARCH=${buildArch}`;
-  createSpawnBuilder(`${envPrefix}${nodeEnv} node`, ["scripts/download-node.js"]);
   createSpawnBuilder(`${envPrefix}${nodeEnv} pnpm`, ["run", "build:main"]);
   createSpawnBuilder(`${envPrefix}${nodeEnv} pnpm`, ["run", "build:render"]);
   createSpawnBuilder(`${envPrefix}${nodeEnv} electron-builder -c ./builder.js ${envSuffix}`);