use detect

packages/app-builder-lib/package.json

@@ -78,7 +78,7 @@
     "semver": "^7.3.8",
     "tar": "^6.1.12",
     "temp-file": "^3.4.0",
-    "node-module-collector": "1.1.2"
+    "node-module-collector": "1.1.3"
   },
   "///": "babel in devDependencies for proton tests",
   "devDependencies": {

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

@@ -10,6 +10,7 @@ import { getProjectRootPath } from "@electron/rebuild/lib/search-module"
 import { rebuild as remoteRebuild } from "./rebuild/rebuild"
 import { executeAppBuilderAndWriteJson } from "./appBuilder"
 import { RebuildMode } from "@electron/rebuild/lib/types"
+import { PM, detect, getNpmVersion } from "node-module-collector"
 
 export async function installOrRebuild(config: Configuration, appDir: string, options: RebuildOptions, forceInstall = false) {
   const effectiveOptions: RebuildOptions = {
@@ -78,13 +79,16 @@ export function getGypEnv(frameworkInfo: DesktopFrameworkInfo, platform: NodeJS.
   }
 }
 
-function checkYarnBerry() {
-  const npmUserAgent = process.env["npm_config_user_agent"] || ""
-  const regex = /yarn\/(\d+)\./gm
+async function checkYarnBerry(pm:PM) {
+  if (pm !== "yarn") {
+    return false
+  }
+  const version = await getNpmVersion(pm)
+  if (version == null || version.split('.').length < 1) {
+    return false
+  }
 
-  const yarnVersionMatch = regex.exec(npmUserAgent)
-  const yarnMajorVersion = Number(yarnVersionMatch?.[1] ?? 0)
-  return yarnMajorVersion >= 2
+  return version.split('.')[0] >= "2"
 }
 
 async function installDependencies(config: Configuration, appDir: string, options: RebuildOptions): Promise<any> {
@@ -93,26 +97,21 @@ async function installDependencies(config: Configuration, appDir: string, option
   const additionalArgs = options.additionalArgs
 
   log.info({ platform, arch, appDir }, `installing production dependencies`)
-  let execPath = process.env.npm_execpath || process.env.NPM_CLI_JS
+  const pm = await detect({ cwd: appDir })
   const execArgs = ["install"]
-  const isYarnBerry = checkYarnBerry()
+  const isYarnBerry = checkYarnBerry(pm)
   if (!isYarnBerry) {
     if (process.env.NPM_NO_BIN_LINKS === "true") {
       execArgs.push("--no-bin-links")
     }
     execArgs.push("--production")
   }
 
-  if (!isRunningYarn(execPath)) {
+  if (!isRunningYarn(pm)) {
     execArgs.push("--prefer-offline")
   }
 
-  if (execPath == null) {
-    execPath = getPackageToolPath()
-  } else if (!isYarnBerry) {
-    execArgs.unshift(execPath)
-    execPath = process.env.npm_node_execpath || process.env.NODE_EXE || "node"
-  }
+  const execPath = getPackageToolPath(pm)
 
   if (additionalArgs != null) {
     execArgs.push(...additionalArgs)
@@ -146,17 +145,26 @@ export async function nodeGypRebuild(platform: NodeJS.Platform, arch: string, fr
   await spawn(nodeGyp, args, { env: getGypEnv(frameworkInfo, platform, arch, true) })
 }
 
-function getPackageToolPath() {
+function getPackageToolPath(pm: PM) {
   if (process.env.FORCE_YARN === "true") {
     return process.platform === "win32" ? "yarn.cmd" : "yarn"
-  } else {
-    return process.platform === "win32" ? "npm.cmd" : "npm"
+  }  
+
+  switch(pm) {
+    case "yarn":
+      return process.platform === "win32" ? "yarn.cmd" : "yarn"
+    case "pnpm":
+      return process.platform === "win32" ? "pnpm.cmd" : "pnpm"
+    case "npm":
+      return process.platform === "win32" ? "npm.cmd" : "npm"
+    default:
+      return process.platform === "win32" ? "npm.cmd" : "npm"
   }
 }
 
-function isRunningYarn(execPath: string | null | undefined) {
+function isRunningYarn(pm: PM) {
   const userAgent = process.env.npm_config_user_agent
-  return process.env.FORCE_YARN === "true" || (execPath != null && path.basename(execPath).startsWith("yarn")) || (userAgent != null && /\byarn\b/.test(userAgent))
+  return process.env.FORCE_YARN === "true" || pm === "yarn" || (userAgent != null && /\byarn\b/.test(userAgent))
 }
 
 export interface RebuildOptions {