fix: pass in platform to electron-rebuild (#8537)

Updates to latest electron-rebuild that allows passing in `platform` for
prebuilt node modules (previous versions of electron-rebuild had
hardcoded `process.platform`)

Fixes: #8528
#8426

Author: mmaietta

.changeset/dirty-clocks-rhyme.md

@@ -0,0 +1,6 @@
+---
+"app-builder-lib": patch
+"dmg-builder": patch
+---
+
+fix: pass in platform to electron-rebuild

packages/app-builder-lib/package.json

@@ -49,7 +49,7 @@
     "@develar/schema-utils": "~2.6.5",
     "@electron/notarize": "2.5.0",
     "@electron/osx-sign": "1.3.1",
-    "@electron/rebuild": "3.6.0",
+    "@electron/rebuild": "3.6.1",
     "@electron/universal": "2.0.1",
     "@malept/flatpak-bundler": "^0.4.0",
     "@types/fs-extra": "9.0.13",

packages/app-builder-lib/src/codeSign/windowsSignToolManager.ts

@@ -200,7 +200,7 @@ export class WindowsSignToolManager {
       }
       log.info(logInfo, "signing")
     } else if (!customSign) {
-      log.error({ signHook: customSign, cscInfo }, "no signing info identified, signing is skipped")
+      log.warn({ signHook: !!customSign, cscInfo }, "no signing info identified, signing is skipped")
       return false
     }
 

packages/app-builder-lib/src/util/yarn.ts

@@ -182,15 +182,16 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
     execPath: process.env.npm_execpath || process.env.NPM_CLI_JS,
     buildFromSource: options.buildFromSource === true,
   }
+  const { arch, buildFromSource, platform } = configuration
+
   if (config.nativeRebuilder === "legacy") {
-    const env = getGypEnv(options.frameworkInfo, configuration.platform, configuration.arch, options.buildFromSource === true)
+    const env = getGypEnv(options.frameworkInfo, platform, arch, buildFromSource)
     return executeAppBuilderAndWriteJson(["rebuild-node-modules"], configuration, { env, cwd: appDir })
   }
 
   const {
     frameworkInfo: { version: electronVersion },
   } = options
-  const { arch, buildFromSource } = configuration
   const logInfo = {
     electronVersion,
     arch,
@@ -203,9 +204,10 @@ export async function rebuild(config: Configuration, appDir: string, options: Re
     buildPath: appDir,
     electronVersion,
     arch,
+    platform,
+    buildFromSource,
     projectRootPath: await getProjectRootPath(appDir),
     mode: (config.nativeRebuilder as RebuildMode) || "sequential",
-    buildFromSource: buildFromSource,
     disablePreGypCopy: true,
   }
   return remoteRebuild(rebuildOptions)

packages/dmg-builder/src/hdiuil.ts

@@ -4,7 +4,7 @@ export async function hdiUtil(args: string[]) {
   return retry(
     () => exec("hdiutil", args),
     5,
-    1000,
+    5000,
     2000,
     0,
     (error: any) => {