app-builder-lib 25.0.5 → 25.1.1

package/out/util/config/load.js

@@ -0,0 +1,128 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findAndReadConfig = findAndReadConfig;
+exports.orNullIfFileNotExist = orNullIfFileNotExist;
+exports.orIfFileNotExist = orIfFileNotExist;
+exports.loadConfig = loadConfig;
+exports.getConfig = getConfig;
+exports.loadParentConfig = loadParentConfig;
+exports.loadEnv = loadEnv;
+const fs_1 = require("fs");
+const js_yaml_1 = require("js-yaml");
+const path = require("path");
+const dotenv_1 = require("dotenv");
+const config_file_ts_1 = require("config-file-ts");
+const dotenv_expand_1 = require("dotenv-expand");
+const resolve_1 = require("../resolve");
+const builder_util_1 = require("builder-util");
+async function readConfig(configFile, request) {
+    const data = await fs_1.promises.readFile(configFile, "utf8");
+    let result;
+    if (configFile.endsWith(".json5") || configFile.endsWith(".json")) {
+        result = require("json5").parse(data);
+    }
+    else if (configFile.endsWith(".js") || configFile.endsWith(".cjs") || configFile.endsWith(".mjs")) {
+        const json = await orNullIfFileNotExist(fs_1.promises.readFile(path.join(process.cwd(), "package.json"), "utf8"));
+        const moduleType = json === null ? null : JSON.parse(json).type;
+        result = await (0, resolve_1.resolveModule)(moduleType, configFile);
+        if (result.default != null) {
+            result = result.default;
+        }
+        if (typeof result === "function") {
+            result = result(request);
+        }
+        result = await Promise.resolve(result);
+    }
+    else if (configFile.endsWith(".ts")) {
+        result = (0, config_file_ts_1.loadTsConfig)(configFile);
+        if (typeof result === "function") {
+            result = result(request);
+        }
+        result = await Promise.resolve(result);
+    }
+    else if (configFile.endsWith(".toml")) {
+        result = require("toml").parse(data);
+    }
+    else {
+        result = (0, js_yaml_1.load)(data);
+    }
+    return { result, configFile };
+}
+async function findAndReadConfig(request) {
+    const prefix = request.configFilename;
+    for (const configFile of [`${prefix}.yml`, `${prefix}.yaml`, `${prefix}.json`, `${prefix}.json5`, `${prefix}.toml`, `${prefix}.js`, `${prefix}.cjs`, `${prefix}.ts`]) {
+        const data = await orNullIfFileNotExist(readConfig(path.join(request.projectDir, configFile), request));
+        if (data != null) {
+            return data;
+        }
+    }
+    return null;
+}
+function orNullIfFileNotExist(promise) {
+    return orIfFileNotExist(promise, null);
+}
+function orIfFileNotExist(promise, fallbackValue) {
+    return promise.catch(e => {
+        if (e.code === "ENOENT" || e.code === "ENOTDIR") {
+            return fallbackValue;
+        }
+        throw e;
+    });
+}
+async function loadConfig(request) {
+    let packageMetadata = request.packageMetadata == null ? null : await request.packageMetadata.value;
+    if (packageMetadata == null) {
+        const json = await orNullIfFileNotExist(fs_1.promises.readFile(path.join(request.projectDir, "package.json"), "utf8"));
+        packageMetadata = json == null ? null : JSON.parse(json);
+    }
+    const data = packageMetadata == null ? null : packageMetadata[request.packageKey];
+    return data == null ? findAndReadConfig(request) : { result: data, configFile: null };
+}
+function getConfig(request, configPath) {
+    if (configPath == null) {
+        return loadConfig(request);
+    }
+    else {
+        return readConfig(path.resolve(request.projectDir, configPath), request);
+    }
+}
+async function loadParentConfig(request, spec) {
+    let isFileSpec;
+    if (spec.startsWith("file:")) {
+        spec = spec.substring("file:".length);
+        isFileSpec = true;
+    }
+    let parentConfig = await orNullIfFileNotExist(readConfig(path.resolve(request.projectDir, spec), request));
+    if (parentConfig == null && isFileSpec !== true) {
+        let resolved = null;
+        try {
+            resolved = require.resolve(spec);
+        }
+        catch (e) {
+            // ignore
+        }
+        if (resolved != null) {
+            parentConfig = await readConfig(resolved, request);
+        }
+    }
+    if (parentConfig == null) {
+        throw new Error(`Cannot find parent config file: ${spec}`);
+    }
+    return parentConfig;
+}
+async function loadEnv(envFile) {
+    const data = await orNullIfFileNotExist(fs_1.promises.readFile(envFile, "utf8"));
+    if (data == null) {
+        return null;
+    }
+    const parsed = (0, dotenv_1.parse)(data);
+    builder_util_1.log.info({ envFile }, "injecting environment");
+    Object.entries(parsed).forEach(([key, value]) => {
+        if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
+            process.env[key] = value;
+        }
+    });
+    (0, dotenv_expand_1.expand)({ parsed });
+    return parsed;
+}
+//# sourceMappingURL=load.js.map

package/out/util/config/load.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"load.js","sourceRoot":"","sources":["../../../src/util/config/load.ts"],"names":[],"mappings":";;AA6CA,8CAUC;AAED,oDAEC;AAED,4CAOC;AAUD,gCASC;AAED,8BAMC;AAED,4CA0BC;AAED,0BAgBC;AA7ID,2BAAmC;AACnC,qCAA8B;AAC9B,6BAA4B;AAE5B,mCAA0C;AAC1C,mDAA6C;AAC7C,iDAAwD;AACxD,wCAA0C;AAC1C,+CAAkC;AAOlC,KAAK,UAAU,UAAU,CAAI,UAAkB,EAAE,OAA0B;IACzE,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAA;IAClD,IAAI,MAAW,CAAA;IACf,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACvC,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACpG,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,aAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;QACtG,MAAM,UAAU,GAAG,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAA;QAC/D,MAAM,GAAG,MAAM,IAAA,uBAAa,EAAC,UAAU,EAAE,UAAU,CAAC,CAAA;QACpD,IAAI,MAAM,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;YAC3B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAA;QACzB,CAAC;QACD,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,MAAM,GAAG,IAAA,6BAAY,EAAC,UAAU,CAAC,CAAA;QACjC,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC;QACD,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACxC,CAAC;SAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,IAAA,cAAI,EAAC,IAAI,CAAC,CAAA;IACrB,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,CAAA;AAC/B,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAI,OAA0B;IACnE,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAA;IACrC,KAAK,MAAM,UAAU,IAAI,CAAC,GAAG,MAAM,MAAM,EAAE,GAAG,MAAM,OAAO,EAAE,GAAG,MAAM,OAAO,EAAE,GAAG,MAAM,QAAQ,EAAE,GAAG,MAAM,OAAO,EAAE,GAAG,MAAM,KAAK,EAAE,GAAG,MAAM,MAAM,EAAE,GAAG,MAAM,KAAK,CAAC,EAAE,CAAC;QACrK,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;QAC1G,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC;AAED,SAAgB,oBAAoB,CAAI,OAAmB;IACzD,OAAO,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AACxC,CAAC;AAED,SAAgB,gBAAgB,CAAI,OAAmB,EAAE,aAAgB;IACvE,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACvB,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAChD,OAAO,aAAa,CAAA;QACtB,CAAC;QACD,MAAM,CAAC,CAAA;IACT,CAAC,CAAC,CAAA;AACJ,CAAC;AAUM,KAAK,UAAU,UAAU,CAAI,OAA0B;IAC5D,IAAI,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,eAAe,CAAC,KAAK,CAAA;IAClG,IAAI,eAAe,IAAI,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,aAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;QAC3G,eAAe,GAAG,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,MAAM,IAAI,GAAM,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IACpF,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAI,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAA;AAC1F,CAAC;AAED,SAAgB,SAAS,CAAI,OAA0B,EAAE,UAA0B;IACjF,IAAI,UAAU,IAAI,IAAI,EAAE,CAAC;QACvB,OAAO,UAAU,CAAI,OAAO,CAAC,CAAA;IAC/B,CAAC;SAAM,CAAC;QACN,OAAO,UAAU,CAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,OAAO,CAAC,CAAA;IAC7E,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,gBAAgB,CAAI,OAA0B,EAAE,IAAY;IAChF,IAAI,UAA+B,CAAA;IACnC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACrC,UAAU,GAAG,IAAI,CAAA;IACnB,CAAC;IAED,IAAI,YAAY,GAAG,MAAM,oBAAoB,CAAC,UAAU,CAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;IAC7G,IAAI,YAAY,IAAI,IAAI,IAAI,UAAU,KAAK,IAAI,EAAE,CAAC;QAChD,IAAI,QAAQ,GAAkB,IAAI,CAAA;QAClC,IAAI,CAAC;YACH,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QAED,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACrB,YAAY,GAAG,MAAM,UAAU,CAAI,QAAQ,EAAE,OAAO,CAAC,CAAA;QACvD,CAAC;IACH,CAAC;IAED,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAA;IAC5D,CAAC;IAED,OAAO,YAAY,CAAA;AACrB,CAAC;AAEM,KAAK,UAAU,OAAO,CAAC,OAAe;IAC3C,MAAM,IAAI,GAAG,MAAM,oBAAoB,CAAC,aAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAA;IACrE,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,cAAQ,EAAmB,IAAI,CAAC,CAAA;IAE/C,kBAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,EAAE,uBAAuB,CAAC,CAAA;IAC9C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC9C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;QAC1B,CAAC;IACH,CAAC,CAAC,CAAA;IACF,IAAA,sBAAM,EAAC,EAAE,MAAM,EAAE,CAAC,CAAA;IAClB,OAAO,MAAM,CAAA;AACf,CAAC","sourcesContent":["import { promises as fs } from \"fs\"\nimport { load } from \"js-yaml\"\nimport * as path from \"path\"\nimport { Lazy } from \"lazy-val\"\nimport { parse as parseEnv } from \"dotenv\"\nimport { loadTsConfig } from \"config-file-ts\"\nimport { DotenvParseInput, expand } from \"dotenv-expand\"\nimport { resolveModule } from \"../resolve\"\nimport { log } from \"builder-util\"\n\nexport interface ReadConfigResult<T> {\n  readonly result: T\n  readonly configFile: string | null\n}\n\nasync function readConfig<T>(configFile: string, request: ReadConfigRequest): Promise<ReadConfigResult<T>> {\n  const data = await fs.readFile(configFile, \"utf8\")\n  let result: any\n  if (configFile.endsWith(\".json5\") || configFile.endsWith(\".json\")) {\n    result = require(\"json5\").parse(data)\n  } else if (configFile.endsWith(\".js\") || configFile.endsWith(\".cjs\") || configFile.endsWith(\".mjs\")) {\n    const json = await orNullIfFileNotExist(fs.readFile(path.join(process.cwd(), \"package.json\"), \"utf8\"))\n    const moduleType = json === null ? null : JSON.parse(json).type\n    result = await resolveModule(moduleType, configFile)\n    if (result.default != null) {\n      result = result.default\n    }\n    if (typeof result === \"function\") {\n      result = result(request)\n    }\n    result = await Promise.resolve(result)\n  } else if (configFile.endsWith(\".ts\")) {\n    result = loadTsConfig(configFile)\n    if (typeof result === \"function\") {\n      result = result(request)\n    }\n    result = await Promise.resolve(result)\n  } else if (configFile.endsWith(\".toml\")) {\n    result = require(\"toml\").parse(data)\n  } else {\n    result = load(data)\n  }\n  return { result, configFile }\n}\n\nexport async function findAndReadConfig<T>(request: ReadConfigRequest): Promise<ReadConfigResult<T> | null> {\n  const prefix = request.configFilename\n  for (const configFile of [`${prefix}.yml`, `${prefix}.yaml`, `${prefix}.json`, `${prefix}.json5`, `${prefix}.toml`, `${prefix}.js`, `${prefix}.cjs`, `${prefix}.ts`]) {\n    const data = await orNullIfFileNotExist(readConfig<T>(path.join(request.projectDir, configFile), request))\n    if (data != null) {\n      return data\n    }\n  }\n\n  return null\n}\n\nexport function orNullIfFileNotExist<T>(promise: Promise<T>): Promise<T | null> {\n  return orIfFileNotExist(promise, null)\n}\n\nexport function orIfFileNotExist<T>(promise: Promise<T>, fallbackValue: T): Promise<T> {\n  return promise.catch(e => {\n    if (e.code === \"ENOENT\" || e.code === \"ENOTDIR\") {\n      return fallbackValue\n    }\n    throw e\n  })\n}\n\nexport interface ReadConfigRequest {\n  packageKey: string\n  configFilename: string\n\n  projectDir: string\n  packageMetadata: Lazy<{ [key: string]: any } | null> | null\n}\n\nexport async function loadConfig<T>(request: ReadConfigRequest): Promise<ReadConfigResult<T> | null> {\n  let packageMetadata = request.packageMetadata == null ? null : await request.packageMetadata.value\n  if (packageMetadata == null) {\n    const json = await orNullIfFileNotExist(fs.readFile(path.join(request.projectDir, \"package.json\"), \"utf8\"))\n    packageMetadata = json == null ? null : JSON.parse(json)\n  }\n\n  const data: T = packageMetadata == null ? null : packageMetadata[request.packageKey]\n  return data == null ? findAndReadConfig<T>(request) : { result: data, configFile: null }\n}\n\nexport function getConfig<T>(request: ReadConfigRequest, configPath?: string | null): Promise<ReadConfigResult<T> | null> {\n  if (configPath == null) {\n    return loadConfig<T>(request)\n  } else {\n    return readConfig<T>(path.resolve(request.projectDir, configPath), request)\n  }\n}\n\nexport async function loadParentConfig<T>(request: ReadConfigRequest, spec: string): Promise<ReadConfigResult<T>> {\n  let isFileSpec: boolean | undefined\n  if (spec.startsWith(\"file:\")) {\n    spec = spec.substring(\"file:\".length)\n    isFileSpec = true\n  }\n\n  let parentConfig = await orNullIfFileNotExist(readConfig<T>(path.resolve(request.projectDir, spec), request))\n  if (parentConfig == null && isFileSpec !== true) {\n    let resolved: string | null = null\n    try {\n      resolved = require.resolve(spec)\n    } catch (e) {\n      // ignore\n    }\n\n    if (resolved != null) {\n      parentConfig = await readConfig<T>(resolved, request)\n    }\n  }\n\n  if (parentConfig == null) {\n    throw new Error(`Cannot find parent config file: ${spec}`)\n  }\n\n  return parentConfig\n}\n\nexport async function loadEnv(envFile: string) {\n  const data = await orNullIfFileNotExist(fs.readFile(envFile, \"utf8\"))\n  if (data == null) {\n    return null\n  }\n\n  const parsed = parseEnv<DotenvParseInput>(data)\n\n  log.info({ envFile }, \"injecting environment\")\n  Object.entries(parsed).forEach(([key, value]) => {\n    if (!Object.prototype.hasOwnProperty.call(process.env, key)) {\n      process.env[key] = value\n    }\n  })\n  expand({ parsed })\n  return parsed\n}\n"]}

package/out/util/packageDependencies.d.ts

@@ -1,5 +1,5 @@
 import { Lazy } from "lazy-val";
-export declare function createLazyProductionDeps(projectDir: string, excludedDependencies: Array<string> | null): Lazy<any[]>;
+export declare function createLazyProductionDeps<T extends boolean>(projectDir: string, excludedDependencies: Array<string> | null, flatten: T): Lazy<(T extends true ? NodeModuleInfo : NodeModuleDirInfo)[]>;
 export interface NodeModuleDirInfo {
     readonly dir: string;
     readonly deps: Array<NodeModuleInfo>;

package/out/util/packageDependencies.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLazyProductionDeps = createLazyProductionDeps;
 const lazy_val_1 = require("lazy-val");
 const appBuilder_1 = require("./appBuilder");
-function createLazyProductionDeps(projectDir, excludedDependencies) {
+function createLazyProductionDeps(projectDir, excludedDependencies, flatten) {
     return new lazy_val_1.Lazy(async () => {
-        const args = ["node-dep-tree", "--flatten", "--dir", projectDir];
+        const args = ["node-dep-tree", "--dir", projectDir];
+        if (flatten)
+            args.push("--flatten");
         if (excludedDependencies != null) {
             for (const name of excludedDependencies) {
                 args.push("--exclude-dep", name);

package/out/util/packageDependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageDependencies.js","sourceRoot":"","sources":["../../src/util/packageDependencies.ts"],"names":[],"mappings":";;AAGA,4DAUC;AAbD,uCAA+B;AAC/B,6CAAsD;AAEtD,SAAgB,wBAAwB,CAAC,UAAkB,EAAE,oBAA0C;IACrG,OAAO,IAAI,eAAI,CAAC,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,GAAG,CAAC,eAAe,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;QAChE,IAAI,oBAAoB,IAAI,IAAI,EAAE,CAAC;YACjC,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;QACD,OAAO,IAAA,oCAAuB,EAAa,IAAI,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { Lazy } from \"lazy-val\"\nimport { executeAppBuilderAsJson } from \"./appBuilder\"\n\nexport function createLazyProductionDeps(projectDir: string, excludedDependencies: Array<string> | null) {\n  return new Lazy(async () => {\n    const args = [\"node-dep-tree\", \"--flatten\", \"--dir\", projectDir]\n    if (excludedDependencies != null) {\n      for (const name of excludedDependencies) {\n        args.push(\"--exclude-dep\", name)\n      }\n    }\n    return executeAppBuilderAsJson<Array<any>>(args)\n  })\n}\n\nexport interface NodeModuleDirInfo {\n  readonly dir: string\n  readonly deps: Array<NodeModuleInfo>\n}\n\nexport interface NodeModuleInfo {\n  readonly name: string\n  readonly version: string\n  readonly dir: string\n  readonly conflictDependency: Array<NodeModuleInfo>\n}\n"]}
+{"version":3,"file":"packageDependencies.js","sourceRoot":"","sources":["../../src/util/packageDependencies.ts"],"names":[],"mappings":";;AAGA,4DAWC;AAdD,uCAA+B;AAC/B,6CAAsD;AAEtD,SAAgB,wBAAwB,CAAoB,UAAkB,EAAE,oBAA0C,EAAE,OAAU;IACpI,OAAO,IAAI,eAAI,CAAC,KAAK,IAAI,EAAE;QACzB,MAAM,IAAI,GAAG,CAAC,eAAe,EAAE,OAAO,EAAE,UAAU,CAAC,CAAA;QACnD,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACnC,IAAI,oBAAoB,IAAI,IAAI,EAAE,CAAC;YACjC,KAAK,MAAM,IAAI,IAAI,oBAAoB,EAAE,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;YAClC,CAAC;QACH,CAAC;QACD,OAAO,IAAA,oCAAuB,EAA6D,IAAI,CAAC,CAAA;IAClG,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { Lazy } from \"lazy-val\"\nimport { executeAppBuilderAsJson } from \"./appBuilder\"\n\nexport function createLazyProductionDeps<T extends boolean>(projectDir: string, excludedDependencies: Array<string> | null, flatten: T) {\n  return new Lazy(async () => {\n    const args = [\"node-dep-tree\", \"--dir\", projectDir]\n    if (flatten) args.push(\"--flatten\")\n    if (excludedDependencies != null) {\n      for (const name of excludedDependencies) {\n        args.push(\"--exclude-dep\", name)\n      }\n    }\n    return executeAppBuilderAsJson<Array<T extends true ? NodeModuleInfo : NodeModuleDirInfo>>(args)\n  })\n}\n\nexport interface NodeModuleDirInfo {\n  readonly dir: string\n  readonly deps: Array<NodeModuleInfo>\n}\n\nexport interface NodeModuleInfo {\n  readonly name: string\n  readonly version: string\n  readonly dir: string\n  readonly conflictDependency: Array<NodeModuleInfo>\n}\n"]}

package/out/util/resolve.d.ts

@@ -0,0 +1,2 @@
+export declare function resolveModule<T>(type: string | undefined, name: string): Promise<T>;
+export declare function resolveFunction<T>(type: string | undefined, executor: T | string, name: string): Promise<T>;

package/out/util/resolve.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveModule = resolveModule;
+exports.resolveFunction = resolveFunction;
+const log_1 = require("builder-util/out/log");
+const debug_1 = require("debug");
+const path = require("path");
+const url_1 = require("url");
+async function resolveModule(type, name) {
+    var _a, _b, _c;
+    const extension = path.extname(name).toLowerCase();
+    const isModuleType = type === "module";
+    try {
+        if (extension === ".mjs" || (extension === ".js" && isModuleType)) {
+            const fileUrl = (0, url_1.pathToFileURL)(name).href;
+            return await eval("import('" + fileUrl + "')");
+        }
+    }
+    catch (error) {
+        log_1.log.debug({ moduleName: name, message: (_a = error.message) !== null && _a !== void 0 ? _a : error.stack }, "Unable to dynamically import, falling back to `require`");
+    }
+    try {
+        return require(name);
+    }
+    catch (error) {
+        log_1.log.error({ moduleName: name, message: (_b = error.message) !== null && _b !== void 0 ? _b : error.stack }, "Unable to `require`");
+        throw new Error((_c = error.message) !== null && _c !== void 0 ? _c : error.stack);
+    }
+}
+async function resolveFunction(type, executor, name) {
+    if (executor == null || typeof executor !== "string") {
+        return executor;
+    }
+    let p = executor;
+    if (p.startsWith(".")) {
+        p = path.resolve(p);
+    }
+    try {
+        p = require.resolve(p);
+    }
+    catch (e) {
+        (0, debug_1.default)(e);
+        p = path.resolve(p);
+    }
+    const m = await resolveModule(type, p);
+    const namedExport = m[name];
+    if (namedExport == null) {
+        return m.default || m;
+    }
+    else {
+        return namedExport;
+    }
+}
+//# sourceMappingURL=resolve.js.map

package/out/util/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/util/resolve.ts"],"names":[],"mappings":";;AAKA,sCAiBC;AAED,0CAwBC;AAhDD,8CAA0C;AAC1C,iCAAyB;AACzB,6BAA4B;AAC5B,6BAAmC;AAE5B,KAAK,UAAU,aAAa,CAAI,IAAwB,EAAE,IAAY;;IAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAA;IAClD,MAAM,YAAY,GAAG,IAAI,KAAK,QAAQ,CAAA;IACtC,IAAI,CAAC;QACH,IAAI,SAAS,KAAK,MAAM,IAAI,CAAC,SAAS,KAAK,KAAK,IAAI,YAAY,CAAC,EAAE,CAAC;YAClE,MAAM,OAAO,GAAG,IAAA,mBAAa,EAAC,IAAI,CAAC,CAAC,IAAI,CAAA;YACxC,OAAO,MAAM,IAAI,CAAC,UAAU,GAAG,OAAO,GAAG,IAAI,CAAC,CAAA;QAChD,CAAC;IACH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,SAAG,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,KAAK,EAAE,EAAE,yDAAyD,CAAC,CAAA;IACnI,CAAC;IACD,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,SAAG,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,KAAK,EAAE,EAAE,qBAAqB,CAAC,CAAA;QAC7F,MAAM,IAAI,KAAK,CAAC,MAAA,KAAK,CAAC,OAAO,mCAAI,KAAK,CAAC,KAAK,CAAC,CAAA;IAC/C,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,eAAe,CAAI,IAAwB,EAAE,QAAoB,EAAE,IAAY;IACnG,IAAI,QAAQ,IAAI,IAAI,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACrD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,IAAI,CAAC,GAAG,QAAkB,CAAA;IAC1B,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACrB,CAAC;IAED,IAAI,CAAC;QACH,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACxB,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAA,eAAK,EAAC,CAAC,CAAC,CAAA;QACR,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;IACrB,CAAC;IAED,MAAM,CAAC,GAAQ,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,CAAA;IAC3C,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;IAC3B,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;QACxB,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC,CAAA;IACvB,CAAC;SAAM,CAAC;QACN,OAAO,WAAW,CAAA;IACpB,CAAC;AACH,CAAC","sourcesContent":["import { log } from \"builder-util/out/log\"\nimport debug from \"debug\"\nimport * as path from \"path\"\nimport { pathToFileURL } from \"url\"\n\nexport async function resolveModule<T>(type: string | undefined, name: string): Promise<T> {\n  const extension = path.extname(name).toLowerCase()\n  const isModuleType = type === \"module\"\n  try {\n    if (extension === \".mjs\" || (extension === \".js\" && isModuleType)) {\n      const fileUrl = pathToFileURL(name).href\n      return await eval(\"import('\" + fileUrl + \"')\")\n    }\n  } catch (error: any) {\n    log.debug({ moduleName: name, message: error.message ?? error.stack }, \"Unable to dynamically import, falling back to `require`\")\n  }\n  try {\n    return require(name)\n  } catch (error: any) {\n    log.error({ moduleName: name, message: error.message ?? error.stack }, \"Unable to `require`\")\n    throw new Error(error.message ?? error.stack)\n  }\n}\n\nexport async function resolveFunction<T>(type: string | undefined, executor: T | string, name: string): Promise<T> {\n  if (executor == null || typeof executor !== \"string\") {\n    return executor\n  }\n\n  let p = executor as string\n  if (p.startsWith(\".\")) {\n    p = path.resolve(p)\n  }\n\n  try {\n    p = require.resolve(p)\n  } catch (e: any) {\n    debug(e)\n    p = path.resolve(p)\n  }\n\n  const m: any = await resolveModule(type, p)\n  const namedExport = m[name]\n  if (namedExport == null) {\n    return m.default || m\n  } else {\n    return namedExport\n  }\n}\n"]}

package/out/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "25.0.5";
+export declare const PACKAGE_VERSION = "25.1.1";

package/out/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PACKAGE_VERSION = void 0;
-exports.PACKAGE_VERSION = "25.0.5";
+exports.PACKAGE_VERSION = "25.1.1";
 //# sourceMappingURL=version.js.map

package/out/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"25.0.5\"\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,QAAQ,CAAA","sourcesContent":["export const PACKAGE_VERSION = \"25.1.1\"\n"]}

package/out/winPackager.d.ts

@@ -1,25 +1,24 @@
 import { Arch, FileTransformer } from "builder-util";
-import { MemoLazy } from "builder-util-runtime";
 import { Lazy } from "lazy-val";
-import { CertificateFromStoreInfo, CertificateInfo, FileCodeSigningInfo } from "./codeSign/windowsCodeSign";
+import { WindowsSignToolManager } from "./codeSign/windowsSignToolManager";
 import { AfterPackContext } from "./configuration";
 import { Target } from "./core";
 import { RequestedExecutionLevel, WindowsConfiguration } from "./options/winOptions";
 import { Packager } from "./packager";
 import { PlatformPackager } from "./platformPackager";
 import { VmManager } from "./vm/vm";
+import { WindowsSignAzureManager } from "./codeSign/windowsSignAzureManager";
 export declare class WinPackager extends PlatformPackager<WindowsConfiguration> {
-    readonly cscInfo: MemoLazy<WindowsConfiguration, FileCodeSigningInfo | CertificateFromStoreInfo | null>;
-    private _iconPath;
+    _iconPath: Lazy<string | null>;
     readonly vm: Lazy<VmManager>;
-    readonly computedPublisherName: Lazy<string[] | null>;
-    readonly lazyCertInfo: MemoLazy<MemoLazy<WindowsConfiguration, FileCodeSigningInfo | CertificateFromStoreInfo | null>, CertificateInfo | null>;
+    readonly signtoolManager: Lazy<WindowsSignToolManager>;
+    readonly azureSignManager: Lazy<WindowsSignAzureManager>;
     get isForceCodeSigningVerification(): boolean;
     constructor(info: Packager);
     get defaultTarget(): Array<string>;
-    protected doGetCscPassword(): string | undefined | null;
     createTargets(targets: Array<string>, mapper: (name: string, factory: (outDir: string) => Target) => void): void;
     getIconPath(): Promise<string | null>;
+    doGetCscPassword(): string | undefined | null;
     sign(file: string, logMessagePrefix?: string): Promise<boolean>;
     private doSign;
     signAndEditResources(file: string, arch: Arch, outDir: string, internalName?: string | null, requestedExecutionLevel?: RequestedExecutionLevel | null): Promise<void>;

package/out/winPackager.js

@@ -3,14 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WinPackager = void 0;
 const bluebird_lst_1 = require("bluebird-lst");
 const builder_util_1 = require("builder-util");
-const builder_util_runtime_1 = require("builder-util-runtime");
 const crypto_1 = require("crypto");
 const promises_1 = require("fs/promises");
 const isCI = require("is-ci");
 const lazy_val_1 = require("lazy-val");
 const path = require("path");
-const codesign_1 = require("./codeSign/codesign");
-const windowsCodeSign_1 = require("./codeSign/windowsCodeSign");
+const windowsSignToolManager_1 = require("./codeSign/windowsSignToolManager");
 const core_1 = require("./core");
 const platformPackager_1 = require("./platformPackager");
 const NsisTarget_1 = require("./targets/nsis/NsisTarget");
@@ -22,94 +20,25 @@ const flags_1 = require("./util/flags");
 const timer_1 = require("./util/timer");
 const vm_1 = require("./vm/vm");
 const wine_1 = require("./wine");
+const windowsCodeSign_1 = require("./codeSign/windowsCodeSign");
+const windowsSignAzureManager_1 = require("./codeSign/windowsSignAzureManager");
 class WinPackager extends platformPackager_1.PlatformPackager {
     get isForceCodeSigningVerification() {
         return this.platformSpecificBuildOptions.verifyUpdateCodeSignature !== false;
     }
     constructor(info) {
         super(info, core_1.Platform.WINDOWS);
-        this.cscInfo = new builder_util_runtime_1.MemoLazy(() => this.platformSpecificBuildOptions, platformSpecificBuildOptions => {
-            if (platformSpecificBuildOptions.certificateSubjectName != null || platformSpecificBuildOptions.certificateSha1 != null) {
-                return this.vm.value
-                    .then(vm => (0, windowsCodeSign_1.getCertificateFromStoreInfo)(platformSpecificBuildOptions, vm))
-                    .catch((e) => {
-                    // https://github.com/electron-userland/electron-builder/pull/2397
-                    if (platformSpecificBuildOptions.sign == null) {
-                        throw e;
-                    }
-                    else {
-                        builder_util_1.log.debug({ error: e }, "getCertificateFromStoreInfo error");
-                        return null;
-                    }
-                });
-            }
-            const certificateFile = platformSpecificBuildOptions.certificateFile;
-            if (certificateFile != null) {
-                const certificatePassword = this.getCscPassword();
-                return Promise.resolve({
-                    file: certificateFile,
-                    password: certificatePassword == null ? null : certificatePassword.trim(),
-                });
-            }
-            const cscLink = this.getCscLink("WIN_CSC_LINK");
-            if (cscLink == null || cscLink === "") {
-                return Promise.resolve(null);
-            }
-            return ((0, codesign_1.importCertificate)(cscLink, this.info.tempDirManager, this.projectDir)
-                // before then
-                .catch((e) => {
-                if (e instanceof builder_util_1.InvalidConfigurationError) {
-                    throw new builder_util_1.InvalidConfigurationError(`Env WIN_CSC_LINK is not correct, cannot resolve: ${e.message}`);
-                }
-                else {
-                    throw e;
-                }
-            })
-                .then(path => {
-                return {
-                    file: path,
-                    password: this.getCscPassword(),
-                };
-            }));
-        });
         this._iconPath = new lazy_val_1.Lazy(() => this.getOrConvertIcon("ico"));
         this.vm = new lazy_val_1.Lazy(() => (process.platform === "win32" ? Promise.resolve(new vm_1.VmManager()) : (0, vm_1.getWindowsVm)(this.debugLogger)));
-        this.computedPublisherName = new lazy_val_1.Lazy(async () => {
-            const publisherName = this.platformSpecificBuildOptions.publisherName;
-            if (publisherName === null) {
-                return null;
-            }
-            else if (publisherName != null) {
-                return (0, builder_util_1.asArray)(publisherName);
-            }
-            const certInfo = await this.lazyCertInfo.value;
-            return certInfo == null ? null : [certInfo.commonName];
-        });
-        this.lazyCertInfo = new builder_util_runtime_1.MemoLazy(() => this.cscInfo, async (csc) => {
-            const cscInfo = await csc.value;
-            if (cscInfo == null) {
-                return null;
-            }
-            if ("subject" in cscInfo) {
-                const bloodyMicrosoftSubjectDn = cscInfo.subject;
-                return {
-                    commonName: (0, builder_util_runtime_1.parseDn)(bloodyMicrosoftSubjectDn).get("CN"),
-                    bloodyMicrosoftSubjectDn,
-                };
-            }
-            const cscFile = cscInfo.file;
-            if (cscFile == null) {
-                return null;
-            }
-            return await (0, windowsCodeSign_1.getCertInfo)(cscFile, cscInfo.password || "");
-        });
+        this.signtoolManager = new lazy_val_1.Lazy(() => Promise.resolve(new windowsSignToolManager_1.WindowsSignToolManager(this)));
+        this.azureSignManager = new lazy_val_1.Lazy(() => Promise.resolve(new windowsSignAzureManager_1.WindowsSignAzureManager(this)).then(async (manager) => {
+            await manager.initializeProviderModules();
+            return manager;
+        }));
     }
     get defaultTarget() {
         return ["nsis"];
     }
-    doGetCscPassword() {
-        return (0, platformPackager_1.chooseNotNull)((0, platformPackager_1.chooseNotNull)(this.platformSpecificBuildOptions.certificatePassword, process.env.WIN_CSC_KEY_PASSWORD), super.doGetCscPassword());
-    }
     createTargets(targets, mapper) {
         let copyElevateHelper;
         const getCopyElevateHelper = () => {
@@ -163,17 +92,20 @@ class WinPackager extends platformPackager_1.PlatformPackager {
     getIconPath() {
         return this._iconPath.value;
     }
+    doGetCscPassword() {
+        var _a;
+        return (0, platformPackager_1.chooseNotNull)((0, platformPackager_1.chooseNotNull)((0, platformPackager_1.chooseNotNull)((_a = this.platformSpecificBuildOptions.signtoolOptions) === null || _a === void 0 ? void 0 : _a.certificatePassword, this.platformSpecificBuildOptions.certificatePassword), process.env.WIN_CSC_KEY_PASSWORD), super.doGetCscPassword());
+    }
     async sign(file, logMessagePrefix) {
+        var _a;
         const signOptions = {
             path: file,
-            name: this.appInfo.productName,
-            site: await this.appInfo.computePackageUrl(),
             options: this.platformSpecificBuildOptions,
         };
-        const cscInfo = await this.cscInfo.value;
+        const cscInfo = await (await this.signtoolManager.value).cscInfo.value;
         if (cscInfo == null) {
-            if (this.platformSpecificBuildOptions.sign != null) {
-                return (0, windowsCodeSign_1.sign)(signOptions, this);
+            if ((0, platformPackager_1.chooseNotNull)((_a = this.platformSpecificBuildOptions.signtoolOptions) === null || _a === void 0 ? void 0 : _a.sign, this.platformSpecificBuildOptions.sign) != null) {
+                return (0, windowsCodeSign_1.signWindows)(signOptions, this);
             }
             else if (this.forceCodeSigning) {
                 throw new builder_util_1.InvalidConfigurationError(`App is not signed and "forceCodeSigning" is set to true, please ensure that code signing configuration is correct, please see https://electron.build/code-signing`);
@@ -201,31 +133,24 @@ class WinPackager extends platformPackager_1.PlatformPackager {
         }
         return this.doSign({
             ...signOptions,
-            cscInfo,
             options: {
                 ...this.platformSpecificBuildOptions,
             },
         });
     }
     async doSign(options) {
-        for (let i = 0; i < 3; i++) {
-            try {
-                await (0, windowsCodeSign_1.sign)(options, this);
+        return (0, builder_util_1.retry)(() => (0, windowsCodeSign_1.signWindows)(options, this), 3, 500, 500, 0, (e) => {
+            // https://github.com/electron-userland/electron-builder/issues/1414
+            const message = e.message;
+            if (message != null && message.includes("Couldn't resolve host name")) {
+                builder_util_1.log.warn({ error: message }, `cannot sign`);
                 return true;
             }
-            catch (e) {
-                // https://github.com/electron-userland/electron-builder/issues/1414
-                const message = e.message;
-                if (message != null && message.includes("Couldn't resolve host name")) {
-                    builder_util_1.log.warn({ error: message, attempt: i + 1 }, `cannot sign`);
-                    continue;
-                }
-                throw e;
-            }
-        }
-        return false;
+            return false;
+        });
     }
     async signAndEditResources(file, arch, outDir, internalName, requestedExecutionLevel) {
+        var _a, _b;
         const appInfo = this.appInfo;
         const files = [];
         const args = [
@@ -258,7 +183,7 @@ class WinPackager extends platformPackager_1.PlatformPackager {
             args.push("--set-icon", it);
         });
         const config = this.config;
-        const cscInfoForCacheDigest = !(0, flags_1.isBuildCacheEnabled)() || isCI || config.electronDist != null ? null : await this.cscInfo.value;
+        const cscInfoForCacheDigest = !(0, flags_1.isBuildCacheEnabled)() || isCI || config.electronDist != null ? null : await (await this.signtoolManager.value).cscInfo.value;
         let buildCacheManager = null;
         // resources editing doesn't change executable for the same input and executed quickly - no need to complicate
         if (cscInfoForCacheDigest != null) {
@@ -271,8 +196,8 @@ class WinPackager extends platformPackager_1.PlatformPackager {
             hash.update(config.electronVersion || "no electronVersion");
             hash.update(JSON.stringify(this.platformSpecificBuildOptions));
             hash.update(JSON.stringify(args));
-            hash.update(this.platformSpecificBuildOptions.certificateSha1 || "no certificateSha1");
-            hash.update(this.platformSpecificBuildOptions.certificateSubjectName || "no subjectName");
+            hash.update((0, platformPackager_1.chooseNotNull)((_a = this.platformSpecificBuildOptions.signtoolOptions) === null || _a === void 0 ? void 0 : _a.certificateSha1, this.platformSpecificBuildOptions.certificateSha1) || "no certificateSha1");
+            hash.update((0, platformPackager_1.chooseNotNull)((_b = this.platformSpecificBuildOptions.signtoolOptions) === null || _b === void 0 ? void 0 : _b.certificateSubjectName, this.platformSpecificBuildOptions.certificateSubjectName) || "no subjectName");
             buildCacheManager = new cacheManager_1.BuildCacheManager(outDir, file, arch);
             if (await buildCacheManager.copyIfValid(await (0, cacheManager_1.digest)(hash, files))) {
                 timer.end();
@@ -286,7 +211,7 @@ class WinPackager extends platformPackager_1.PlatformPackager {
             await (0, builder_util_1.executeAppBuilder)(["rcedit", "--args", JSON.stringify(args)], undefined /* child-process */, {}, 3 /* retry three times */);
         }
         else if (this.info.framework.name === "electron") {
-            const vendorPath = await (0, windowsCodeSign_1.getSignVendorPath)();
+            const vendorPath = await (0, windowsSignToolManager_1.getSignVendorPath)();
             await (0, wine_1.execWine)(path.join(vendorPath, "rcedit-ia32.exe"), path.join(vendorPath, "rcedit-x64.exe"), args);
         }
         await this.sign(file);