Merge branch 'master' into nsis-kill-process

Author: mmaietta

.changeset/healthy-cats-train.md

@@ -0,0 +1,5 @@
+---
+"app-builder-lib": patch
+---
+
+fix: don't assume commands end with .cmd on Windows by leveraging `which` package

.changeset/little-bulldogs-thank.md

@@ -0,0 +1,5 @@
+---
+"dmg-builder": patch
+---
+
+chore: stabilize hdiutil resize by using whole number byte size

.changeset/long-poems-speak.md

@@ -12,8 +12,8 @@ jobs:
     steps:
       - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
         with:
-          stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 30 days.'
-          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days.'
+          stale-issue-message: 'This issue is stale because it has been open for 30 days with no activity. Remove stale label or comment, or this will be closed in 30 days.'
+          stale-pr-message: 'This PR is stale because it has been open for 30 days with no activity. Remove stale label or comment, or this will be closed in 30 days.'
           close-issue-message: 'This issue was closed because it has been stalled for 30 days with no activity.'
           days-before-stale: 30
           days-before-close: 30

.changeset/many-toys-yell.md

@@ -1,3 +1,16 @@
+# [](https://github.com/electron-userland/electron-builder/compare/v26.0.15...v) (2025-05-29)
+
+
+### Bug Fixes
+
+* allow custom electron zip name to be provided when unpacking a provided `electronDist` ([#9126](https://github.com/electron-userland/electron-builder/issues/9126)) ([9272cf3](https://github.com/electron-userland/electron-builder/commit/9272cf33a8e3b788979010706e9c564e954a2ee7))
+* **dmg:** `--force` unmount dmg using hdiutil after delay on Resource Lock (code 16) ([#9115](https://github.com/electron-userland/electron-builder/issues/9115)) ([9358b00](https://github.com/electron-userland/electron-builder/commit/9358b00b3985dd65a2c89b65a4c097653e9aebb2))
+* **docs:** Update README.md emoji rendering ([#9110](https://github.com/electron-userland/electron-builder/issues/9110)) ([b87b158](https://github.com/electron-userland/electron-builder/commit/b87b158c12d3a096e8e7b4883438a277633ca3c7))
+* **linux:** `productName` should be used as the default value when `executableName` is not set per docs ([#9068](https://github.com/electron-userland/electron-builder/issues/9068)) ([59fdaa9](https://github.com/electron-userland/electron-builder/commit/59fdaa9f3420f253c735690091169577112793b7))
+* **updater:** don't throw when determining which package manager to use ([#9113](https://github.com/electron-userland/electron-builder/issues/9113)) ([8ba9be4](https://github.com/electron-userland/electron-builder/commit/8ba9be481e3b777aa77884d265fd9b7f927a8a99))
+
+
+
 # [](https://github.com/electron-userland/electron-builder/compare/v26.0.14...v) (2025-05-04)
 
 

.changeset/nice-onions-yawn.md

@@ -1,5 +1,23 @@
 # app-builder-lib
 
+## 26.0.16
+
+### Patch Changes
+
+- [#9122](https://github.com/electron-userland/electron-builder/pull/9122) [`65de8564`](https://github.com/electron-userland/electron-builder/commit/65de8564f23536805b27ad36eec0b6574b682402) Thanks [@mmaietta](https://github.com/mmaietta)! - test: adding helper function to packageMetadata to accept a relative file:// uri dependency
+
+- [#9117](https://github.com/electron-userland/electron-builder/pull/9117) [`b62737d8`](https://github.com/electron-userland/electron-builder/commit/b62737d8c4528c04c78a490cc4dca8cdadbeaaac) Thanks [@talentlessguy](https://github.com/talentlessguy)! - chore(deps): replace `is-ci` with `ci-info`
+
+- [#9126](https://github.com/electron-userland/electron-builder/pull/9126) [`9272cf33`](https://github.com/electron-userland/electron-builder/commit/9272cf33a8e3b788979010706e9c564e954a2ee7) Thanks [@mmaietta](https://github.com/mmaietta)! - fix: allow custom electron zip name to be provided when unpacking a provided electronDist
+
+- [#9068](https://github.com/electron-userland/electron-builder/pull/9068) [`59fdaa9f`](https://github.com/electron-userland/electron-builder/commit/59fdaa9f3420f253c735690091169577112793b7) Thanks [@hbcraft](https://github.com/hbcraft)! - fix(linux): productName should be used as the default value when executableName is not set. (#8766)
+
+- Updated dependencies [[`b62737d8`](https://github.com/electron-userland/electron-builder/commit/b62737d8c4528c04c78a490cc4dca8cdadbeaaac), [`bacc6b44`](https://github.com/electron-userland/electron-builder/commit/bacc6b44cce1134d6d8ea1b605f0340a50095018), [`9358b00b`](https://github.com/electron-userland/electron-builder/commit/9358b00b3985dd65a2c89b65a4c097653e9aebb2)]:
+  - [email protected]
+  - [email protected]
+  - [email protected]
+  - [email protected]
+
 ## 26.0.15
 
 ### Patch Changes

.changeset/old-games-wait.md

@@ -1,7 +1,7 @@
 {
   "name": "app-builder-lib",
   "description": "electron-builder lib",
-  "version": "26.0.15",
+  "version": "26.0.16",
   "main": "out/index.js",
   "files": [
     "out",
@@ -78,7 +78,8 @@
     "semver": "^7.3.8",
     "tar": "^6.1.12",
     "temp-file": "^3.4.0",
-    "tiny-async-pool": "1.3.0"
+    "tiny-async-pool": "1.3.0",
+    "which": "^5.0.0"
   },
   "///": "babel in devDependencies for proton tests",
   "devDependencies": {
@@ -109,6 +110,7 @@
     "@types/semver": "7.3.8",
     "@types/tar": "^6.1.3",
     "@types/tiny-async-pool": "^1",
+    "@types/which": "^3.0.4",
     "dmg-builder": "workspace:*",
     "electron-builder-squirrel-windows": "workspace:*",
     "toml": "^3.0.0"

.changeset/silly-dolls-pretend.md

@@ -6,7 +6,7 @@ import { NodeModuleInfo } from "./types"
 import { exec } from "builder-util"
 
 async function isPnpmProjectHoisted(rootDir: string) {
-  const command = await PnpmNodeModulesCollector.pmCommand.value
+  const command = getPackageManagerCommand(PM.PNPM)
   const config = await exec(command, ["config", "list"], { cwd: rootDir, shell: true })
   const lines = Object.fromEntries(config.split("\n").map(line => line.split("=").map(s => s.trim())))
   return lines["node-linker"] === "hoisted"

.changeset/soft-pets-warn.md

@@ -3,7 +3,7 @@ import * as path from "path"
 import * as fs from "fs"
 import type { NodeModuleInfo, DependencyGraph, Dependency } from "./types"
 import { exec, log } from "builder-util"
-import { Lazy } from "lazy-val"
+import { getPackageManagerCommand, PM } from "./packageManager"
 
 export abstract class NodeModulesCollector<T extends Dependency<T, OptionalsType>, OptionalsType> {
   private nodeModules: NodeModuleInfo[] = []
@@ -24,19 +24,18 @@ export abstract class NodeModulesCollector<T extends Dependency<T, OptionalsType
     return this.nodeModules
   }
 
-  public abstract readonly installOptions: Promise<{
-    cmd: string
-    args: string[]
+  public abstract readonly installOptions: {
+    manager: PM
     lockfile: string
-  }>
-  protected abstract readonly pmCommand: Lazy<string>
+  }
+
   protected abstract getArgs(): string[]
   protected abstract parseDependenciesTree(jsonBlob: string): T
   protected abstract extractProductionDependencyGraph(tree: Dependency<T, OptionalsType>, dependencyId: string): void
   protected abstract collectAllDependencies(tree: Dependency<T, OptionalsType>): void
 
   protected async getDependenciesTree(): Promise<T> {
-    const command = await this.pmCommand.value
+    const command = getPackageManagerCommand(this.installOptions.manager)
     const args = this.getArgs()
     const dependencies = await exec(command, args, {
       cwd: this.rootDir,

.changeset/violet-zoos-speak.md

@@ -1,14 +1,13 @@
-import { Lazy } from "lazy-val"
 import { NodeModulesCollector } from "./nodeModulesCollector"
+import { PM } from "./packageManager"
 import { NpmDependency } from "./types"
 
 export class NpmNodeModulesCollector extends NodeModulesCollector<NpmDependency, string> {
   constructor(rootDir: string) {
     super(rootDir)
   }
 
-  public readonly pmCommand = new Lazy<string>(() => Promise.resolve(process.platform === "win32" ? "npm.cmd" : "npm"))
-  public readonly installOptions = this.pmCommand.value.then(cmd => ({ cmd, args: ["ci"], lockfile: "package-lock.json" }))
+  public readonly installOptions = { manager: PM.NPM, lockfile: "package-lock.json" }
 
   protected getArgs(): string[] {
     return ["list", "-a", "--include", "prod", "--include", "optional", "--omit", "dev", "--json", "--long", "--silent"]

.github/workflows/stale.yml

@@ -1,5 +1,6 @@
 import * as path from "path"
 import * as fs from "fs"
+import * as which from "which"
 
 export enum PM {
   NPM = "npm",
@@ -8,96 +9,77 @@ export enum PM {
   YARN_BERRY = "yarn-berry",
 }
 
-function detectPackageManagerByEnv(): PM {
-  if (process.env.npm_config_user_agent) {
-    const userAgent = process.env.npm_config_user_agent
-
-    if (userAgent.includes("pnpm")) {
-      return PM.PNPM
-    }
-
-    if (userAgent.includes("yarn")) {
-      if (userAgent.includes("yarn/")) {
-        const version = userAgent.match(/yarn\/(\d+)\./)
-        if (version && parseInt(version[1]) >= 2) {
-          return PM.YARN_BERRY
-        }
-      }
-      return PM.YARN
-    }
-
-    if (userAgent.includes("npm")) {
-      return PM.NPM
-    }
-  }
+// Cache for resolved paths
+const pmPathCache: Record<PM, string | null | undefined> = {
+  [PM.NPM]: undefined,
+  [PM.YARN]: undefined,
+  [PM.PNPM]: undefined,
+  [PM.YARN_BERRY]: undefined,
+}
 
-  if (process.env.npm_execpath) {
-    const execPath = process.env.npm_execpath.toLowerCase()
+function resolveCommand(pm: PM): string {
+  const fallback = pm === PM.YARN_BERRY ? "yarn" : pm
 
-    if (execPath.includes("pnpm")) {
-      return PM.PNPM
-    }
+  if (process.platform !== "win32") {
+    return fallback
+  }
 
-    if (execPath.includes("yarn")) {
-      if (execPath.includes("berry") || process.env.YARN_VERSION?.startsWith("2.") || process.env.YARN_VERSION?.startsWith("3.")) {
-        return PM.YARN_BERRY
-      }
-      return PM.YARN
-    }
+  try {
+    return path.basename(which.sync(fallback))
+  } catch {
+    // If `which` fails (not found), still return the fallback string
+    return fallback
+  }
+}
 
-    if (execPath.includes("npm")) {
-      return PM.NPM
-    }
+export function getPackageManagerCommand(pm: PM) {
+  if (pmPathCache[pm] !== undefined) {
+    return pmPathCache[pm]!
   }
 
-  if (process.env.PNPM_HOME) {
+  const resolved = resolveCommand(pm)
+  pmPathCache[pm] = resolved
+  return resolved
+}
+
+export function detectPackageManagerByEnv(): PM {
+  const ua = process.env.npm_config_user_agent ?? ""
+  const execPath = process.env.npm_execpath?.toLowerCase() ?? ""
+
+  const yarnVersion = process.env.YARN_VERSION
+  const isBerry = yarnVersion?.startsWith("2.") || yarnVersion?.startsWith("3.")
+
+  if (ua.includes("pnpm") || execPath.includes("pnpm") || process.env.PNPM_HOME) {
     return PM.PNPM
   }
 
-  if (process.env.YARN_REGISTRY) {
-    if (process.env.YARN_VERSION?.startsWith("2.") || process.env.YARN_VERSION?.startsWith("3.")) {
-      return PM.YARN_BERRY
-    }
-    return PM.YARN
+  if (ua.includes("yarn") || execPath.includes("yarn") || process.env.YARN_REGISTRY) {
+    return isBerry || ua.includes("yarn/2") || ua.includes("yarn/3") ? PM.YARN_BERRY : PM.YARN
   }
 
-  if (process.env.npm_package_json) {
+  if (ua.includes("npm") || execPath.includes("npm") || process.env.npm_package_json) {
     return PM.NPM
   }
 
-  // return default
   return PM.NPM
 }
 
-export function getPackageManagerCommand(pm: PM) {
-  let cmd = pm
-  if (pm === PM.YARN_BERRY || process.env.FORCE_YARN === "true") {
-    cmd = PM.YARN
-  }
-  return `${cmd}${process.platform === "win32" ? ".cmd" : ""}`
-}
+export function detectPackageManager(cwd: string): PM {
+  const has = (file: string) => fs.existsSync(path.join(cwd, file))
 
-export function detectPackageManager(cwd: string) {
-  const isYarnLockFileExists = fs.existsSync(path.join(cwd, "yarn.lock"))
-  const isPnpmLockFileExists = fs.existsSync(path.join(cwd, "pnpm-lock.yaml"))
-  const isNpmLockFileExists = fs.existsSync(path.join(cwd, "package-lock.json"))
-
-  if (isYarnLockFileExists && !isPnpmLockFileExists && !isNpmLockFileExists) {
-    // check if yarn is berry
-    const pm = detectPackageManagerByEnv()
-    if (pm === PM.YARN_BERRY) {
-      return PM.YARN_BERRY
-    }
-    return PM.YARN
-  }
+  const yarn = has("yarn.lock")
+  const pnpm = has("pnpm-lock.yaml")
+  const npm = has("package-lock.json")
 
-  if (isPnpmLockFileExists && !isYarnLockFileExists && !isNpmLockFileExists) {
-    return PM.PNPM
-  }
+  const detected: PM[] = []
+  if (yarn) detected.push(PM.YARN)
+  if (pnpm) detected.push(PM.PNPM)
+  if (npm) detected.push(PM.NPM)
 
-  if (isNpmLockFileExists && !isYarnLockFileExists && !isPnpmLockFileExists) {
-    return PM.NPM
+  if (detected.length === 1) {
+    return detected[0] === PM.YARN ? detectPackageManagerByEnv() : detected[0]
   }
-  // if there are no lock files or multiple lock files, return the package manager from env
+
+  // fallback: multiple lockfiles or none
   return detectPackageManagerByEnv()
 }

CHANGELOG.md

@@ -1,29 +1,16 @@
-import { Lazy } from "lazy-val"
-import { NodeModulesCollector } from "./nodeModulesCollector"
-import { PnpmDependency, Dependency } from "./types"
-import { exec, log } from "builder-util"
-import * as path from "path"
+import { log } from "builder-util"
 import * as fs from "fs"
+import * as path from "path"
+import { NodeModulesCollector } from "./nodeModulesCollector"
+import { PM } from "./packageManager"
+import { Dependency, PnpmDependency } from "./types"
 
 export class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {
   constructor(rootDir: string) {
     super(rootDir)
   }
 
-  static readonly pmCommand = new Lazy<string>(async () => {
-    if (process.platform === "win32") {
-      try {
-        await exec("pnpm", ["--version"])
-      } catch (_error: any) {
-        log.debug(null, "pnpm not detected, falling back to pnpm.cmd")
-        return "pnpm.cmd"
-      }
-    }
-    return "pnpm"
-  })
-
-  protected readonly pmCommand: Lazy<string> = PnpmNodeModulesCollector.pmCommand
-  public readonly installOptions = this.pmCommand.value.then(cmd => ({ cmd, args: ["install", "--frozen-lockfile"], lockfile: "pnpm-lock.yaml" }))
+  public readonly installOptions = { manager: PM.PNPM, lockfile: "pnpm-lock.yaml" }
 
   protected getArgs(): string[] {
     return ["list", "--prod", "--json", "--depth", "Infinity"]