app-builder-lib 26.2.0 → 26.3.0

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

@@ -1,14 +1,243 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YarnNodeModulesCollector = void 0;
-const npmNodeModulesCollector_1 = require("./npmNodeModulesCollector");
+const builder_util_1 = require("builder-util");
+const lazy_val_1 = require("lazy-val");
+const path = require("path");
+const nodeModulesCollector_1 = require("./nodeModulesCollector");
 const packageManager_1 = require("./packageManager");
-class YarnNodeModulesCollector extends npmNodeModulesCollector_1.NpmNodeModulesCollector {
+class YarnNodeModulesCollector extends nodeModulesCollector_1.NodeModulesCollector {
     constructor() {
         super(...arguments);
-        // note: do not override instance-var `pmCommand`. We explicitly use npm for the json payload
-        // yarn list cannot get the detailed dependencies path info, But we can use npm to get all dependencies path info
-        this.installOptions = { manager: packageManager_1.PM.NPM, lockfile: "yarn.lock" };
+        this.installOptions = {
+            manager: packageManager_1.PM.YARN,
+            lockfile: "yarn.lock",
+        };
+        this.isHoisted = new lazy_val_1.Lazy(async () => {
+            return Promise.resolve(true); // Yarn Classic always hoists
+        });
+    }
+    getArgs() {
+        return ["list", "--production", "--json", "--depth=Infinity", "--no-progress"];
+    }
+    async getTreeFromWorkspaces(tree) {
+        var _a;
+        if (!tree.workspaces || !tree.dependencies) {
+            return tree;
+        }
+        const appName = this.packageVersionString(tree);
+        if ((_a = tree.dependencies) === null || _a === void 0 ? void 0 : _a[appName]) {
+            const { name, path } = tree.dependencies[appName];
+            builder_util_1.log.debug({ name, path }, "pruning root app/self package from workspace tree");
+            delete tree.dependencies[appName];
+        }
+        return Promise.resolve(tree);
+    }
+    async extractProductionDependencyGraph(tree, dependencyId) {
+        if (this.productionGraph[dependencyId]) {
+            return;
+        }
+        const productionDeps = Object.entries(tree.dependencies || {}).map(async ([, dependency]) => {
+            const dep = {
+                ...dependency,
+                path: await this.resolvePath(dependency.path),
+            };
+            const childDependencyId = this.packageVersionString(dep);
+            await this.extractProductionDependencyGraph(dep, childDependencyId);
+            return childDependencyId;
+        });
+        this.productionGraph[dependencyId] = { dependencies: await Promise.all(productionDeps) };
+    }
+    getDependencyType(pkgName, parentPkgJson) {
+        var _a, _b, _c;
+        if ((_a = parentPkgJson.optionalDependencies) === null || _a === void 0 ? void 0 : _a[pkgName]) {
+            return "optional";
+        }
+        if ((_b = parentPkgJson.devDependencies) === null || _b === void 0 ? void 0 : _b[pkgName]) {
+            return "dev";
+        }
+        if ((_c = parentPkgJson.dependencies) === null || _c === void 0 ? void 0 : _c[pkgName]) {
+            return "prod";
+        }
+        return "prod";
+    }
+    async parseDependenciesTree(jsonBlob) {
+        const lines = jsonBlob
+            .split("\n")
+            .map(l => l.trim())
+            .filter(Boolean)
+            .map(l => {
+            try {
+                return JSON.parse(l);
+            }
+            catch {
+                return undefined;
+            }
+        })
+            .filter(Boolean);
+        const parsedTree = lines
+            .filter(l => l.type === "tree")
+            .map(l => l.data.trees)
+            .shift();
+        if (!parsedTree) {
+            throw new Error('Failed to extract Yarn tree: no "type":"tree" line found in console output');
+        }
+        const normalizedTree = await this.normalizeTree(parsedTree, new Set(), undefined);
+        const dependencies = {};
+        for (const [name, dep] of Object.entries(normalizedTree)) {
+            dependencies[name] = dep;
+        }
+        const rootPkgJson = await this.appPkgJson.value;
+        return Promise.resolve({
+            name: (rootPkgJson === null || rootPkgJson === void 0 ? void 0 : rootPkgJson.name) || ".",
+            version: (rootPkgJson === null || rootPkgJson === void 0 ? void 0 : rootPkgJson.version) || "unknown",
+            path: this.rootDir,
+            dependencies,
+            workspaces: rootPkgJson === null || rootPkgJson === void 0 ? void 0 : rootPkgJson.workspaces,
+        });
+    }
+    async normalizeTree(tree, seen = new Set(), appName) {
+        const normalized = {};
+        for (const node of tree) {
+            const match = node.name.match(/^(.*)@([^@]+)$/);
+            if (!match) {
+                builder_util_1.log.debug({ name: node.name }, "invalid node name format");
+                continue;
+            }
+            const [, pkgName, version] = match;
+            const id = `${pkgName}@${version}`;
+            const isShadow = node.shadow && node.color === "dim";
+            if (isShadow) {
+                builder_util_1.log.debug({ pkgName, version }, "skipping shadow node");
+                continue;
+            }
+            if (seen.has(id)) {
+                continue;
+            }
+            seen.add(id);
+            // Build the expected path - yarn classic hoists to root node_modules
+            const pkgPath = path.join(this.rootDir, "node_modules", pkgName);
+            const normalizedDep = {
+                name: pkgName,
+                version,
+                path: pkgPath, // Will be resolved later in collectAllDependencies
+                dependencies: {},
+                optionalDependencies: {},
+            };
+            builder_util_1.log.debug({ name: pkgName, version }, "+ normalize");
+            if (node.children && node.children.length > 0) {
+                for (const child of node.children) {
+                    const childMatch = child.name.match(/^(.*)@([^@]+)$/);
+                    if (!childMatch) {
+                        continue;
+                    }
+                    const [, childName, childVersion] = childMatch;
+                    if (child.shadow && child.color === "dim") {
+                        continue;
+                    }
+                    builder_util_1.log.debug({ parent: pkgName, childName, childVersion }, "  + normalize child");
+                    const childDeps = await this.normalizeTree([child], seen, appName);
+                    for (const [childDepName, childDep] of Object.entries(childDeps)) {
+                        normalizedDep.dependencies[childDepName] = childDep;
+                    }
+                }
+            }
+            normalized[pkgName] = normalizedDep;
+        }
+        return normalized;
+    }
+    async collectAllDependencies(tree, packageToExclude) {
+        const rootPkgJson = await this.appPkgJson.value;
+        const failedPackages = new Set();
+        builder_util_1.log.debug({ packageToExclude, hasWorkspaces: !!tree.workspaces }, "collectAllDependencies starting");
+        const collect = async (deps = {}, isOptionalDependency, parentIsOptional = false) => {
+            var _a, _b, _c, _d;
+            for (const [, value] of Object.entries(deps)) {
+                // Skip the app package if provided
+                if (packageToExclude && value.name === packageToExclude) {
+                    builder_util_1.log.debug({ name: value.name }, "skipping app package in collectAllDependencies");
+                    continue;
+                }
+                const isRootOptional = !!((_a = rootPkgJson.optionalDependencies) === null || _a === void 0 ? void 0 : _a[value.name]);
+                const isDirectRootDep = ((_b = rootPkgJson.dependencies) === null || _b === void 0 ? void 0 : _b[value.name]) || ((_c = rootPkgJson.optionalDependencies) === null || _c === void 0 ? void 0 : _c[value.name]) || ((_d = rootPkgJson.devDependencies) === null || _d === void 0 ? void 0 : _d[value.name]);
+                const treatAsOptional = isOptionalDependency || parentIsOptional || isRootOptional;
+                let p;
+                try {
+                    p = await this.resolvePath(value.path);
+                }
+                catch (e) {
+                    if (treatAsOptional) {
+                        builder_util_1.log.debug({ pkg: this.cacheKey(value), name: value.name }, "failed to resolve optional dependency, skipping");
+                        failedPackages.add(value.name);
+                        continue;
+                    }
+                    if (!isDirectRootDep) {
+                        builder_util_1.log.debug({ pkg: this.cacheKey(value), name: value.name }, "failed to resolve transitive dependency, treating as optional");
+                        failedPackages.add(value.name);
+                        continue;
+                    }
+                    builder_util_1.log.error({ pkg: this.cacheKey(value) }, "failed to resolve module directory");
+                    throw e;
+                }
+                if (!p) {
+                    builder_util_1.log.debug({ pkg: this.cacheKey(value), name: value.name }, "optional dependency not found, skipping");
+                    failedPackages.add(value.name);
+                    continue;
+                }
+                let resolvedVersion = value.version;
+                const versionMatch = p.match(/[/\\]node_modules[/\\][^@]+@([^/\\]+)[/\\]/);
+                if (versionMatch) {
+                    resolvedVersion = versionMatch[1];
+                    if (resolvedVersion !== value.version) {
+                        builder_util_1.log.debug({ name: value.name, declared: value.version, resolved: resolvedVersion }, "resolved actual version from path");
+                    }
+                }
+                const m = {
+                    ...value,
+                    version: resolvedVersion,
+                    path: p,
+                };
+                const moduleKey = this.packageVersionString(m);
+                if (this.allDependencies.has(moduleKey)) {
+                    continue;
+                }
+                this.allDependencies.set(moduleKey, m);
+                const childIsOptional = treatAsOptional;
+                await collect(m.dependencies, false, childIsOptional);
+                await collect(m.optionalDependencies, true, true);
+            }
+        };
+        await collect(tree.dependencies, false, false);
+        await collect(tree.optionalDependencies, true, true);
+        // Final cleanup: remove the app package from allDependencies
+        if (packageToExclude) {
+            for (const [key, dep] of this.allDependencies.entries()) {
+                if (dep.name === packageToExclude) {
+                    builder_util_1.log.debug({ key, name: dep.name }, "removing app package from allDependencies");
+                    this.allDependencies.delete(key);
+                }
+            }
+        }
+        if (failedPackages.size > 0) {
+            const cleanDependencies = (deps = {}) => {
+                for (const [key, dep] of Object.entries(deps)) {
+                    if (failedPackages.has(dep.name)) {
+                        builder_util_1.log.debug({ name: dep.name }, "removing failed package from tree");
+                        delete deps[key];
+                    }
+                    else {
+                        if (dep.dependencies) {
+                            cleanDependencies(dep.dependencies);
+                        }
+                        if (dep.optionalDependencies) {
+                            cleanDependencies(dep.optionalDependencies);
+                        }
+                    }
+                }
+            };
+            cleanDependencies(tree.dependencies);
+            cleanDependencies(tree.optionalDependencies);
+        }
     }
 }
 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;AACnE,qDAAqC;AAErC,MAAa,wBAAyB,SAAQ,iDAAuB;IAArE;;QACE,6FAA6F;QAC7F,iHAAiH;QACjG,mBAAc,GAAG,EAAE,OAAO,EAAE,mBAAE,CAAC,GAAG,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAA;IAC7E,CAAC;CAAA;AAJD,4DAIC","sourcesContent":["import { NpmNodeModulesCollector } from \"./npmNodeModulesCollector\"\nimport { PM } from \"./packageManager\"\n\nexport class YarnNodeModulesCollector extends NpmNodeModulesCollector {\n  // note: do not override instance-var `pmCommand`. We explicitly use npm for the json payload\n  // yarn list cannot get the detailed dependencies path info, But we can use npm to get all dependencies path info\n  public readonly installOptions = { manager: PM.NPM, lockfile: \"yarn.lock\" }\n}\n"]}
+{"version":3,"file":"yarnNodeModulesCollector.js","sourceRoot":"","sources":["../../src/node-module-collector/yarnNodeModulesCollector.ts"],"names":[],"mappings":"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","sourcesContent":["import { log } from \"builder-util\"\nimport { Lazy } from \"lazy-val\"\nimport * as path from \"path\"\nimport { NodeModulesCollector } from \"./nodeModulesCollector\"\nimport { PM } from \"./packageManager\"\nimport { PackageJson, YarnDependency } from \"./types\"\n\ntype YarnListJsonLine =\n  | {\n      type: \"tree\"\n      data: {\n        type: \"list\"\n        trees: YarnListTree[]\n      }\n    }\n  | {\n      type: \"info\" | \"warning\" | \"error\"\n      data: string\n    }\n\ninterface YarnListTree {\n  name: string // e.g. \"lodash@4.17.21\"\n  children: YarnListTree[]\n  shadow?: boolean\n  color?: string\n  hint?: any\n  depth?: number\n}\n\nexport class YarnNodeModulesCollector extends NodeModulesCollector<YarnDependency, YarnDependency> {\n  public readonly installOptions = {\n    manager: PM.YARN,\n    lockfile: \"yarn.lock\",\n  }\n\n  protected isHoisted: Lazy<boolean> = new Lazy<boolean>(async () => {\n    return Promise.resolve(true) // Yarn Classic always hoists\n  })\n\n  protected getArgs(): string[] {\n    return [\"list\", \"--production\", \"--json\", \"--depth=Infinity\", \"--no-progress\"]\n  }\n\n  protected async getTreeFromWorkspaces(tree: YarnDependency): Promise<YarnDependency> {\n    if (!tree.workspaces || !tree.dependencies) {\n      return tree\n    }\n\n    const appName = this.packageVersionString(tree)\n\n    if (tree.dependencies?.[appName]) {\n      const { name, path } = tree.dependencies[appName]\n      log.debug({ name, path }, \"pruning root app/self package from workspace tree\")\n      delete tree.dependencies[appName]\n    }\n    return Promise.resolve(tree)\n  }\n\n  protected async extractProductionDependencyGraph(tree: YarnDependency, dependencyId: string): Promise<void> {\n    if (this.productionGraph[dependencyId]) {\n      return\n    }\n\n    const productionDeps = Object.entries(tree.dependencies || {}).map(async ([, dependency]) => {\n      const dep = {\n        ...dependency,\n        path: await this.resolvePath(dependency.path),\n      }\n\n      const childDependencyId = this.packageVersionString(dep)\n      await this.extractProductionDependencyGraph(dep, childDependencyId)\n      return childDependencyId\n    })\n\n    this.productionGraph[dependencyId] = { dependencies: await Promise.all(productionDeps) }\n  }\n\n  protected getDependencyType(pkgName: string, parentPkgJson: PackageJson): \"prod\" | \"dev\" | \"optional\" {\n    if (parentPkgJson.optionalDependencies?.[pkgName]) {\n      return \"optional\"\n    }\n\n    if (parentPkgJson.devDependencies?.[pkgName]) {\n      return \"dev\"\n    }\n\n    if (parentPkgJson.dependencies?.[pkgName]) {\n      return \"prod\"\n    }\n\n    return \"prod\"\n  }\n\n  protected async parseDependenciesTree(jsonBlob: string): Promise<YarnDependency> {\n    const lines = jsonBlob\n      .split(\"\\n\")\n      .map(l => l.trim())\n      .filter(Boolean)\n      .map(l => {\n        try {\n          return JSON.parse(l)\n        } catch {\n          return undefined\n        }\n      })\n      .filter(Boolean) as YarnListJsonLine[]\n\n    const parsedTree: YarnListTree[] | undefined = lines\n      .filter(l => l.type === \"tree\")\n      .map(l => (l.data as any).trees)\n      .shift()\n\n    if (!parsedTree) {\n      throw new Error('Failed to extract Yarn tree: no \"type\":\"tree\" line found in console output')\n    }\n\n    const normalizedTree = await this.normalizeTree(parsedTree, new Set<string>(), undefined)\n\n    const dependencies: Record<string, YarnDependency> = {}\n    for (const [name, dep] of Object.entries(normalizedTree)) {\n      dependencies[name] = dep\n    }\n\n    const rootPkgJson = await this.appPkgJson.value\n    return Promise.resolve({\n      name: rootPkgJson?.name || \".\",\n      version: rootPkgJson?.version || \"unknown\",\n      path: this.rootDir,\n      dependencies,\n      workspaces: rootPkgJson?.workspaces,\n    })\n  }\n\n  private async normalizeTree(tree: YarnListTree[], seen = new Set<string>(), appName?: string): Promise<Record<string, YarnDependency>> {\n    const normalized: Record<string, YarnDependency> = {}\n\n    for (const node of tree) {\n      const match = node.name.match(/^(.*)@([^@]+)$/)\n      if (!match) {\n        log.debug({ name: node.name }, \"invalid node name format\")\n        continue\n      }\n\n      const [, pkgName, version] = match\n      const id = `${pkgName}@${version}`\n\n      const isShadow = node.shadow && node.color === \"dim\"\n      if (isShadow) {\n        log.debug({ pkgName, version }, \"skipping shadow node\")\n        continue\n      }\n\n      if (seen.has(id)) {\n        continue\n      }\n\n      seen.add(id)\n\n      // Build the expected path - yarn classic hoists to root node_modules\n      const pkgPath = path.join(this.rootDir, \"node_modules\", pkgName)\n\n      const normalizedDep: YarnDependency = {\n        name: pkgName,\n        version,\n        path: pkgPath, // Will be resolved later in collectAllDependencies\n        dependencies: {},\n        optionalDependencies: {},\n      }\n\n      log.debug({ name: pkgName, version }, \"+ normalize\")\n\n      if (node.children && node.children.length > 0) {\n        for (const child of node.children) {\n          const childMatch = child.name.match(/^(.*)@([^@]+)$/)\n          if (!childMatch) {\n            continue\n          }\n\n          const [, childName, childVersion] = childMatch\n          if (child.shadow && child.color === \"dim\") {\n            continue\n          }\n\n          log.debug({ parent: pkgName, childName, childVersion }, \"  + normalize child\")\n          const childDeps = await this.normalizeTree([child], seen, appName)\n\n          for (const [childDepName, childDep] of Object.entries(childDeps)) {\n            normalizedDep.dependencies![childDepName] = childDep\n          }\n        }\n      }\n\n      normalized[pkgName] = normalizedDep\n    }\n\n    return normalized\n  }\n\n  protected async collectAllDependencies(tree: YarnDependency, packageToExclude: string) {\n    const rootPkgJson = await this.appPkgJson.value\n    const failedPackages = new Set<string>()\n\n    log.debug({ packageToExclude, hasWorkspaces: !!tree.workspaces }, \"collectAllDependencies starting\")\n\n    const collect = async (\n      deps: YarnDependency[\"dependencies\"] | YarnDependency[\"optionalDependencies\"] = {},\n      isOptionalDependency: boolean,\n      parentIsOptional: boolean = false\n    ) => {\n      for (const [, value] of Object.entries(deps)) {\n        // Skip the app package if provided\n        if (packageToExclude && value.name === packageToExclude) {\n          log.debug({ name: value.name }, \"skipping app package in collectAllDependencies\")\n          continue\n        }\n\n        const isRootOptional = !!rootPkgJson.optionalDependencies?.[value.name]\n        const isDirectRootDep = rootPkgJson.dependencies?.[value.name] || rootPkgJson.optionalDependencies?.[value.name] || rootPkgJson.devDependencies?.[value.name]\n        const treatAsOptional = isOptionalDependency || parentIsOptional || isRootOptional\n\n        let p: string | null\n\n        try {\n          p = await this.resolvePath(value.path)\n        } catch (e) {\n          if (treatAsOptional) {\n            log.debug({ pkg: this.cacheKey(value), name: value.name }, \"failed to resolve optional dependency, skipping\")\n            failedPackages.add(value.name)\n            continue\n          }\n\n          if (!isDirectRootDep) {\n            log.debug({ pkg: this.cacheKey(value), name: value.name }, \"failed to resolve transitive dependency, treating as optional\")\n            failedPackages.add(value.name)\n            continue\n          }\n\n          log.error({ pkg: this.cacheKey(value) }, \"failed to resolve module directory\")\n          throw e\n        }\n\n        if (!p) {\n          log.debug({ pkg: this.cacheKey(value), name: value.name }, \"optional dependency not found, skipping\")\n          failedPackages.add(value.name)\n          continue\n        }\n\n        let resolvedVersion = value.version\n        const versionMatch = p.match(/[/\\\\]node_modules[/\\\\][^@]+@([^/\\\\]+)[/\\\\]/)\n        if (versionMatch) {\n          resolvedVersion = versionMatch[1]\n          if (resolvedVersion !== value.version) {\n            log.debug({ name: value.name, declared: value.version, resolved: resolvedVersion }, \"resolved actual version from path\")\n          }\n        }\n\n        const m: YarnDependency = {\n          ...value,\n          version: resolvedVersion,\n          path: p,\n        }\n\n        const moduleKey = this.packageVersionString(m)\n        if (this.allDependencies.has(moduleKey)) {\n          continue\n        }\n\n        this.allDependencies.set(moduleKey, m)\n\n        const childIsOptional = treatAsOptional\n        await collect(m.dependencies, false, childIsOptional)\n        await collect(m.optionalDependencies, true, true)\n      }\n    }\n\n    await collect(tree.dependencies, false, false)\n    await collect(tree.optionalDependencies, true, true)\n\n    // Final cleanup: remove the app package from allDependencies\n    if (packageToExclude) {\n      for (const [key, dep] of this.allDependencies.entries()) {\n        if (dep.name === packageToExclude) {\n          log.debug({ key, name: dep.name }, \"removing app package from allDependencies\")\n          this.allDependencies.delete(key)\n        }\n      }\n    }\n\n    if (failedPackages.size > 0) {\n      const cleanDependencies = (deps: Record<string, YarnDependency> = {}) => {\n        for (const [key, dep] of Object.entries(deps)) {\n          if (failedPackages.has(dep.name)) {\n            log.debug({ name: dep.name }, \"removing failed package from tree\")\n            delete deps[key]\n          } else {\n            if (dep.dependencies) {\n              cleanDependencies(dep.dependencies)\n            }\n            if (dep.optionalDependencies) {\n              cleanDependencies(dep.optionalDependencies)\n            }\n          }\n        }\n      }\n\n      cleanDependencies(tree.dependencies)\n      cleanDependencies(tree.optionalDependencies)\n    }\n  }\n}\n"]}

package/out/options/winOptions.d.ts

@@ -52,7 +52,8 @@ export interface WindowsConfiguration extends PlatformSpecificBuildOptions {
      */
     readonly signAndEditExecutable?: boolean;
     /**
-     * Explicit file extensions to also sign. Advanced option.
+     * Explicit file name/extensions (`str.endsWith`) to also sign. Advanced option.
+     * Supports negative patterns, e.g. example that excludes `.appx` files: `["somefilename", ".dll", "!.appx"]`.
      * @see https://github.com/electron-userland/electron-builder/issues/7329
      * @default null
      */

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 service\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"]}
+{"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 service\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 name/extensions (`str.endsWith`) to also sign. Advanced option.\n   * Supports negative patterns, e.g. example that excludes `.appx` files: `[\"somefilename\", \".dll\", \"!.appx\"]`.\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.d.ts

@@ -10,6 +10,7 @@ import { ArtifactBuildStarted, ArtifactCreated, PackagerOptions } from "./packag
 import { PlatformPackager } from "./platformPackager";
 import { NodeModuleDirInfo, NodeModuleInfo } from "./util/packageDependencies";
 import { HandlerType } from "./util/asyncEventEmitter";
+import { PM } from "./node-module-collector";
 type PackagerEvents = {
     artifactBuildStarted: Hook<ArtifactBuildStarted, void>;
     beforePack: Hook<BeforePackContext, void>;
@@ -26,6 +27,9 @@ export declare class Packager {
     readonly projectDir: string;
     private _appDir;
     get appDir(): string;
+    private _packageManager;
+    getPackageManager(): Promise<PM>;
+    getWorkspaceRoot(): Promise<string>;
     private _metadata;
     get metadata(): Metadata;
     private _nodeModulesHandledExternally;
@@ -46,6 +50,7 @@ export declare class Packager {
     readonly debugLogger: DebugLogger;
     get repositoryInfo(): Promise<SourceRepositoryInfo | null>;
     private nodeDependencyInfo;
+    private runtimeEnvironmentVariables;
     getNodeDependencyInfo(platform: Platform | null, flatten?: boolean): Lazy<Array<NodeModuleInfo | NodeModuleDirInfo>>;
     stageDirPathCustomizer: (target: Target, packager: PlatformPackager<any>, arch: Arch) => string;
     private _buildResourcesDir;
@@ -56,7 +61,7 @@ export declare class Packager {
     private readonly toDispose;
     disposeOnBuildFinish(disposer: () => Promise<void>): void;
     constructor(options: PackagerOptions, cancellationToken?: CancellationToken);
-    addPackagerEventHandlers(): Promise<void>;
+    private addPackagerEventHandlers;
     onAfterPack(handler: PackagerEvents["afterPack"]): Packager;
     onArtifactCreated(handler: PackagerEvents["artifactCreated"]): Packager;
     filterPackagerEventListeners(event: keyof PackagerEvents, type: HandlerType | undefined): {

package/out/packager.js

@@ -25,6 +25,7 @@ const yarn_1 = require("./util/yarn");
 const version_1 = require("./version");
 const asyncEventEmitter_1 = require("./util/asyncEventEmitter");
 const tiny_async_pool_1 = require("tiny-async-pool");
+const node_module_collector_1 = require("./node-module-collector");
 async function createFrameworkInfo(configuration, packager) {
     let framework = configuration.framework;
     if (framework != null) {
@@ -53,6 +54,12 @@ class Packager {
     get appDir() {
         return this._appDir;
     }
+    async getPackageManager() {
+        return (await this._packageManager.value).pm;
+    }
+    async getWorkspaceRoot() {
+        return (await (await this._packageManager.value).workspaceRoot) || this.projectDir;
+    }
     get metadata() {
         return this._metadata;
     }
@@ -110,6 +117,23 @@ class Packager {
     //noinspection JSUnusedGlobalSymbols
     constructor(options, cancellationToken = new builder_util_runtime_1.CancellationToken()) {
         this.cancellationToken = cancellationToken;
+        this._packageManager = new lazy_val_1.Lazy(async () => {
+            const availableDirs = [this.projectDir, this.appDir];
+            const pm = await (0, node_module_collector_1.detectPackageManager)(availableDirs);
+            const workspaceRoot = await (0, node_module_collector_1.findWorkspaceRoot)(pm.pm, this.projectDir);
+            if (workspaceRoot != null) {
+                // re-detect package manager from workspace root, this seems particularly necessary for pnpm workspaces
+                const actualPm = await (0, node_module_collector_1.detectPackageManager)([workspaceRoot]);
+                return {
+                    pm: actualPm.pm,
+                    workspaceRoot: Promise.resolve(actualPm.resolvedDirectory),
+                };
+            }
+            return {
+                pm: pm.pm,
+                workspaceRoot: Promise.resolve(pm.resolvedDirectory),
+            };
+        });
         this._metadata = null;
         this._nodeModulesHandledExternally = false;
         this._isPrepackedAppAsar = false;
@@ -122,6 +146,7 @@ class Packager {
         this._repositoryInfo = new lazy_val_1.Lazy(() => (0, repositoryInfo_1.getRepositoryInfo)(this.projectDir, this.metadata, this.devMetadata));
         this.debugLogger = new builder_util_1.DebugLogger(builder_util_1.log.isDebugEnabled);
         this.nodeDependencyInfo = new Map();
+        this.runtimeEnvironmentVariables = {};
         this.stageDirPathCustomizer = (target, packager, arch) => {
             return path.join(target.outDir, `__${target.name}-${(0, builder_util_1.getArtifactArchName)(arch, target.name)}`);
         };
@@ -457,12 +482,12 @@ class Packager {
             builder_util_1.log.info({ reason: "platform is different and buildDependenciesFromSource is set to true" }, "skipped dependencies rebuild");
         }
         else {
-            await (0, yarn_1.installOrRebuild)(config, { appDir: this.appDir, projectDir: this.projectDir }, {
+            await (0, yarn_1.installOrRebuild)(config, { appDir: this.appDir, projectDir: this.projectDir, workspaceRoot: await this.getWorkspaceRoot() }, {
                 frameworkInfo,
                 platform: platform.nodeName,
                 arch: builder_util_1.Arch[arch],
                 productionDeps: this.getNodeDependencyInfo(null, false),
-            });
+            }, false, this.runtimeEnvironmentVariables);
         }
     }
 }