app-builder-lib 26.0.15 → 26.0.17

package/out/node-module-collector/packageManager.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PM = void 0;
 exports.getPackageManagerCommand = getPackageManagerCommand;
+exports.detectPackageManagerByEnv = detectPackageManagerByEnv;
 exports.detectPackageManager = detectPackageManager;
 const path = require("path");
 const fs = require("fs");
+const which = require("which");
 var PM;
 (function (PM) {
     PM["NPM"] = "npm";
@@ -12,82 +14,67 @@ var PM;
     PM["PNPM"] = "pnpm";
     PM["YARN_BERRY"] = "yarn-berry";
 })(PM || (exports.PM = PM = {}));
-function detectPackageManagerByEnv() {
-    var _a, _b, _c, _d;
-    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;
-        }
-    }
-    if (process.env.npm_execpath) {
-        const execPath = process.env.npm_execpath.toLowerCase();
-        if (execPath.includes("pnpm")) {
-            return PM.PNPM;
-        }
-        if (execPath.includes("yarn")) {
-            if (execPath.includes("berry") || ((_a = process.env.YARN_VERSION) === null || _a === void 0 ? void 0 : _a.startsWith("2.")) || ((_b = process.env.YARN_VERSION) === null || _b === void 0 ? void 0 : _b.startsWith("3."))) {
-                return PM.YARN_BERRY;
-            }
-            return PM.YARN;
-        }
-        if (execPath.includes("npm")) {
-            return PM.NPM;
-        }
+// Cache for resolved paths
+const pmPathCache = {
+    [PM.NPM]: undefined,
+    [PM.YARN]: undefined,
+    [PM.PNPM]: undefined,
+    [PM.YARN_BERRY]: undefined,
+};
+function resolveCommand(pm) {
+    const fallback = pm === PM.YARN_BERRY ? "yarn" : pm;
+    if (process.platform !== "win32") {
+        return fallback;
     }
-    if (process.env.PNPM_HOME) {
-        return PM.PNPM;
+    try {
+        return path.basename(which.sync(fallback));
     }
-    if (process.env.YARN_REGISTRY) {
-        if (((_c = process.env.YARN_VERSION) === null || _c === void 0 ? void 0 : _c.startsWith("2.")) || ((_d = process.env.YARN_VERSION) === null || _d === void 0 ? void 0 : _d.startsWith("3."))) {
-            return PM.YARN_BERRY;
-        }
-        return PM.YARN;
+    catch {
+        // If `which` fails (not found), still return the fallback string
+        return fallback;
     }
-    if (process.env.npm_package_json) {
-        return PM.NPM;
-    }
-    // return default
-    return PM.NPM;
 }
 function getPackageManagerCommand(pm) {
-    let cmd = pm;
-    if (pm === PM.YARN_BERRY || process.env.FORCE_YARN === "true") {
-        cmd = PM.YARN;
+    if (pmPathCache[pm] !== undefined) {
+        return pmPathCache[pm];
     }
-    return `${cmd}${process.platform === "win32" ? ".cmd" : ""}`;
+    const resolved = resolveCommand(pm);
+    pmPathCache[pm] = resolved;
+    return resolved;
 }
-function detectPackageManager(cwd) {
-    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;
-    }
-    if (isPnpmLockFileExists && !isYarnLockFileExists && !isNpmLockFileExists) {
+function detectPackageManagerByEnv() {
+    var _a, _b, _c;
+    const ua = (_a = process.env.npm_config_user_agent) !== null && _a !== void 0 ? _a : "";
+    const execPath = (_c = (_b = process.env.npm_execpath) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : "";
+    const yarnVersion = process.env.YARN_VERSION;
+    const isBerry = (yarnVersion === null || yarnVersion === void 0 ? void 0 : yarnVersion.startsWith("2.")) || (yarnVersion === null || yarnVersion === void 0 ? void 0 : yarnVersion.startsWith("3."));
+    if (ua.includes("pnpm") || execPath.includes("pnpm") || process.env.PNPM_HOME) {
         return PM.PNPM;
     }
-    if (isNpmLockFileExists && !isYarnLockFileExists && !isPnpmLockFileExists) {
+    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 (ua.includes("npm") || execPath.includes("npm") || process.env.npm_package_json) {
         return PM.NPM;
     }
-    // if there are no lock files or multiple lock files, return the package manager from env
+    return PM.NPM;
+}
+function detectPackageManager(cwd) {
+    const has = (file) => fs.existsSync(path.join(cwd, file));
+    const yarn = has("yarn.lock");
+    const pnpm = has("pnpm-lock.yaml");
+    const npm = has("package-lock.json");
+    const detected = [];
+    if (yarn)
+        detected.push(PM.YARN);
+    if (pnpm)
+        detected.push(PM.PNPM);
+    if (npm)
+        detected.push(PM.NPM);
+    if (detected.length === 1) {
+        return detected[0] === PM.YARN ? detectPackageManagerByEnv() : detected[0];
+    }
+    // fallback: multiple lockfiles or none
     return detectPackageManagerByEnv();
 }
 //# sourceMappingURL=packageManager.js.map

package/out/node-module-collector/packageManager.js.map

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

package/out/node-module-collector/pnpmNodeModulesCollector.d.ts

@@ -1,15 +1,12 @@
-import { Lazy } from "lazy-val";
 import { NodeModulesCollector } from "./nodeModulesCollector";
+import { PM } from "./packageManager";
 import { PnpmDependency } from "./types";
 export declare class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {
     constructor(rootDir: string);
-    static readonly pmCommand: Lazy<string>;
-    protected readonly pmCommand: Lazy<string>;
-    readonly installOptions: Promise<{
-        cmd: string;
-        args: string[];
+    readonly installOptions: {
+        manager: PM;
         lockfile: string;
-    }>;
+    };
     protected getArgs(): string[];
     extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string): void;
     protected collectAllDependencies(tree: PnpmDependency): void;

package/out/node-module-collector/pnpmNodeModulesCollector.js

@@ -1,17 +1,15 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PnpmNodeModulesCollector = void 0;
-const lazy_val_1 = require("lazy-val");
-const nodeModulesCollector_1 = require("./nodeModulesCollector");
 const builder_util_1 = require("builder-util");
-const path = require("path");
 const fs = require("fs");
+const path = require("path");
+const nodeModulesCollector_1 = require("./nodeModulesCollector");
+const packageManager_1 = require("./packageManager");
 class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollector {
     constructor(rootDir) {
         super(rootDir);
-        this.pmCommand = _a.pmCommand;
-        this.installOptions = this.pmCommand.value.then(cmd => ({ cmd, args: ["install", "--frozen-lockfile"], lockfile: "pnpm-lock.yaml" }));
+        this.installOptions = { manager: packageManager_1.PM.PNPM, lockfile: "pnpm-lock.yaml" };
     }
     getArgs() {
         return ["list", "--prod", "--json", "--depth", "Infinity"];
@@ -64,17 +62,4 @@ class PnpmNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollect
     }
 }
 exports.PnpmNodeModulesCollector = PnpmNodeModulesCollector;
-_a = PnpmNodeModulesCollector;
-PnpmNodeModulesCollector.pmCommand = new lazy_val_1.Lazy(async () => {
-    if (process.platform === "win32") {
-        try {
-            await (0, builder_util_1.exec)("pnpm", ["--version"]);
-        }
-        catch (_error) {
-            builder_util_1.log.debug(null, "pnpm not detected, falling back to pnpm.cmd");
-            return "pnpm.cmd";
-        }
-    }
-    return "pnpm";
-});
 //# sourceMappingURL=pnpmNodeModulesCollector.js.map

package/out/node-module-collector/pnpmNodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":";;;;AAAA,uCAA+B;AAC/B,iEAA6D;AAE7D,+CAAwC;AACxC,6BAA4B;AAC5B,yBAAwB;AAExB,MAAa,wBAAyB,SAAQ,2CAAoD;IAChG,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QAeG,cAAS,GAAiB,EAAwB,CAAC,SAAS,CAAA;QAC/D,mBAAc,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC,CAAC,CAAA;IAfhJ,CAAC;IAiBS,OAAO;QACf,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IAC5D,CAAC;IAED,gCAAgC,CAAC,IAAoB,EAAE,YAAoB;QACzE,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YACvC,OAAM;QACR,CAAC;QAED,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;QACrD,MAAM,WAAW,GAA+B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;QACrF,MAAM,gBAAgB,GAAG,EAAE,GAAG,WAAW,CAAC,YAAY,EAAE,GAAG,WAAW,CAAC,oBAAoB,EAAE,CAAA;QAE7F,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,CAAA;QACnF,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,CAAA;QACzD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aACtC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE;YACpC,iDAAiD;YACjD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;gBACnC,OAAO,KAAK,CAAA;YACd,CAAC;YAED,gDAAgD;YAChD,IAAI,WAAW,CAAC,oBAAoB,IAAI,WAAW,CAAC,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACzH,kBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,WAAW,IAAI,UAAU,CAAC,OAAO,wBAAwB,UAAU,CAAC,IAAI,EAAE,CAAC,CAAA;gBAClH,OAAO,KAAK,CAAA;YACd,CAAC;YAED,OAAO,IAAI,CAAA;QACb,CAAC,CAAC;aACD,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE;YACjC,MAAM,iBAAiB,GAAG,GAAG,WAAW,IAAI,UAAU,CAAC,OAAO,EAAE,CAAA;YAChE,IAAI,CAAC,gCAAgC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;YACpE,OAAO,iBAAiB,CAAA;QAC1B,CAAC,CAAC,CAAA;QAEJ,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,CAAA;IACvD,CAAC;IAES,sBAAsB,CAAC,IAAoB;QACnD,+BAA+B;QAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;YACnE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;YAC1D,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;QAED,8CAA8C;QAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,EAAE,CAAC,EAAE,CAAC;YAC3E,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;YAC1D,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAES,qBAAqB,CAAC,QAAgB;QAC9C,MAAM,cAAc,GAAqB,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC7D,4CAA4C;QAC5C,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;;AA7EH,4DA8EC;;AAzEiB,kCAAS,GAAG,IAAI,eAAI,CAAS,KAAK,IAAI,EAAE;IACtD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,IAAA,mBAAI,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,CAAC,CAAA;QACnC,CAAC;QAAC,OAAO,MAAW,EAAE,CAAC;YACrB,kBAAG,CAAC,KAAK,CAAC,IAAI,EAAE,6CAA6C,CAAC,CAAA;YAC9D,OAAO,UAAU,CAAA;QACnB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAC,AAVuB,CAUvB","sourcesContent":["import { Lazy } from \"lazy-val\"\nimport { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { PnpmDependency, Dependency } from \"./types\"\nimport { exec, log } from \"builder-util\"\nimport * as path from \"path\"\nimport * as fs from \"fs\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  static readonly pmCommand = new Lazy<string>(async () => {\n    if (process.platform === \"win32\") {\n      try {\n        await exec(\"pnpm\", [\"--version\"])\n      } catch (_error: any) {\n        log.debug(null, \"pnpm not detected, falling back to pnpm.cmd\")\n        return \"pnpm.cmd\"\n      }\n    }\n    return \"pnpm\"\n  })\n\n  protected readonly pmCommand: Lazy<string> = PnpmNodeModulesCollector.pmCommand\n  public readonly installOptions = this.pmCommand.value.then(cmd => ({ cmd, args: [\"install\", \"--frozen-lockfile\"], lockfile: \"pnpm-lock.yaml\" }))\n\n  protected getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\"]\n  }\n\n  extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string): void {\n    if (this.productionGraph[dependencyId]) {\n      return\n    }\n\n    const p = path.normalize(this.resolvePath(tree.path))\n    const packageJson: Dependency<string, string> = require(path.join(p, \"package.json\"))\n    const prodDependencies = { ...packageJson.dependencies, ...packageJson.optionalDependencies }\n\n    const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }\n    this.productionGraph[dependencyId] = { dependencies: [] }\n    const dependencies = Object.entries(deps)\n      .filter(([packageName, dependency]) => {\n        // First check if it's in production dependencies\n        if (!prodDependencies[packageName]) {\n          return false\n        }\n\n        // Then check if optional dependency path exists\n        if (packageJson.optionalDependencies && packageJson.optionalDependencies[packageName] && !fs.existsSync(dependency.path)) {\n          log.debug(null, `Optional dependency ${packageName}@${dependency.version} path doesn't exist: ${dependency.path}`)\n          return false\n        }\n\n        return true\n      })\n      .map(([packageName, dependency]) => {\n        const childDependencyId = `${packageName}@${dependency.version}`\n        this.extractProductionDependencyGraph(dependency, childDependencyId)\n        return childDependencyId\n      })\n\n    this.productionGraph[dependencyId] = { dependencies }\n  }\n\n  protected collectAllDependencies(tree: PnpmDependency) {\n    // Collect regular dependencies\n    for (const [key, value] of Object.entries(tree.dependencies || {})) {\n      this.allDependencies.set(`${key}@${value.version}`, value)\n      this.collectAllDependencies(value)\n    }\n\n    // Collect optional dependencies if they exist\n    for (const [key, value] of Object.entries(tree.optionalDependencies || {})) {\n      this.allDependencies.set(`${key}@${value.version}`, value)\n      this.collectAllDependencies(value)\n    }\n  }\n\n  protected parseDependenciesTree(jsonBlob: string): PnpmDependency {\n    const dependencyTree: PnpmDependency[] = JSON.parse(jsonBlob)\n    // pnpm returns an array of dependency trees\n    return dependencyTree[0]\n  }\n}\n"]}
+{"version":3,"file":"pnpmNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/pnpmNodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { log } from \"builder-util\"\nimport * as fs from \"fs\"\nimport * as path from \"path\"\nimport { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { PM } from \"./packageManager\"\nimport { Dependency, PnpmDependency } from \"./types\"\n\nexport class PnpmNodeModulesCollector extends NodeModulesCollector<PnpmDependency, PnpmDependency> {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  public readonly installOptions = { manager: PM.PNPM, lockfile: \"pnpm-lock.yaml\" }\n\n  protected getArgs(): string[] {\n    return [\"list\", \"--prod\", \"--json\", \"--depth\", \"Infinity\"]\n  }\n\n  extractProductionDependencyGraph(tree: PnpmDependency, dependencyId: string): void {\n    if (this.productionGraph[dependencyId]) {\n      return\n    }\n\n    const p = path.normalize(this.resolvePath(tree.path))\n    const packageJson: Dependency<string, string> = require(path.join(p, \"package.json\"))\n    const prodDependencies = { ...packageJson.dependencies, ...packageJson.optionalDependencies }\n\n    const deps = { ...(tree.dependencies || {}), ...(tree.optionalDependencies || {}) }\n    this.productionGraph[dependencyId] = { dependencies: [] }\n    const dependencies = Object.entries(deps)\n      .filter(([packageName, dependency]) => {\n        // First check if it's in production dependencies\n        if (!prodDependencies[packageName]) {\n          return false\n        }\n\n        // Then check if optional dependency path exists\n        if (packageJson.optionalDependencies && packageJson.optionalDependencies[packageName] && !fs.existsSync(dependency.path)) {\n          log.debug(null, `Optional dependency ${packageName}@${dependency.version} path doesn't exist: ${dependency.path}`)\n          return false\n        }\n\n        return true\n      })\n      .map(([packageName, dependency]) => {\n        const childDependencyId = `${packageName}@${dependency.version}`\n        this.extractProductionDependencyGraph(dependency, childDependencyId)\n        return childDependencyId\n      })\n\n    this.productionGraph[dependencyId] = { dependencies }\n  }\n\n  protected collectAllDependencies(tree: PnpmDependency) {\n    // Collect regular dependencies\n    for (const [key, value] of Object.entries(tree.dependencies || {})) {\n      this.allDependencies.set(`${key}@${value.version}`, value)\n      this.collectAllDependencies(value)\n    }\n\n    // Collect optional dependencies if they exist\n    for (const [key, value] of Object.entries(tree.optionalDependencies || {})) {\n      this.allDependencies.set(`${key}@${value.version}`, value)\n      this.collectAllDependencies(value)\n    }\n  }\n\n  protected parseDependenciesTree(jsonBlob: string): PnpmDependency {\n    const dependencyTree: PnpmDependency[] = JSON.parse(jsonBlob)\n    // pnpm returns an array of dependency trees\n    return dependencyTree[0]\n  }\n}\n"]}

package/out/node-module-collector/yarnNodeModulesCollector.d.ts

@@ -1,9 +1,9 @@
 import { NpmNodeModulesCollector } from "./npmNodeModulesCollector";
+import { PM } from "./packageManager";
 export declare class YarnNodeModulesCollector extends NpmNodeModulesCollector {
     constructor(rootDir: string);
-    readonly installOptions: Promise<{
-        cmd: string;
-        args: string[];
+    readonly installOptions: {
+        manager: PM;
         lockfile: string;
-    }>;
+    };
 }

package/out/node-module-collector/yarnNodeModulesCollector.js

@@ -2,14 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YarnNodeModulesCollector = void 0;
 const npmNodeModulesCollector_1 = require("./npmNodeModulesCollector");
+const packageManager_1 = require("./packageManager");
 class YarnNodeModulesCollector extends npmNodeModulesCollector_1.NpmNodeModulesCollector {
     constructor(rootDir) {
         super(rootDir);
-        this.installOptions = Promise.resolve({
-            cmd: process.platform === "win32" ? "yarn.cmd" : "yarn",
-            args: ["install", "--frozen-lockfile"],
-            lockfile: "yarn.lock",
-        });
+        // note: do not override instance-var `pmCommand`. We explicitly use npm for the json payload
+        this.installOptions = { manager: packageManager_1.PM.YARN, lockfile: "yarn.lock" };
     }
 }
 exports.YarnNodeModulesCollector = YarnNodeModulesCollector;

package/out/node-module-collector/yarnNodeModulesCollector.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarnNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/yarnNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,uEAAmE;AAEnE,MAAa,wBAAyB,SAAQ,iDAAuB;IACnE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QAGA,mBAAc,GAAG,OAAO,CAAC,OAAO,CAAC;YAC/C,GAAG,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM;YACvD,IAAI,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC;YACtC,QAAQ,EAAE,WAAW;SACtB,CAAC,CAAA;IANF,CAAC;CAOF;AAVD,4DAUC","sourcesContent":["import { NpmNodeModulesCollector } from \"./npmNodeModulesCollector\"\n\nexport class YarnNodeModulesCollector extends NpmNodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  public readonly installOptions = Promise.resolve({\n    cmd: process.platform === \"win32\" ? \"yarn.cmd\" : \"yarn\",\n    args: [\"install\", \"--frozen-lockfile\"],\n    lockfile: \"yarn.lock\",\n  })\n}\n"]}
+{"version":3,"file":"yarnNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/yarnNodeModulesCollector.ts"],"names":[],"mappings":";;;AAAA,uEAAmE;AACnE,qDAAqC;AAErC,MAAa,wBAAyB,SAAQ,iDAAuB;IACnE,YAAY,OAAe;QACzB,KAAK,CAAC,OAAO,CAAC,CAAA;QAGhB,6FAA6F;QAC7E,mBAAc,GAAG,EAAE,OAAO,EAAE,mBAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;IAH5E,CAAC;CAIF;AAPD,4DAOC","sourcesContent":["import { NpmNodeModulesCollector } from \"./npmNodeModulesCollector\"\nimport { PM } from \"./packageManager\"\n\nexport class YarnNodeModulesCollector extends NpmNodeModulesCollector {\n  constructor(rootDir: string) {\n    super(rootDir)\n  }\n\n  // note: do not override instance-var `pmCommand`. We explicitly use npm for the json payload\n  public readonly installOptions = { manager: PM.YARN, lockfile: \"yarn.lock\" }\n}\n"]}

package/out/options/winOptions.d.ts

@@ -44,7 +44,10 @@ export interface WindowsConfiguration extends PlatformSpecificBuildOptions {
      */
     readonly requestedExecutionLevel?: RequestedExecutionLevel | null;
     /**
-     * Whether to sign and add metadata to executable. Advanced option.
+     * Whether to sign and add metadata to executable.
+     * Metadata includes information about the app name/description/version, publisher, copyright, etc.
+     * This property also is responsible for adding the app icon and setting execution level.
+     * (Advanced option leveraging `rcedit`)
      * @default true
      */
     readonly signAndEditExecutable?: boolean;

package/out/options/winOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"winOptions.js","sourceRoot":"","sources":["../../src/options/winOptions.ts"],"names":[],"mappings":"","sourcesContent":["import { Nullish } from \"builder-util-runtime\"\nimport { CustomWindowsSign } from \"../codeSign/windowsSignToolManager\"\nimport { PlatformSpecificBuildOptions, TargetConfigType } from \"../index\"\n\nexport interface WindowsConfiguration extends PlatformSpecificBuildOptions {\n  /**\n   * The target package type: list of `nsis`, `nsis-web` (Web installer), `portable` ([portable]./nsis.md#portable) app without installation), `appx`, `msi`, `msi-wrapped`, `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`.\n   * AppX package can be built only on Windows 10.\n   *\n   * To use Squirrel.Windows please install `electron-builder-squirrel-windows` dependency.\n   *\n   * @default nsis\n   */\n  readonly target?: TargetConfigType\n\n  /**\n   * The path to application icon.\n   * @default build/icon.ico\n   */\n  readonly icon?: string | null\n\n  /**\n   * The trademarks and registered trademarks.\n   */\n  readonly legalTrademarks?: string | null\n\n  /**\n   * Options for usage with signtool.exe\n   * Cannot be used in conjunction with `azureSignOptions`, signing will default to Azure Trusted Signing\n   */\n  readonly signtoolOptions?: WindowsSigntoolConfiguration | null\n\n  /**\n   * Options for usage of Azure Trusted Signing (beta)\n   * Cannot be used in conjunction with `signtoolOptions`, signing will default to Azure Trusted Signing\n   */\n  readonly azureSignOptions?: WindowsAzureSigningConfiguration | null\n\n  /**\n   * Whether to verify the signature of an available update before installation.\n   * The [publisher name](#publisherName) will be used for the signature verification.\n   *\n   * @default true\n   */\n  readonly verifyUpdateCodeSignature?: boolean\n\n  /**\n   * The [security level](https://msdn.microsoft.com/en-us/library/6ad1fshk.aspx#Anchor_9) at which the application requests to be executed.\n   * Cannot be specified per target, allowed only in the `win`.\n   * @default asInvoker\n   */\n  readonly requestedExecutionLevel?: RequestedExecutionLevel | null\n\n  /**\n   * Whether to sign and add metadata to executable. Advanced option.\n   * @default true\n   */\n  readonly signAndEditExecutable?: boolean\n\n  /**\n   * Explicit file extensions to also sign. Advanced option.\n   * @see https://github.com/electron-userland/electron-builder/issues/7329\n   * @default null\n   */\n  readonly signExts?: string[] | null\n}\n\nexport type RequestedExecutionLevel = \"asInvoker\" | \"highestAvailable\" | \"requireAdministrator\"\n\nexport interface WindowsSigntoolConfiguration {\n  /**\n   * The custom function (or path to file or module id) to sign Windows executables\n   */\n  readonly sign?: CustomWindowsSign | string | null\n\n  /**\n   * Array of signing algorithms used. For AppX `sha256` is always used.\n   * @default ['sha1', 'sha256']\n   */\n  readonly signingHashAlgorithms?: Array<\"sha1\" | \"sha256\"> | null\n\n  /**\n   * The path to the *.pfx certificate you want to sign with. Please use it only if you cannot use env variable `CSC_LINK` (`WIN_CSC_LINK`) for some reason.\n   * Please see [Code Signing](./code-signing.md).\n   */\n  readonly certificateFile?: string | null\n\n  /**\n   * The password to the certificate provided in `certificateFile`. Please use it only if you cannot use env variable `CSC_KEY_PASSWORD` (`WIN_CSC_KEY_PASSWORD`) for some reason.\n   * Please see [Code Signing](./code-signing.md).\n   */\n  readonly certificatePassword?: string | null\n\n  /**\n   * The name of the subject of the signing certificate, which is often labeled with the field name `issued to`. Required only for EV Code Signing and works only on Windows (or on macOS if [Parallels Desktop](https://www.parallels.com/products/desktop/) Windows 10 virtual machines exits).\n   */\n  readonly certificateSubjectName?: string | null\n\n  /**\n   * The SHA1 hash of the signing certificate. The SHA1 hash is commonly specified when multiple certificates satisfy the criteria specified by the remaining switches. Works only on Windows (or on macOS if [Parallels Desktop](https://www.parallels.com/products/desktop/) Windows 10 virtual machines exits).\n   */\n  readonly certificateSha1?: string | null\n\n  /**\n   * The path to an additional certificate file you want to add to the signature block.\n   */\n  readonly additionalCertificateFile?: string | null\n\n  /**\n   * The URL of the RFC 3161 time stamp server.\n   * @default http://timestamp.digicert.com\n   */\n  readonly rfc3161TimeStampServer?: string | null\n\n  /**\n   * The URL of the time stamp server.\n   * @default http://timestamp.digicert.com\n   */\n  readonly timeStampServer?: string | null\n\n  /**\n   * [The publisher name](https://github.com/electron-userland/electron-builder/issues/1187#issuecomment-278972073), exactly as in your code signed certificate. Several names can be provided.\n   * Defaults to common name from your code signing certificate.\n   */\n  readonly publisherName?: string | Array<string> | null\n}\n\n// https://learn.microsoft.com/en-us/azure/trusted-signing/how-to-signing-integrations\nexport interface WindowsAzureSigningConfiguration {\n  /**\n   * [The publisher name](https://github.com/electron-userland/electron-builder/issues/1187#issuecomment-278972073), exactly as in your code signed certificate. Several names can be provided.\n   */\n  readonly publisherName: string\n  /**\n   * The Trusted Signing Account endpoint. The URI value must have a URI that aligns to the\n   * region your Trusted Signing Account and Certificate Profile you are specifying were created\n   * in during the setup of these resources.\n   *\n   * Translates to field: Endpoint\n   *\n   * Requires one of environment variable configurations for authenticating to Microsoft Entra ID per [Microsoft's documentation](https://learn.microsoft.com/en-us/dotnet/api/azure.identity.environmentcredential?view=azure-dotnet#definition)\n   */\n  readonly endpoint: string\n  /**\n   * The Certificate Profile name. Translates to field: CertificateProfileName\n   */\n  readonly certificateProfileName: string\n  /**\n   * The Code Signing Signing Account name. Translates to field: CodeSigningAccountName\n   */\n  readonly codeSigningAccountName: string\n  /**\n   * The File Digest for signing each file. Translates to field: FileDigest\n   * @default SHA256\n   */\n  readonly fileDigest?: string\n  /**\n   * The Timestamp rfc3161 server. Translates to field: TimestampRfc3161\n   * @default http://timestamp.acs.microsoft.com\n   */\n  readonly timestampRfc3161?: string\n  /**\n   * The Timestamp Digest. Translates to field: TimestampDigest\n   * @default SHA256\n   */\n  readonly timestampDigest?: string\n  /**\n   * Allow other CLI parameters (verbatim case-sensitive) to `Invoke-TrustedSigning`\n   * Note: Key-Value pairs with `undefined`/`null` value are filtered out of the command.\n   */\n  [k: string]: string | Nullish\n}\n"]}
+{"version":3,"file":"winOptions.js","sourceRoot":"","sources":["../../src/options/winOptions.ts"],"names":[],"mappings":"","sourcesContent":["import { Nullish } from \"builder-util-runtime\"\nimport { CustomWindowsSign } from \"../codeSign/windowsSignToolManager\"\nimport { PlatformSpecificBuildOptions, TargetConfigType } from \"../index\"\n\nexport interface WindowsConfiguration extends PlatformSpecificBuildOptions {\n  /**\n   * The target package type: list of `nsis`, `nsis-web` (Web installer), `portable` ([portable]./nsis.md#portable) app without installation), `appx`, `msi`, `msi-wrapped`, `squirrel`, `7z`, `zip`, `tar.xz`, `tar.lz`, `tar.gz`, `tar.bz2`, `dir`.\n   * AppX package can be built only on Windows 10.\n   *\n   * To use Squirrel.Windows please install `electron-builder-squirrel-windows` dependency.\n   *\n   * @default nsis\n   */\n  readonly target?: TargetConfigType\n\n  /**\n   * The path to application icon.\n   * @default build/icon.ico\n   */\n  readonly icon?: string | null\n\n  /**\n   * The trademarks and registered trademarks.\n   */\n  readonly legalTrademarks?: string | null\n\n  /**\n   * Options for usage with signtool.exe\n   * Cannot be used in conjunction with `azureSignOptions`, signing will default to Azure Trusted Signing\n   */\n  readonly signtoolOptions?: WindowsSigntoolConfiguration | null\n\n  /**\n   * Options for usage of Azure Trusted Signing (beta)\n   * Cannot be used in conjunction with `signtoolOptions`, signing will default to Azure Trusted Signing\n   */\n  readonly azureSignOptions?: WindowsAzureSigningConfiguration | null\n\n  /**\n   * Whether to verify the signature of an available update before installation.\n   * The [publisher name](#publisherName) will be used for the signature verification.\n   *\n   * @default true\n   */\n  readonly verifyUpdateCodeSignature?: boolean\n\n  /**\n   * The [security level](https://msdn.microsoft.com/en-us/library/6ad1fshk.aspx#Anchor_9) at which the application requests to be executed.\n   * Cannot be specified per target, allowed only in the `win`.\n   * @default asInvoker\n   */\n  readonly requestedExecutionLevel?: RequestedExecutionLevel | null\n\n  /**\n   * Whether to sign and add metadata to executable.\n   * Metadata includes information about the app name/description/version, publisher, copyright, etc.\n   * This property also is responsible for adding the app icon and setting execution level.\n   * (Advanced option leveraging `rcedit`)\n   * @default true\n   */\n  readonly signAndEditExecutable?: boolean\n\n  /**\n   * Explicit file extensions to also sign. Advanced option.\n   * @see https://github.com/electron-userland/electron-builder/issues/7329\n   * @default null\n   */\n  readonly signExts?: string[] | null\n}\n\nexport type RequestedExecutionLevel = \"asInvoker\" | \"highestAvailable\" | \"requireAdministrator\"\n\nexport interface WindowsSigntoolConfiguration {\n  /**\n   * The custom function (or path to file or module id) to sign Windows executables\n   */\n  readonly sign?: CustomWindowsSign | string | null\n\n  /**\n   * Array of signing algorithms used. For AppX `sha256` is always used.\n   * @default ['sha1', 'sha256']\n   */\n  readonly signingHashAlgorithms?: Array<\"sha1\" | \"sha256\"> | null\n\n  /**\n   * The path to the *.pfx certificate you want to sign with. Please use it only if you cannot use env variable `CSC_LINK` (`WIN_CSC_LINK`) for some reason.\n   * Please see [Code Signing](./code-signing.md).\n   */\n  readonly certificateFile?: string | null\n\n  /**\n   * The password to the certificate provided in `certificateFile`. Please use it only if you cannot use env variable `CSC_KEY_PASSWORD` (`WIN_CSC_KEY_PASSWORD`) for some reason.\n   * Please see [Code Signing](./code-signing.md).\n   */\n  readonly certificatePassword?: string | null\n\n  /**\n   * The name of the subject of the signing certificate, which is often labeled with the field name `issued to`. Required only for EV Code Signing and works only on Windows (or on macOS if [Parallels Desktop](https://www.parallels.com/products/desktop/) Windows 10 virtual machines exits).\n   */\n  readonly certificateSubjectName?: string | null\n\n  /**\n   * The SHA1 hash of the signing certificate. The SHA1 hash is commonly specified when multiple certificates satisfy the criteria specified by the remaining switches. Works only on Windows (or on macOS if [Parallels Desktop](https://www.parallels.com/products/desktop/) Windows 10 virtual machines exits).\n   */\n  readonly certificateSha1?: string | null\n\n  /**\n   * The path to an additional certificate file you want to add to the signature block.\n   */\n  readonly additionalCertificateFile?: string | null\n\n  /**\n   * The URL of the RFC 3161 time stamp server.\n   * @default http://timestamp.digicert.com\n   */\n  readonly rfc3161TimeStampServer?: string | null\n\n  /**\n   * The URL of the time stamp server.\n   * @default http://timestamp.digicert.com\n   */\n  readonly timeStampServer?: string | null\n\n  /**\n   * [The publisher name](https://github.com/electron-userland/electron-builder/issues/1187#issuecomment-278972073), exactly as in your code signed certificate. Several names can be provided.\n   * Defaults to common name from your code signing certificate.\n   */\n  readonly publisherName?: string | Array<string> | null\n}\n\n// https://learn.microsoft.com/en-us/azure/trusted-signing/how-to-signing-integrations\nexport interface WindowsAzureSigningConfiguration {\n  /**\n   * [The publisher name](https://github.com/electron-userland/electron-builder/issues/1187#issuecomment-278972073), exactly as in your code signed certificate. Several names can be provided.\n   */\n  readonly publisherName: string\n  /**\n   * The Trusted Signing Account endpoint. The URI value must have a URI that aligns to the\n   * region your Trusted Signing Account and Certificate Profile you are specifying were created\n   * in during the setup of these resources.\n   *\n   * Translates to field: Endpoint\n   *\n   * Requires one of environment variable configurations for authenticating to Microsoft Entra ID per [Microsoft's documentation](https://learn.microsoft.com/en-us/dotnet/api/azure.identity.environmentcredential?view=azure-dotnet#definition)\n   */\n  readonly endpoint: string\n  /**\n   * The Certificate Profile name. Translates to field: CertificateProfileName\n   */\n  readonly certificateProfileName: string\n  /**\n   * The Code Signing Signing Account name. Translates to field: CodeSigningAccountName\n   */\n  readonly codeSigningAccountName: string\n  /**\n   * The File Digest for signing each file. Translates to field: FileDigest\n   * @default SHA256\n   */\n  readonly fileDigest?: string\n  /**\n   * The Timestamp rfc3161 server. Translates to field: TimestampRfc3161\n   * @default http://timestamp.acs.microsoft.com\n   */\n  readonly timestampRfc3161?: string\n  /**\n   * The Timestamp Digest. Translates to field: TimestampDigest\n   * @default SHA256\n   */\n  readonly timestampDigest?: string\n  /**\n   * Allow other CLI parameters (verbatim case-sensitive) to `Invoke-TrustedSigning`\n   * Note: Key-Value pairs with `undefined`/`null` value are filtered out of the command.\n   */\n  [k: string]: string | Nullish\n}\n"]}

package/out/packager.js

@@ -4,7 +4,7 @@ exports.Packager = void 0;
 const builder_util_1 = require("builder-util");
 const builder_util_runtime_1 = require("builder-util-runtime");
 const fs_extra_1 = require("fs-extra");
-const isCI = require("is-ci");
+const ci_info_1 = require("ci-info");
 const lazy_val_1 = require("lazy-val");
 const os_1 = require("os");
 const path = require("path");
@@ -295,7 +295,7 @@ class Packager {
         const commonOutDirWithoutPossibleOsMacro = path.resolve(this.projectDir, (0, macroExpander_1.expandMacro)(this.config.directories.output, null, this._appInfo, {
             os: "",
         }));
-        if (!isCI && process.stdout.isTTY) {
+        if (!ci_info_1.isCI && process.stdout.isTTY) {
             const effectiveConfigFile = path.join(commonOutDirWithoutPossibleOsMacro, "builder-effective-config.yaml");
             builder_util_1.log.info({ file: builder_util_1.log.filePath(effectiveConfigFile) }, "writing effective config");
             await (0, fs_extra_1.outputFile)(effectiveConfigFile, getSafeEffectiveConfig(this.config));