app-builder-lib 27.0.0-alpha.5 → 27.0.0-alpha.7

package/dist/targets/win/winAppUtil.js

@@ -0,0 +1,407 @@
+import { asArray, copyOrLinkFile, ensureNotBusy, escapeForXml, InvalidConfigurationError, log, sanitizeDirPath, walk } from "builder-util";
+import _fsExtra from "fs-extra";
+const { emptyDir, readdir, readFile, writeFile } = _fsExtra;
+import * as path from "path";
+import { getWindowsKitsBundle } from "../../toolsets/winCodeSign.js";
+import { getTemplatePath } from "../../util/pathManager.js";
+import { createStageDir } from "../targetUtil.js";
+import { CAPABILITIES, isValidCapabilityName } from "./AppxCapabilities.js";
+export const APPX_ASSETS_DIR_NAME = "appx";
+/**
+ * Escapes a string for safe use as an XML attribute value (double- or single-quoted) or element text.
+ * Aliased to builder-util's {@link escapeForXml} so the Appx/MSIX manifest path shares the single
+ * consolidated escaper (PR #9853) and cannot drift from it.
+ */
+export const escapeXmlAttr = escapeForXml;
+/**
+ * Manifest macros whose substituted values are raw user/config text and therefore must be
+ * XML-escaped before being placed into the (Appx/MSIX) manifest. Every other macro either
+ * returns a prebuilt XML fragment (capabilities, extensions, lockScreen, defaultTile,
+ * splashScreen, resourceLanguages, packageIntegrity) or a validated/constant value
+ * (version, applicationId, identityName, arch, logo, square*Logo) and must NOT be escaped.
+ *
+ * Note: `publisher` is emitted inside a single-quoted attribute (`Publisher='...'`). escapeForXml
+ * escapes `& < > " '` — apostrophes become `&apos;`, which is valid inside the single-quoted
+ * attribute, so a `'` in a certificate Subject is handled correctly.
+ */
+export const RAW_TEXT_MANIFEST_MACROS = new Set([
+    "publisher",
+    "publisherDisplayName",
+    "executable",
+    "displayName",
+    "description",
+    "backgroundColor",
+    "minVersion",
+    "maxVersionTested",
+]);
+/**
+ * Substitutes `${macro}` placeholders in an Appx/MSIX manifest template. `resolve` returns the
+ * RAW value for a macro; values for macros in {@link RAW_TEXT_MANIFEST_MACROS} are XML-escaped
+ * here so individual call sites cannot forget to. `resolve` may throw for unknown macros.
+ */
+export function substituteManifestMacros(template, resolve) {
+    return template.replace(/\${([a-zA-Z0-9]+)}/g, (_match, macro) => {
+        const value = resolve(macro);
+        return RAW_TEXT_MANIFEST_MACROS.has(macro) ? escapeXmlAttr(value) : value;
+    });
+}
+export const DEFAULT_RESOURCE_LANG = "en-US";
+export const vendorAssetsForDefaultAssets = {
+    "StoreLogo.png": "SampleAppx.50x50.png",
+    "Square150x150Logo.png": "SampleAppx.150x150.png",
+    "Square44x44Logo.png": "SampleAppx.44x44.png",
+    "Wide310x150Logo.png": "SampleAppx.310x150.png",
+};
+export const restrictedApplicationIdValues = [
+    "CON",
+    "PRN",
+    "AUX",
+    "NUL",
+    "COM1",
+    "COM2",
+    "COM3",
+    "COM4",
+    "COM5",
+    "COM6",
+    "COM7",
+    "COM8",
+    "COM9",
+    "LPT1",
+    "LPT2",
+    "LPT3",
+    "LPT4",
+    "LPT5",
+    "LPT6",
+    "LPT7",
+    "LPT8",
+    "LPT9",
+];
+export async function computeUserAssets(vm, vendorPath, userAssetDir) {
+    const mappings = [];
+    let userAssets;
+    const allAssets = [];
+    if (userAssetDir == null) {
+        userAssets = [];
+    }
+    else {
+        userAssets = (await readdir(userAssetDir)).filter(it => !it.startsWith(".") && !it.endsWith(".db") && it.includes("."));
+        for (const name of userAssets) {
+            // The makeappx mapping file is quote-delimited with no escape mechanism; reject names that would corrupt it / inject extra entries.
+            assertSafeMappingPath(name, "Asset file name");
+            mappings.push(`"${vm.toVmFile(userAssetDir)}${vm.pathSep}${name}" "assets\\${name}"`);
+            allAssets.push(path.join(userAssetDir, name));
+        }
+    }
+    for (const defaultAsset of Object.keys(vendorAssetsForDefaultAssets)) {
+        if (userAssets.length === 0 || !isDefaultAssetIncluded(userAssets, defaultAsset)) {
+            // codeql[js/shell-command-constructed-from-input] - vendorPath is a trusted toolset bundle dir and the asset name is a hardcoded constant; the joined path is resolved and contained under vendorPath via sanitizeDirPath, and only reaches makeappx as an execFile argv element (array args, no shell)
+            const file = sanitizeDirPath(path.join(vendorPath, "appxAssets", vendorAssetsForDefaultAssets[defaultAsset]), vendorPath);
+            mappings.push(`"${vm.toVmFile(file)}" "assets\\${defaultAsset}"`);
+            allAssets.push(file);
+        }
+    }
+    return { userAssets, mappings, allAssets };
+}
+/**
+ * The makeappx mapping file (`/f`) is a quote-delimited, newline-separated `[Files]` list with NO escape
+ * mechanism. A path component containing a double-quote or CR/LF would corrupt the format or inject an
+ * extra mapping entry (remapping/shadowing files in the produced package), so such paths are rejected.
+ */
+export function assertSafeMappingPath(value, kind) {
+    if (/["\r\n]/.test(value)) {
+        throw new InvalidConfigurationError(`${kind} cannot contain a double-quote or newline — the makeappx mapping file cannot represent it: ${JSON.stringify(value)}`);
+    }
+}
+/**
+ * Builds the `[Files]` mapping lines for the packaged app payload (`"<vm source>" "app\<rel>"`), shared
+ * by the AppX and MSIX targets. Each relative path is validated via {@link assertSafeMappingPath}.
+ */
+export async function buildAppFileMappings(vm, appOutDir) {
+    return Promise.all((await walk(appOutDir)).map(file => {
+        let relPath = file.substring(appOutDir.length + 1);
+        if (path.sep !== "\\") {
+            relPath = relPath.replace(/\//g, "\\");
+        }
+        assertSafeMappingPath(relPath, "Packaged file path");
+        return `"${vm.toVmFile(file)}" "app\\${relPath}"`;
+    }));
+}
+export function validateApplicationId(result, contextLabel) {
+    const validCharactersRegex = /^([A-Za-z][A-Za-z0-9]*)(\.[A-Za-z][A-Za-z0-9]*)*$/;
+    if (result.length < 1 || result.length > 64) {
+        throw new InvalidConfigurationError(`${contextLabel} Application.Id must be between 1 and 64 characters in length: ${result}`);
+    }
+    if (!validCharactersRegex.test(result)) {
+        throw new InvalidConfigurationError(`${contextLabel} Application.Id must contain only alpha-numeric characters separated by periods, where each segment starts with an alphabetic character: ${result}`);
+    }
+    if (restrictedApplicationIdValues.includes(result.toUpperCase())) {
+        throw new InvalidConfigurationError(`${contextLabel} Application.Id cannot contain restricted values ${JSON.stringify(restrictedApplicationIdValues)}: ${result}`);
+    }
+}
+export function validateIdentityName(result, contextLabel) {
+    const validCharactersRegex = /^[a-zA-Z0-9.-]+$/;
+    if (result.length < 3 || result.length > 50) {
+        throw new InvalidConfigurationError(`${contextLabel} identityName must be between 3 and 50 characters in length: ${result}`);
+    }
+    if (!validCharactersRegex.test(result)) {
+        throw new InvalidConfigurationError(`${contextLabel} identityName must contain only alpha-numeric, period, and dash characters: ${result}`);
+    }
+    if (restrictedApplicationIdValues.includes(result.toUpperCase())) {
+        throw new InvalidConfigurationError(`${contextLabel} identityName cannot contain restricted values ${JSON.stringify(restrictedApplicationIdValues)}: ${result}`);
+    }
+}
+export function resourceLanguageTag(userLanguages) {
+    if (userLanguages == null || userLanguages.length === 0) {
+        userLanguages = [DEFAULT_RESOURCE_LANG];
+    }
+    return userLanguages.map(it => `<Resource Language="${escapeXmlAttr(it.trim().replace(/_/g, "-"))}" />`).join("\n");
+}
+export function lockScreenTag(userAssets) {
+    if (isDefaultAssetIncluded(userAssets, "BadgeLogo.png")) {
+        return '<uap:LockScreen Notification="badgeAndTileText" BadgeLogo="assets\\BadgeLogo.png" />';
+    }
+    return "";
+}
+export function defaultTileTag(userAssets, showNameOnTiles) {
+    const defaultTiles = ["<uap:DefaultTile", 'Wide310x150Logo="assets\\Wide310x150Logo.png"'];
+    if (isDefaultAssetIncluded(userAssets, "LargeTile.png")) {
+        defaultTiles.push('Square310x310Logo="assets\\LargeTile.png"');
+    }
+    if (isDefaultAssetIncluded(userAssets, "SmallTile.png")) {
+        defaultTiles.push('Square71x71Logo="assets\\SmallTile.png"');
+    }
+    if (showNameOnTiles) {
+        defaultTiles.push(">");
+        defaultTiles.push("<uap:ShowNameOnTiles>");
+        defaultTiles.push("<uap:ShowOn", 'Tile="wide310x150Logo"', "/>");
+        defaultTiles.push("<uap:ShowOn", 'Tile="square150x150Logo"', "/>");
+        defaultTiles.push("</uap:ShowNameOnTiles>");
+        defaultTiles.push("</uap:DefaultTile>");
+    }
+    else {
+        defaultTiles.push("/>");
+    }
+    return defaultTiles.join(" ");
+}
+export function splashScreenTag(userAssets) {
+    if (isDefaultAssetIncluded(userAssets, "SplashScreen.png")) {
+        return '<uap:SplashScreen Image="assets\\SplashScreen.png" />';
+    }
+    return "";
+}
+export function isDefaultAssetIncluded(userAssets, defaultAsset) {
+    const defaultAssetName = defaultAsset.substring(0, defaultAsset.indexOf("."));
+    return userAssets.some(it => it.includes(defaultAssetName));
+}
+export function isScaledAssetsProvided(userAssets) {
+    return userAssets.some(it => it.includes(".scale-") || it.includes(".targetsize-"));
+}
+/**
+ * Resolves the final applicationId value from config, stripping any leading numeric prefix
+ * from identityName (a common user mistake), then validates it.
+ */
+export function resolvePackageApplicationId(applicationId, identityName, appName, contextLabel) {
+    let result;
+    const identitynumber = parseInt(identityName, 10) || NaN;
+    if (applicationId) {
+        result = applicationId;
+        validateApplicationId(result, contextLabel);
+        return result;
+    }
+    if (!isNaN(identitynumber) && identityName !== null && identityName !== undefined) {
+        if (identityName[0] === "0") {
+            log.warn(`Remove the 0${identitynumber}`);
+            result = identityName.replace("0" + identitynumber.toString(), "");
+        }
+        else {
+            log.warn(`Remove the ${identitynumber}`);
+            result = identityName.replace(identitynumber.toString(), "");
+        }
+    }
+    else {
+        result = identityName || appName;
+    }
+    // `result` is a derived value (from identityName or the app name). identityName allows characters
+    // (e.g. a dash) that are invalid in an Application.Id, so surface an actionable error rather than
+    // the raw low-level validation message when the derivation cannot produce a valid id.
+    try {
+        validateApplicationId(result, contextLabel);
+    }
+    catch (e) {
+        throw new InvalidConfigurationError(`${contextLabel} could not derive a valid Application.Id ("${result}") from identityName/name — Application.Id allows only alpha-numeric segments separated by periods (no dashes). Set the "applicationId" option explicitly. Cause: ${e.message}`);
+    }
+    return result;
+}
+export function resolvePackageIdentityName(identityName, appName, contextLabel) {
+    const result = identityName || appName;
+    validateIdentityName(result, contextLabel);
+    return result;
+}
+export function buildCapabilitiesXml(capabilityNames) {
+    const caps = asArray(capabilityNames);
+    const capSet = new Set(caps);
+    const invalid = Array.from(capSet).filter(cap => !isValidCapabilityName(cap));
+    if (invalid.length > 0) {
+        throw new Error(`invalid windows capabilit${invalid.length === 1 ? "y" : "ies"} specified: ${invalid.join(", ")}`);
+    }
+    capSet.add("runFullTrust");
+    const capabilityStrings = CAPABILITIES.filter(cap => capSet.has(cap.name)).map(cap => `  ${cap.toXMLString()}`);
+    return capabilityStrings.join("\n");
+}
+export async function buildExtensionsXml(input) {
+    const { protocols, fileAssociations, appDir, executable, displayName, customExtensionsPath } = input;
+    let isAddAutoLaunch = input.addAutoLaunchExtension;
+    if (isAddAutoLaunch === undefined) {
+        isAddAutoLaunch = input.dependencyNames != null && input.dependencyNames["electron-winstore-auto-launch"] != null;
+    }
+    if (!isAddAutoLaunch && protocols.length === 0 && fileAssociations.length === 0 && customExtensionsPath === undefined) {
+        return "";
+    }
+    let extensions = "<Extensions>";
+    if (isAddAutoLaunch) {
+        extensions += `
+        <desktop:Extension Category="windows.startupTask" Executable="${escapeXmlAttr(executable)}" EntryPoint="Windows.FullTrustApplication">
+          <desktop:StartupTask TaskId="SlackStartup" Enabled="true" DisplayName="${escapeXmlAttr(displayName)}" />
+        </desktop:Extension>`;
+    }
+    for (const protocol of protocols) {
+        for (const scheme of asArray(protocol.schemes)) {
+            extensions += `
+          <uap:Extension Category="windows.protocol">
+            <uap:Protocol Name="${escapeXmlAttr(scheme)}">
+               <uap:DisplayName>${escapeXmlAttr(protocol.name)}</uap:DisplayName>
+             </uap:Protocol>
+          </uap:Extension>`;
+        }
+    }
+    for (const fileAssociation of fileAssociations) {
+        for (const ext of asArray(fileAssociation.ext)) {
+            const extEsc = escapeXmlAttr(ext);
+            extensions += `
+          <uap:Extension Category="windows.fileTypeAssociation">
+            <uap:FileTypeAssociation Name="${extEsc}">
+              <uap:SupportedFileTypes>
+                <uap:FileType>.${extEsc}</uap:FileType>
+              </uap:SupportedFileTypes>
+            </uap:FileTypeAssociation>
+          </uap:Extension>`;
+        }
+    }
+    if (customExtensionsPath !== undefined) {
+        const extensionsPath = path.resolve(appDir, customExtensionsPath);
+        extensions += await readFile(extensionsPath, "utf8");
+    }
+    extensions += "</Extensions>";
+    return extensions;
+}
+export function buildWindowsServicesXml(services, defaultExecutable) {
+    if (!services || services.length === 0) {
+        return "";
+    }
+    return services
+        .map(svc => {
+        const exe = escapeXmlAttr(svc.executable || defaultExecutable);
+        // desktop6:Service requires both StartupType ("auto" | "manual" | "disabled") and StartAccount
+        // ("localSystem" | "localService" | "networkService"). Omitting StartAccount produces a manifest
+        // makeappx rejects. See https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-desktop6-service
+        const startupType = escapeXmlAttr(svc.startupType ?? "manual");
+        const startAccount = escapeXmlAttr(svc.startAccount ?? "localSystem");
+        const argsAttr = svc.arguments != null ? ` Arguments="${escapeXmlAttr(svc.arguments)}"` : "";
+        return `
+        <desktop6:Extension Category="windows.service" Executable="${exe}" EntryPoint="Windows.FullTrustApplication">
+          <desktop6:Service Name="${escapeXmlAttr(svc.name)}" StartupType="${startupType}" StartAccount="${startAccount}"${argsAttr} />
+        </desktop6:Extension>`;
+    })
+        .join("");
+}
+/**
+ * Shared build pipeline for the AppX and MSIX targets — both pack via the Windows Kits `makeappx.exe`
+ * and differ only in the bits supplied through {@link AppxPackageBuildConfig}. It walks the app payload
+ * and assets into a `makeappx` mapping file, generates `resources.pri` when scaled assets are present,
+ * writes the manifest, then packs + signs the artifact on the target's build queue.
+ */
+export async function buildAppxPackage(target, packager, options, appOutDir, arch, config) {
+    await config.preflight?.();
+    const artifactName = packager.expandArtifactBeautyNamePattern(options, config.kind, arch);
+    const artifactPath = path.join(target.outDir, artifactName);
+    await packager.emitArtifactBuildStarted({ targetPresentableName: config.presentableName, file: artifactPath, arch });
+    const vendorPath = await getWindowsKitsBundle({ winCodeSign: packager.config.toolsets?.winCodeSign, resourcesDir: packager.buildResourcesDir });
+    const vm = await packager.vm.value;
+    config.onBuilt?.({ arch, artifactPath, vendorPathKit: vendorPath.kit, vm });
+    const stageDir = await createStageDir(target, packager, arch);
+    const mappingFile = stageDir.getTempFile("mapping.txt");
+    const makeAppXArgs = ["pack", "/o" /* overwrite the output file if it exists */, "/f", vm.toVmFile(mappingFile), "/p", vm.toVmFile(artifactPath)];
+    if (packager.compression === "store") {
+        makeAppXArgs.push("/nc");
+    }
+    const mappingList = [];
+    mappingList.push(await buildAppFileMappings(vm, appOutDir));
+    const userAssetDir = await packager.getResource(undefined, APPX_ASSETS_DIR_NAME);
+    const assetInfo = await computeUserAssets(vm, vendorPath.appxAssets, userAssetDir);
+    const userAssets = assetInfo.userAssets;
+    const manifestFile = stageDir.getTempFile("AppxManifest.xml");
+    // https://github.com/electron-userland/electron-builder/issues/2108#issuecomment-333200711
+    const publisher = await (await packager.signingManager.value).computePublisherName(target, options.publisher ?? null);
+    await config.writeManifest(manifestFile, arch, publisher, userAssets);
+    await packager.emitAppxManifestCreated(manifestFile);
+    mappingList.push(assetInfo.mappings);
+    mappingList.push([`"${vm.toVmFile(manifestFile)}" "AppxManifest.xml"`]);
+    if (isScaledAssetsProvided(userAssets)) {
+        const outFile = vm.toVmFile(stageDir.getTempFile("resources.pri"));
+        const makePriExe = path.join(vendorPath.kit, "makepri.exe");
+        const makePriPath = vm.toVmFile(makePriExe);
+        const assetRoot = stageDir.getTempFile("appx/assets");
+        await emptyDir(assetRoot);
+        await Promise.all(assetInfo.allAssets.map(it => copyOrLinkFile(it, path.join(assetRoot, path.basename(it)))));
+        // Wait out any transient AV/share lock on the freshly-extracted kit binary (see ensureNotBusy).
+        await ensureNotBusy(makePriExe);
+        await vm.exec(makePriPath, [
+            "new",
+            "/Overwrite",
+            "/Manifest",
+            vm.toVmFile(manifestFile),
+            "/ProjectRoot",
+            vm.toVmFile(path.dirname(assetRoot)),
+            "/ConfigXml",
+            vm.toVmFile(path.join(getTemplatePath("appx"), "priconfig.xml")),
+            "/OutputFile",
+            outFile,
+        ]);
+        // in addition to resources.pri, resources.scale-140.pri and other such files will be generated
+        for (const resourceFile of (await readdir(stageDir.dir)).filter(it => it.startsWith("resources.")).sort()) {
+            mappingList.push([`"${vm.toVmFile(stageDir.getTempFile(resourceFile))}" "${resourceFile}"`]);
+        }
+        makeAppXArgs.push("/l");
+    }
+    let mapping = "[Files]";
+    for (const list of mappingList) {
+        mapping += "\r\n" + list.join("\r\n");
+    }
+    await writeFile(mappingFile, mapping);
+    packager.debugLogger.add(`${config.kind}.mapping`, mapping);
+    if (options.makeappxArgs != null) {
+        makeAppXArgs.push(...options.makeappxArgs);
+    }
+    target.buildQueueManager.add(async () => {
+        try {
+            const makeAppxExe = path.join(vendorPath.kit, "makeappx.exe");
+            // The kit binary is often freshly extracted to a cold cache; on Windows an AV scanner can briefly
+            // hold a deny-write lock long enough that spawning fails with `spawn UNKNOWN`. Wait for it to clear.
+            await ensureNotBusy(makeAppxExe);
+            await vm.exec(vm.toVmFile(makeAppxExe), makeAppXArgs);
+            await packager.signIf(artifactPath);
+        }
+        finally {
+            await stageDir.cleanup();
+        }
+        await packager.emitArtifactBuildCompleted({
+            file: artifactPath,
+            packager,
+            arch,
+            safeArtifactName: packager.computeSafeArtifactName(artifactName, config.kind),
+            target,
+            isWriteUpdateInfo: options.electronUpdaterAware,
+        });
+    });
+}
+//# sourceMappingURL=winAppUtil.js.map

package/dist/targets/win/winAppUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"winAppUtil.js","sourceRoot":"","sources":["../../../src/targets/win/winAppUtil.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, asArray, copyOrLinkFile, ensureNotBusy, escapeForXml, InvalidConfigurationError, log, sanitizeDirPath, walk } from \"builder-util\"\nimport type { MsixWindowsService } from \"../../options/MsixOptions.js\"\nimport { Nullish } from \"builder-util-runtime\"\nimport _fsExtra from \"fs-extra\"\nconst { emptyDir, readdir, readFile, writeFile } = _fsExtra\nimport * as path from \"path\"\nimport type { Target, TargetSpecificOptions } from \"../../core.js\"\nimport { FileAssociation } from \"../../options/FileAssociation.js\"\nimport { Protocol } from \"../../options/PlatformSpecificBuildOptions.js\"\nimport { getWindowsKitsBundle } from \"../../toolsets/winCodeSign.js\"\nimport { getTemplatePath } from \"../../util/pathManager.js\"\nimport { VmManager } from \"../../vm/vm.js\"\nimport type { WinPackager } from \"../../winPackager.js\"\nimport { createStageDir } from \"../targetUtil.js\"\nimport { CAPABILITIES, isValidCapabilityName } from \"./AppxCapabilities.js\"\n\nexport const APPX_ASSETS_DIR_NAME = \"appx\"\n\n/**\n * Escapes a string for safe use as an XML attribute value (double- or single-quoted) or element text.\n * Aliased to builder-util's {@link escapeForXml} so the Appx/MSIX manifest path shares the single\n * consolidated escaper (PR #9853) and cannot drift from it.\n */\nexport const escapeXmlAttr = escapeForXml\n\n/**\n * Manifest macros whose substituted values are raw user/config text and therefore must be\n * XML-escaped before being placed into the (Appx/MSIX) manifest. Every other macro either\n * returns a prebuilt XML fragment (capabilities, extensions, lockScreen, defaultTile,\n * splashScreen, resourceLanguages, packageIntegrity) or a validated/constant value\n * (version, applicationId, identityName, arch, logo, square*Logo) and must NOT be escaped.\n *\n * Note: `publisher` is emitted inside a single-quoted attribute (`Publisher='...'`). escapeForXml\n * escapes `& < > \" '` — apostrophes become `&apos;`, which is valid inside the single-quoted\n * attribute, so a `'` in a certificate Subject is handled correctly.\n */\nexport const RAW_TEXT_MANIFEST_MACROS: ReadonlySet<string> = new Set([\n  \"publisher\",\n  \"publisherDisplayName\",\n  \"executable\",\n  \"displayName\",\n  \"description\",\n  \"backgroundColor\",\n  \"minVersion\",\n  \"maxVersionTested\",\n])\n\n/**\n * Substitutes `${macro}` placeholders in an Appx/MSIX manifest template. `resolve` returns the\n * RAW value for a macro; values for macros in {@link RAW_TEXT_MANIFEST_MACROS} are XML-escaped\n * here so individual call sites cannot forget to. `resolve` may throw for unknown macros.\n */\nexport function substituteManifestMacros(template: string, resolve: (macro: string) => string): string {\n  return template.replace(/\\${([a-zA-Z0-9]+)}/g, (_match, macro: string): string => {\n    const value = resolve(macro)\n    return RAW_TEXT_MANIFEST_MACROS.has(macro) ? escapeXmlAttr(value) : value\n  })\n}\n\nexport const DEFAULT_RESOURCE_LANG = \"en-US\"\n\nexport const vendorAssetsForDefaultAssets: Record<string, string> = {\n  \"StoreLogo.png\": \"SampleAppx.50x50.png\",\n  \"Square150x150Logo.png\": \"SampleAppx.150x150.png\",\n  \"Square44x44Logo.png\": \"SampleAppx.44x44.png\",\n  \"Wide310x150Logo.png\": \"SampleAppx.310x150.png\",\n}\n\nexport const restrictedApplicationIdValues = [\n  \"CON\",\n  \"PRN\",\n  \"AUX\",\n  \"NUL\",\n  \"COM1\",\n  \"COM2\",\n  \"COM3\",\n  \"COM4\",\n  \"COM5\",\n  \"COM6\",\n  \"COM7\",\n  \"COM8\",\n  \"COM9\",\n  \"LPT1\",\n  \"LPT2\",\n  \"LPT3\",\n  \"LPT4\",\n  \"LPT5\",\n  \"LPT6\",\n  \"LPT7\",\n  \"LPT8\",\n  \"LPT9\",\n]\n\nexport async function computeUserAssets(vm: VmManager, vendorPath: string, userAssetDir: string | null) {\n  const mappings: Array<string> = []\n  let userAssets: Array<string>\n  const allAssets: Array<string> = []\n  if (userAssetDir == null) {\n    userAssets = []\n  } else {\n    userAssets = (await readdir(userAssetDir)).filter(it => !it.startsWith(\".\") && !it.endsWith(\".db\") && it.includes(\".\"))\n    for (const name of userAssets) {\n      // The makeappx mapping file is quote-delimited with no escape mechanism; reject names that would corrupt it / inject extra entries.\n      assertSafeMappingPath(name, \"Asset file name\")\n      mappings.push(`\"${vm.toVmFile(userAssetDir)}${vm.pathSep}${name}\" \"assets\\\\${name}\"`)\n      allAssets.push(path.join(userAssetDir, name))\n    }\n  }\n\n  for (const defaultAsset of Object.keys(vendorAssetsForDefaultAssets)) {\n    if (userAssets.length === 0 || !isDefaultAssetIncluded(userAssets, defaultAsset)) {\n      // codeql[js/shell-command-constructed-from-input] - vendorPath is a trusted toolset bundle dir and the asset name is a hardcoded constant; the joined path is resolved and contained under vendorPath via sanitizeDirPath, and only reaches makeappx as an execFile argv element (array args, no shell)\n      const file = sanitizeDirPath(path.join(vendorPath, \"appxAssets\", vendorAssetsForDefaultAssets[defaultAsset]), vendorPath)\n      mappings.push(`\"${vm.toVmFile(file)}\" \"assets\\\\${defaultAsset}\"`)\n      allAssets.push(file)\n    }\n  }\n\n  return { userAssets, mappings, allAssets }\n}\n\n/**\n * The makeappx mapping file (`/f`) is a quote-delimited, newline-separated `[Files]` list with NO escape\n * mechanism. A path component containing a double-quote or CR/LF would corrupt the format or inject an\n * extra mapping entry (remapping/shadowing files in the produced package), so such paths are rejected.\n */\nexport function assertSafeMappingPath(value: string, kind: string): void {\n  if (/[\"\\r\\n]/.test(value)) {\n    throw new InvalidConfigurationError(`${kind} cannot contain a double-quote or newline — the makeappx mapping file cannot represent it: ${JSON.stringify(value)}`)\n  }\n}\n\n/**\n * Builds the `[Files]` mapping lines for the packaged app payload (`\"<vm source>\" \"app\\<rel>\"`), shared\n * by the AppX and MSIX targets. Each relative path is validated via {@link assertSafeMappingPath}.\n */\nexport async function buildAppFileMappings(vm: VmManager, appOutDir: string): Promise<Array<string>> {\n  return Promise.all(\n    (await walk(appOutDir)).map(file => {\n      let relPath = file.substring(appOutDir.length + 1)\n      if (path.sep !== \"\\\\\") {\n        relPath = relPath.replace(/\\//g, \"\\\\\")\n      }\n      assertSafeMappingPath(relPath, \"Packaged file path\")\n      return `\"${vm.toVmFile(file)}\" \"app\\\\${relPath}\"`\n    })\n  )\n}\n\nexport function validateApplicationId(result: string, contextLabel: string): void {\n  const validCharactersRegex = /^([A-Za-z][A-Za-z0-9]*)(\\.[A-Za-z][A-Za-z0-9]*)*$/\n  if (result.length < 1 || result.length > 64) {\n    throw new InvalidConfigurationError(`${contextLabel} Application.Id must be between 1 and 64 characters in length: ${result}`)\n  }\n  if (!validCharactersRegex.test(result)) {\n    throw new InvalidConfigurationError(\n      `${contextLabel} Application.Id must contain only alpha-numeric characters separated by periods, where each segment starts with an alphabetic character: ${result}`\n    )\n  }\n  if (restrictedApplicationIdValues.includes(result.toUpperCase())) {\n    throw new InvalidConfigurationError(`${contextLabel} Application.Id cannot contain restricted values ${JSON.stringify(restrictedApplicationIdValues)}: ${result}`)\n  }\n}\n\nexport function validateIdentityName(result: string, contextLabel: string): void {\n  const validCharactersRegex = /^[a-zA-Z0-9.-]+$/\n  if (result.length < 3 || result.length > 50) {\n    throw new InvalidConfigurationError(`${contextLabel} identityName must be between 3 and 50 characters in length: ${result}`)\n  }\n  if (!validCharactersRegex.test(result)) {\n    throw new InvalidConfigurationError(`${contextLabel} identityName must contain only alpha-numeric, period, and dash characters: ${result}`)\n  }\n  if (restrictedApplicationIdValues.includes(result.toUpperCase())) {\n    throw new InvalidConfigurationError(`${contextLabel} identityName cannot contain restricted values ${JSON.stringify(restrictedApplicationIdValues)}: ${result}`)\n  }\n}\n\nexport function resourceLanguageTag(userLanguages: Array<string> | Nullish): string {\n  if (userLanguages == null || userLanguages.length === 0) {\n    userLanguages = [DEFAULT_RESOURCE_LANG]\n  }\n  return userLanguages.map(it => `<Resource Language=\"${escapeXmlAttr(it.trim().replace(/_/g, \"-\"))}\" />`).join(\"\\n\")\n}\n\nexport function lockScreenTag(userAssets: Array<string>): string {\n  if (isDefaultAssetIncluded(userAssets, \"BadgeLogo.png\")) {\n    return '<uap:LockScreen Notification=\"badgeAndTileText\" BadgeLogo=\"assets\\\\BadgeLogo.png\" />'\n  }\n  return \"\"\n}\n\nexport function defaultTileTag(userAssets: Array<string>, showNameOnTiles: boolean): string {\n  const defaultTiles: Array<string> = [\"<uap:DefaultTile\", 'Wide310x150Logo=\"assets\\\\Wide310x150Logo.png\"']\n\n  if (isDefaultAssetIncluded(userAssets, \"LargeTile.png\")) {\n    defaultTiles.push('Square310x310Logo=\"assets\\\\LargeTile.png\"')\n  }\n  if (isDefaultAssetIncluded(userAssets, \"SmallTile.png\")) {\n    defaultTiles.push('Square71x71Logo=\"assets\\\\SmallTile.png\"')\n  }\n\n  if (showNameOnTiles) {\n    defaultTiles.push(\">\")\n    defaultTiles.push(\"<uap:ShowNameOnTiles>\")\n    defaultTiles.push(\"<uap:ShowOn\", 'Tile=\"wide310x150Logo\"', \"/>\")\n    defaultTiles.push(\"<uap:ShowOn\", 'Tile=\"square150x150Logo\"', \"/>\")\n    defaultTiles.push(\"</uap:ShowNameOnTiles>\")\n    defaultTiles.push(\"</uap:DefaultTile>\")\n  } else {\n    defaultTiles.push(\"/>\")\n  }\n  return defaultTiles.join(\" \")\n}\n\nexport function splashScreenTag(userAssets: Array<string>): string {\n  if (isDefaultAssetIncluded(userAssets, \"SplashScreen.png\")) {\n    return '<uap:SplashScreen Image=\"assets\\\\SplashScreen.png\" />'\n  }\n  return \"\"\n}\n\nexport function isDefaultAssetIncluded(userAssets: Array<string>, defaultAsset: string): boolean {\n  const defaultAssetName = defaultAsset.substring(0, defaultAsset.indexOf(\".\"))\n  return userAssets.some(it => it.includes(defaultAssetName))\n}\n\nexport function isScaledAssetsProvided(userAssets: Array<string>): boolean {\n  return userAssets.some(it => it.includes(\".scale-\") || it.includes(\".targetsize-\"))\n}\n\n/**\n * Resolves the final applicationId value from config, stripping any leading numeric prefix\n * from identityName (a common user mistake), then validates it.\n */\nexport function resolvePackageApplicationId(applicationId: string | undefined, identityName: string | null | undefined, appName: string, contextLabel: string): string {\n  let result: string\n  const identitynumber = parseInt(identityName as string, 10) || NaN\n\n  if (applicationId) {\n    result = applicationId\n    validateApplicationId(result, contextLabel)\n    return result\n  }\n\n  if (!isNaN(identitynumber) && identityName !== null && identityName !== undefined) {\n    if (identityName[0] === \"0\") {\n      log.warn(`Remove the 0${identitynumber}`)\n      result = identityName.replace(\"0\" + identitynumber.toString(), \"\")\n    } else {\n      log.warn(`Remove the ${identitynumber}`)\n      result = identityName.replace(identitynumber.toString(), \"\")\n    }\n  } else {\n    result = identityName || appName\n  }\n\n  // `result` is a derived value (from identityName or the app name). identityName allows characters\n  // (e.g. a dash) that are invalid in an Application.Id, so surface an actionable error rather than\n  // the raw low-level validation message when the derivation cannot produce a valid id.\n  try {\n    validateApplicationId(result, contextLabel)\n  } catch (e) {\n    throw new InvalidConfigurationError(\n      `${contextLabel} could not derive a valid Application.Id (\"${result}\") from identityName/name — Application.Id allows only alpha-numeric segments separated by periods (no dashes). Set the \"applicationId\" option explicitly. Cause: ${(e as Error).message}`\n    )\n  }\n  return result\n}\n\nexport function resolvePackageIdentityName(identityName: string | null | undefined, appName: string, contextLabel: string): string {\n  const result = identityName || appName\n  validateIdentityName(result, contextLabel)\n  return result\n}\n\nexport function buildCapabilitiesXml(capabilityNames: Array<string> | null | undefined): string {\n  const caps = asArray(capabilityNames)\n  const capSet = new Set(caps)\n\n  const invalid = Array.from(capSet).filter(cap => !isValidCapabilityName(cap))\n  if (invalid.length > 0) {\n    throw new Error(`invalid windows capabilit${invalid.length === 1 ? \"y\" : \"ies\"} specified: ${invalid.join(\", \")}`)\n  }\n\n  capSet.add(\"runFullTrust\")\n\n  const capabilityStrings = CAPABILITIES.filter(cap => capSet.has(cap.name)).map(cap => `  ${cap.toXMLString()}`)\n  return capabilityStrings.join(\"\\n\")\n}\n\nexport interface ExtensionsInput {\n  protocols: Array<Protocol>\n  fileAssociations: Array<FileAssociation>\n  addAutoLaunchExtension?: boolean\n  customExtensionsPath?: string\n  appDir: string\n  executable: string\n  displayName: string\n  dependencyNames?: Record<string, string> | null\n}\n\nexport async function buildExtensionsXml(input: ExtensionsInput): Promise<string> {\n  const { protocols, fileAssociations, appDir, executable, displayName, customExtensionsPath } = input\n\n  let isAddAutoLaunch = input.addAutoLaunchExtension\n  if (isAddAutoLaunch === undefined) {\n    isAddAutoLaunch = input.dependencyNames != null && input.dependencyNames[\"electron-winstore-auto-launch\"] != null\n  }\n\n  if (!isAddAutoLaunch && protocols.length === 0 && fileAssociations.length === 0 && customExtensionsPath === undefined) {\n    return \"\"\n  }\n\n  let extensions = \"<Extensions>\"\n\n  if (isAddAutoLaunch) {\n    extensions += `\n        <desktop:Extension Category=\"windows.startupTask\" Executable=\"${escapeXmlAttr(executable)}\" EntryPoint=\"Windows.FullTrustApplication\">\n          <desktop:StartupTask TaskId=\"SlackStartup\" Enabled=\"true\" DisplayName=\"${escapeXmlAttr(displayName)}\" />\n        </desktop:Extension>`\n  }\n\n  for (const protocol of protocols) {\n    for (const scheme of asArray(protocol.schemes)) {\n      extensions += `\n          <uap:Extension Category=\"windows.protocol\">\n            <uap:Protocol Name=\"${escapeXmlAttr(scheme)}\">\n               <uap:DisplayName>${escapeXmlAttr(protocol.name)}</uap:DisplayName>\n             </uap:Protocol>\n          </uap:Extension>`\n    }\n  }\n\n  for (const fileAssociation of fileAssociations) {\n    for (const ext of asArray(fileAssociation.ext)) {\n      const extEsc = escapeXmlAttr(ext)\n      extensions += `\n          <uap:Extension Category=\"windows.fileTypeAssociation\">\n            <uap:FileTypeAssociation Name=\"${extEsc}\">\n              <uap:SupportedFileTypes>\n                <uap:FileType>.${extEsc}</uap:FileType>\n              </uap:SupportedFileTypes>\n            </uap:FileTypeAssociation>\n          </uap:Extension>`\n    }\n  }\n\n  if (customExtensionsPath !== undefined) {\n    const extensionsPath = path.resolve(appDir, customExtensionsPath)\n    extensions += await readFile(extensionsPath, \"utf8\")\n  }\n\n  extensions += \"</Extensions>\"\n  return extensions\n}\n\nexport function buildWindowsServicesXml(services: ReadonlyArray<MsixWindowsService> | undefined, defaultExecutable: string): string {\n  if (!services || services.length === 0) {\n    return \"\"\n  }\n  return services\n    .map(svc => {\n      const exe = escapeXmlAttr(svc.executable || defaultExecutable)\n      // desktop6:Service requires both StartupType (\"auto\" | \"manual\" | \"disabled\") and StartAccount\n      // (\"localSystem\" | \"localService\" | \"networkService\"). Omitting StartAccount produces a manifest\n      // makeappx rejects. See https://learn.microsoft.com/uwp/schemas/appxpackage/uapmanifestschema/element-desktop6-service\n      const startupType = escapeXmlAttr(svc.startupType ?? \"manual\")\n      const startAccount = escapeXmlAttr(svc.startAccount ?? \"localSystem\")\n      const argsAttr = svc.arguments != null ? ` Arguments=\"${escapeXmlAttr(svc.arguments)}\"` : \"\"\n      return `\n        <desktop6:Extension Category=\"windows.service\" Executable=\"${exe}\" EntryPoint=\"Windows.FullTrustApplication\">\n          <desktop6:Service Name=\"${escapeXmlAttr(svc.name)}\" StartupType=\"${startupType}\" StartAccount=\"${startAccount}\"${argsAttr} />\n        </desktop6:Extension>`\n    })\n    .join(\"\")\n}\n\n/** Options shared by the AppX and MSIX targets that the build pipeline reads directly. */\nexport interface AppxPackageBuildOptions extends TargetSpecificOptions {\n  readonly publisher?: string | null\n  readonly makeappxArgs?: Array<string> | null\n  readonly electronUpdaterAware?: boolean\n}\n\nexport interface AppxBuildContext {\n  readonly arch: Arch\n  readonly artifactPath: string\n  readonly vendorPathKit: string\n  readonly vm: VmManager\n}\n\nexport interface AppxPackageBuildConfig {\n  /** `\"appx\"` | `\"msix\"` — drives artifact naming, the safe-artifact name, and the debug-log key. */\n  readonly kind: \"appx\" | \"msix\"\n  /** Human-facing target name for build-progress events (`\"AppX\"` | `\"MSIX\"`). */\n  readonly presentableName: string\n  /** Writes the target-specific `AppxManifest.xml` (AppX and MSIX use different templates/macros). */\n  writeManifest(manifestFile: string, arch: Arch, publisher: string, userAssets: Array<string>): Promise<void>\n  /** Optional pre-flight validation (e.g. the MSIX legacy-toolset guard); a throw aborts the build. */\n  preflight?(): void | Promise<void>\n  /**\n   * Optional hook invoked synchronously (before the deferred pack task is queued) with the build\n   * context. MSIX uses it to record the per-arch artifact + VM/kit paths so `finishBuild` can assemble\n   * the `.msixbundle` / `.msixupload`.\n   */\n  onBuilt?(ctx: AppxBuildContext): void\n}\n\n/**\n * Shared build pipeline for the AppX and MSIX targets — both pack via the Windows Kits `makeappx.exe`\n * and differ only in the bits supplied through {@link AppxPackageBuildConfig}. It walks the app payload\n * and assets into a `makeappx` mapping file, generates `resources.pri` when scaled assets are present,\n * writes the manifest, then packs + signs the artifact on the target's build queue.\n */\nexport async function buildAppxPackage(\n  target: Target,\n  packager: WinPackager,\n  options: AppxPackageBuildOptions,\n  appOutDir: string,\n  arch: Arch,\n  config: AppxPackageBuildConfig\n): Promise<void> {\n  await config.preflight?.()\n\n  const artifactName = packager.expandArtifactBeautyNamePattern(options, config.kind, arch)\n  const artifactPath = path.join(target.outDir, artifactName)\n  await packager.emitArtifactBuildStarted({ targetPresentableName: config.presentableName, file: artifactPath, arch })\n\n  const vendorPath = await getWindowsKitsBundle({ winCodeSign: packager.config.toolsets?.winCodeSign, resourcesDir: packager.buildResourcesDir })\n  const vm = await packager.vm.value\n\n  config.onBuilt?.({ arch, artifactPath, vendorPathKit: vendorPath.kit, vm })\n\n  const stageDir = await createStageDir(target, packager, arch)\n\n  const mappingFile = stageDir.getTempFile(\"mapping.txt\")\n  const makeAppXArgs = [\"pack\", \"/o\" /* overwrite the output file if it exists */, \"/f\", vm.toVmFile(mappingFile), \"/p\", vm.toVmFile(artifactPath)]\n  if (packager.compression === \"store\") {\n    makeAppXArgs.push(\"/nc\")\n  }\n\n  const mappingList: Array<Array<string>> = []\n  mappingList.push(await buildAppFileMappings(vm, appOutDir))\n\n  const userAssetDir = await packager.getResource(undefined, APPX_ASSETS_DIR_NAME)\n  const assetInfo = await computeUserAssets(vm, vendorPath.appxAssets, userAssetDir)\n  const userAssets = assetInfo.userAssets\n\n  const manifestFile = stageDir.getTempFile(\"AppxManifest.xml\")\n  // https://github.com/electron-userland/electron-builder/issues/2108#issuecomment-333200711\n  const publisher = await (await packager.signingManager.value).computePublisherName(target, options.publisher ?? null)\n  await config.writeManifest(manifestFile, arch, publisher, userAssets)\n\n  await packager.emitAppxManifestCreated(manifestFile)\n  mappingList.push(assetInfo.mappings)\n  mappingList.push([`\"${vm.toVmFile(manifestFile)}\" \"AppxManifest.xml\"`])\n\n  if (isScaledAssetsProvided(userAssets)) {\n    const outFile = vm.toVmFile(stageDir.getTempFile(\"resources.pri\"))\n    const makePriExe = path.join(vendorPath.kit, \"makepri.exe\")\n    const makePriPath = vm.toVmFile(makePriExe)\n\n    const assetRoot = stageDir.getTempFile(\"appx/assets\")\n    await emptyDir(assetRoot)\n    await Promise.all(assetInfo.allAssets.map(it => copyOrLinkFile(it, path.join(assetRoot, path.basename(it)))))\n\n    // Wait out any transient AV/share lock on the freshly-extracted kit binary (see ensureNotBusy).\n    await ensureNotBusy(makePriExe)\n    await vm.exec(makePriPath, [\n      \"new\",\n      \"/Overwrite\",\n      \"/Manifest\",\n      vm.toVmFile(manifestFile),\n      \"/ProjectRoot\",\n      vm.toVmFile(path.dirname(assetRoot)),\n      \"/ConfigXml\",\n      vm.toVmFile(path.join(getTemplatePath(\"appx\"), \"priconfig.xml\")),\n      \"/OutputFile\",\n      outFile,\n    ])\n\n    // in addition to resources.pri, resources.scale-140.pri and other such files will be generated\n    for (const resourceFile of (await readdir(stageDir.dir)).filter(it => it.startsWith(\"resources.\")).sort()) {\n      mappingList.push([`\"${vm.toVmFile(stageDir.getTempFile(resourceFile))}\" \"${resourceFile}\"`])\n    }\n    makeAppXArgs.push(\"/l\")\n  }\n\n  let mapping = \"[Files]\"\n  for (const list of mappingList) {\n    mapping += \"\\r\\n\" + list.join(\"\\r\\n\")\n  }\n  await writeFile(mappingFile, mapping)\n  packager.debugLogger.add(`${config.kind}.mapping`, mapping)\n\n  if (options.makeappxArgs != null) {\n    makeAppXArgs.push(...options.makeappxArgs)\n  }\n\n  target.buildQueueManager.add(async () => {\n    try {\n      const makeAppxExe = path.join(vendorPath.kit, \"makeappx.exe\")\n      // The kit binary is often freshly extracted to a cold cache; on Windows an AV scanner can briefly\n      // hold a deny-write lock long enough that spawning fails with `spawn UNKNOWN`. Wait for it to clear.\n      await ensureNotBusy(makeAppxExe)\n      await vm.exec(vm.toVmFile(makeAppxExe), makeAppXArgs)\n      await packager.signIf(artifactPath)\n    } finally {\n      await stageDir.cleanup()\n    }\n\n    await packager.emitArtifactBuildCompleted({\n      file: artifactPath,\n      packager,\n      arch,\n      safeArtifactName: packager.computeSafeArtifactName(artifactName, config.kind),\n      target,\n      isWriteUpdateInfo: options.electronUpdaterAware,\n    })\n  })\n}\n"]}

package/dist/toolsets/custom.js

@@ -69,8 +69,10 @@ async function _resolveCustomToolsetPath(custom, resourcesDir) {
         const cacheDir = await cacheDirectoryOverrideAllowed.value;
         const customToolsetDir = path.join(cacheDir, "custom-toolsets");
         await mkdir(customToolsetDir, { recursive: true });
-        // wipe first to ensure idempotent extraction if the source file changed since last extraction
-        const toolsetTarget = path.join(customToolsetDir, releaseName);
+        // wipe first to ensure idempotent extraction if the source file changed since last extraction.
+        // Contain the destination within customToolsetDir (mirrors the `url` branch): `version` is a free-form
+        // config field, so a `../…` value must not let rmdir/extract escape the cache directory.
+        const toolsetTarget = sanitizeDirPath(path.join(customToolsetDir, releaseName), customToolsetDir);
         if (await exists(toolsetTarget)) {
             await rmdir(toolsetTarget, { recursive: true });
         }

package/dist/toolsets/custom.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"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","sourcesContent":["import { exists, sanitizeDirPath, validateSecuredUrl } from \"builder-util\"\nimport { mkdir, rmdir, stat } from \"fs/promises\"\nimport * as path from \"path\"\nimport { ToolsetCustom } from \"../configuration.js\"\nimport { cacheDirectoryOverrideAllowed, downloadBuilderToolset, extractArchive, hashUrlSafe } from \"../util/electronGet.js\"\n\nasync function validateCustomToolset(custom: ToolsetCustom, resourcesDir?: string) {\n  const url = custom.url.trim()\n  try {\n    const parsed = validateSecuredUrl(url)\n    if (parsed.pathname.endsWith(\"/\")) {\n      throw new Error(`URL must point to a file, but got ${parsed.href}`)\n    }\n    return { toolset: custom, type: \"url\" }\n  } catch {\n    // Ignore. If the URL is invalid, validate it as a file path\n  }\n  if (url.startsWith(\"file://\")) {\n    const p = url.slice(\"file://\".length)\n    const isWithinResources = resourcesDir ? path.normalize(p).startsWith(path.normalize(resourcesDir + path.sep)) : false\n    const isValid = path.isAbsolute(p) || isWithinResources\n    const type =\n      isValid &&\n      (await exists(p)) &&\n      (await stat(p)\n        .then(s => (s.isDirectory() ? \"directory\" : s.isFile() ? \"file\" : false))\n        .catch(() => false))\n    if (type) {\n      return { toolset: custom, type }\n    }\n  }\n  throw new Error(`Invalid custom toolset: ${url}. Must be a valid https:// URL or a file:// path.`)\n}\n\n// Strip the file:// prefix and sanitize the path against resourcesDir (relative paths must be within it)\nfunction resolveFilePath(url: string, resourcesDir?: string): string {\n  const p = url.startsWith(\"file://\") ? url.slice(\"file://\".length) : url\n  return path.isAbsolute(p) ? sanitizeDirPath(p) : sanitizeDirPath(p, resourcesDir)\n}\n\nconst _customToolsetCache = new Map<string, Promise<string>>()\n\nexport function clearCustomToolsetCache(): void {\n  _customToolsetCache.clear()\n}\n\nexport function getCustomToolsetPath(custom: ToolsetCustom, resourcesDir?: string): Promise<string> {\n  const key = JSON.stringify({ url: custom.url, checksum: custom.checksum ?? \"\", resourcesDir })\n  let cached = _customToolsetCache.get(key)\n  if (cached == null) {\n    cached = _resolveCustomToolsetPath(custom, resourcesDir)\n    _customToolsetCache.set(key, cached)\n  }\n  return cached\n}\n\nasync function _resolveCustomToolsetPath(custom: ToolsetCustom, resourcesDir?: string): Promise<string> {\n  const { type, toolset } = await validateCustomToolset(custom, resourcesDir)\n\n  if (type === \"directory\") {\n    return resolveFilePath(toolset.url, resourcesDir)\n  }\n\n  if (!toolset.checksum) {\n    throw new Error(`ToolsetCustom.checksum is required for ${type} toolsets (url: ${toolset.url})`)\n  }\n\n  const binaryVersion = toolset.version ?? toolset.checksum.substring(0, 8)\n  const releaseName = `${binaryVersion}-${hashUrlSafe(toolset.url)}`\n\n  if (type === \"url\") {\n    return downloadBuilderToolset({\n      releaseName: releaseName,\n      filenameWithExt: path.basename(toolset.url),\n      checksums: { [path.basename(toolset.url)]: toolset.checksum },\n      overrideUrl: toolset.url,\n    })\n  } else if (type === \"file\") {\n    const cacheDir = await cacheDirectoryOverrideAllowed.value\n    const customToolsetDir = path.join(cacheDir, \"custom-toolsets\")\n    await mkdir(customToolsetDir, { recursive: true })\n\n    // wipe first to ensure idempotent extraction if the source file changed since last extraction\n    const toolsetTarget = path.join(customToolsetDir, releaseName)\n    if (await exists(toolsetTarget)) {\n      await rmdir(toolsetTarget, { recursive: true })\n    }\n    await extractArchive(resolveFilePath(toolset.url, resourcesDir), toolsetTarget)\n    return toolsetTarget\n  }\n\n  throw new Error(`Unsupported custom toolset type: ${type}`)\n}\n"]}
+{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"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","sourcesContent":["import { exists, sanitizeDirPath, validateSecuredUrl } from \"builder-util\"\nimport { mkdir, rmdir, stat } from \"fs/promises\"\nimport * as path from \"path\"\nimport { ToolsetCustom } from \"../configuration.js\"\nimport { cacheDirectoryOverrideAllowed, downloadBuilderToolset, extractArchive, hashUrlSafe } from \"../util/electronGet.js\"\n\nasync function validateCustomToolset(custom: ToolsetCustom, resourcesDir?: string) {\n  const url = custom.url.trim()\n  try {\n    const parsed = validateSecuredUrl(url)\n    if (parsed.pathname.endsWith(\"/\")) {\n      throw new Error(`URL must point to a file, but got ${parsed.href}`)\n    }\n    return { toolset: custom, type: \"url\" }\n  } catch {\n    // Ignore. If the URL is invalid, validate it as a file path\n  }\n  if (url.startsWith(\"file://\")) {\n    const p = url.slice(\"file://\".length)\n    const isWithinResources = resourcesDir ? path.normalize(p).startsWith(path.normalize(resourcesDir + path.sep)) : false\n    const isValid = path.isAbsolute(p) || isWithinResources\n    const type =\n      isValid &&\n      (await exists(p)) &&\n      (await stat(p)\n        .then(s => (s.isDirectory() ? \"directory\" : s.isFile() ? \"file\" : false))\n        .catch(() => false))\n    if (type) {\n      return { toolset: custom, type }\n    }\n  }\n  throw new Error(`Invalid custom toolset: ${url}. Must be a valid https:// URL or a file:// path.`)\n}\n\n// Strip the file:// prefix and sanitize the path against resourcesDir (relative paths must be within it)\nfunction resolveFilePath(url: string, resourcesDir?: string): string {\n  const p = url.startsWith(\"file://\") ? url.slice(\"file://\".length) : url\n  return path.isAbsolute(p) ? sanitizeDirPath(p) : sanitizeDirPath(p, resourcesDir)\n}\n\nconst _customToolsetCache = new Map<string, Promise<string>>()\n\nexport function clearCustomToolsetCache(): void {\n  _customToolsetCache.clear()\n}\n\nexport function getCustomToolsetPath(custom: ToolsetCustom, resourcesDir?: string): Promise<string> {\n  const key = JSON.stringify({ url: custom.url, checksum: custom.checksum ?? \"\", resourcesDir })\n  let cached = _customToolsetCache.get(key)\n  if (cached == null) {\n    cached = _resolveCustomToolsetPath(custom, resourcesDir)\n    _customToolsetCache.set(key, cached)\n  }\n  return cached\n}\n\nasync function _resolveCustomToolsetPath(custom: ToolsetCustom, resourcesDir?: string): Promise<string> {\n  const { type, toolset } = await validateCustomToolset(custom, resourcesDir)\n\n  if (type === \"directory\") {\n    return resolveFilePath(toolset.url, resourcesDir)\n  }\n\n  if (!toolset.checksum) {\n    throw new Error(`ToolsetCustom.checksum is required for ${type} toolsets (url: ${toolset.url})`)\n  }\n\n  const binaryVersion = toolset.version ?? toolset.checksum.substring(0, 8)\n  const releaseName = `${binaryVersion}-${hashUrlSafe(toolset.url)}`\n\n  if (type === \"url\") {\n    return downloadBuilderToolset({\n      releaseName: releaseName,\n      filenameWithExt: path.basename(toolset.url),\n      checksums: { [path.basename(toolset.url)]: toolset.checksum },\n      overrideUrl: toolset.url,\n    })\n  } else if (type === \"file\") {\n    const cacheDir = await cacheDirectoryOverrideAllowed.value\n    const customToolsetDir = path.join(cacheDir, \"custom-toolsets\")\n    await mkdir(customToolsetDir, { recursive: true })\n\n    // wipe first to ensure idempotent extraction if the source file changed since last extraction.\n    // Contain the destination within customToolsetDir (mirrors the `url` branch): `version` is a free-form\n    // config field, so a `../…` value must not let rmdir/extract escape the cache directory.\n    const toolsetTarget = sanitizeDirPath(path.join(customToolsetDir, releaseName), customToolsetDir)\n    if (await exists(toolsetTarget)) {\n      await rmdir(toolsetTarget, { recursive: true })\n    }\n    await extractArchive(resolveFilePath(toolset.url, resourcesDir), toolsetTarget)\n    return toolsetTarget\n  }\n\n  throw new Error(`Unsupported custom toolset type: ${type}`)\n}\n"]}

package/dist/toolsets/icons.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../../src/toolsets/icons.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAqBnD,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9G;AAED,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAID,wBAAsB,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAcxI"}
+{"version":3,"file":"icons.d.ts","sourceRoot":"","sources":["../../src/toolsets/icons.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAwBnD,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9G;AAED,KAAK,qBAAqB,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAAA;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAID,wBAAsB,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAcxI"}

package/dist/toolsets/icons.js

@@ -5,7 +5,7 @@ import { withIconsLock } from "../util/toolsetLock.js";
 import { getCustomToolsetPath } from "./custom.js";
 import { resolveToolsetVersion } from "./version.js";
 // Newest icons-conversion bundle — selected when the config is unset / null / "latest".
-const ICONS_LATEST = "1.2.1";
+const ICONS_LATEST = "1.2.3";
 const iconsToolsChecksums = {
     "1.1.0": {
         "icons-bundle.tar.gz": "2241c9501aa5ddd19317956449f50a1bc311df2c34058aae9bf8bfe62081eaec",
@@ -16,6 +16,9 @@ const iconsToolsChecksums = {
     "1.2.1": {
         "icons-bundle.tar.gz": "193241afc7c81ab165fa0af15ef0af88f796eb69e8e5bb4249a49310d8be242a",
     },
+    "1.2.3": {
+        "icons-bundle.tar.gz": "4e5bb546c9d3ab0c2bbacc22857467bf415f742a34c2be9dd138779d2fc066f9",
+    },
 };
 export async function getIconsToolsetPath(icons, resourcesDir) {
     if (typeof icons === "object" && icons != null) {

package/dist/toolsets/icons.js.map

@@ -1 +1 @@
-{"version":3,"file":"icons.js","sourceRoot":"","sources":["../../src/toolsets/icons.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACvF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,wFAAwF;AACxF,MAAM,YAAY,GAAG,OAAO,CAAA;AAE5B,MAAM,mBAAmB,GAAG;IAC1B,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;CACO,CAAA;AAEV,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAA6B,EAAE,YAAoB;IAC3F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAC/C,OAAO,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,WAAW,EAAE,SAAS,OAAO,EAAE;QAC/B,eAAe,EAAE,qBAAqB;QACtC,SAAS,EAAE,mBAAmB,CAAC,OAAO,CAAC;QACvC,aAAa,EAAE,6CAA6C;KAC7D,CAAC,CAAA;AACJ,CAAC;AAUD,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAU,CAAA;AAE5D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAyB;IACvH,IAAI,CAAE,oBAA0C,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,yBAAyB,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAA;IACpF,CAAC;IACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAE1C,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAA;IAC1F,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,yBAAyB,CAAC,0CAA0C,UAAU,EAAE,CAAC,CAAA;IAC7F,CAAC;IACD,sLAAsL;IACtL,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AACxJ,CAAC","sourcesContent":["import { exec, exists, InvalidConfigurationError, sanitizeDirPath } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { withIconsLock } from \"../util/toolsetLock.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest icons-conversion bundle — selected when the config is unset / null / \"latest\".\nconst ICONS_LATEST = \"1.2.1\"\n\nconst iconsToolsChecksums = {\n  \"1.1.0\": {\n    \"icons-bundle.tar.gz\": \"2241c9501aa5ddd19317956449f50a1bc311df2c34058aae9bf8bfe62081eaec\",\n  },\n  \"1.2.0\": {\n    \"icons-bundle.tar.gz\": \"788add2400487fe00d5ceac4a8347bd71fc43c8c988fde879f929992ea0c03ea\",\n  },\n  \"1.2.1\": {\n    \"icons-bundle.tar.gz\": \"193241afc7c81ab165fa0af15ef0af88f796eb69e8e5bb4249a49310d8be242a\",\n  },\n} as const\n\nexport async function getIconsToolsetPath(icons: ToolsetConfig[\"icons\"], resourcesDir: string): Promise<string> {\n  if (typeof icons === \"object\" && icons != null) {\n    return getCustomToolsetPath(icons, resourcesDir)\n  }\n  const version = resolveToolsetVersion(icons, ICONS_LATEST)\n  return downloadBuilderToolset({\n    releaseName: `icons@${version}`,\n    filenameWithExt: \"icons-bundle.tar.gz\",\n    checksums: iconsToolsChecksums[version],\n    githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n  })\n}\n\ntype IconConversionOptions = {\n  inputFile: string\n  outputFormat: \"icns\" | \"ico\" | \"set\"\n  outDir: string\n  iconsToolset: ToolsetConfig[\"icons\"]\n  resourcesDir: string\n}\n\nconst VALID_OUTPUT_FORMATS = [\"icns\", \"ico\", \"set\"] as const\n\nexport async function runIconsTool({ inputFile, outputFormat, outDir, iconsToolset, resourcesDir }: IconConversionOptions): Promise<void> {\n  if (!(VALID_OUTPUT_FORMATS as readonly string[]).includes(outputFormat)) {\n    throw new InvalidConfigurationError(`Invalid icon output format: ${outputFormat}`)\n  }\n  const safeInput = sanitizeDirPath(inputFile)\n  const safeOutDir = sanitizeDirPath(outDir)\n\n  const toolsetPath = await getIconsToolsetPath(iconsToolset, resourcesDir)\n  const scriptPath = sanitizeDirPath(path.resolve(toolsetPath, \"icon-tool.js\"), toolsetPath)\n  if (!(await exists(scriptPath))) {\n    throw new InvalidConfigurationError(`Icons tool not found at expected path: ${scriptPath}`)\n  }\n  // Serialize icon-tool spawns across processes: each reserves a large WebAssembly.Memory, andrunning many in parallel (e.g. across vitest workers) exhausts memory. See withIconsLock.\n  await withIconsLock(() => exec(process.execPath, [scriptPath, `--input`, safeInput, `--format`, outputFormat, `--out`, safeOutDir], { shell: false }))\n}\n"]}
+{"version":3,"file":"icons.js","sourceRoot":"","sources":["../../src/toolsets/icons.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AACvF,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,wFAAwF;AACxF,MAAM,YAAY,GAAG,OAAO,CAAA;AAE5B,MAAM,mBAAmB,GAAG;IAC1B,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,kEAAkE;KAC1F;CACO,CAAA;AAEV,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,KAA6B,EAAE,YAAoB;IAC3F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;QAC/C,OAAO,oBAAoB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAClD,CAAC;IACD,MAAM,OAAO,GAAG,qBAAqB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IAC1D,OAAO,sBAAsB,CAAC;QAC5B,WAAW,EAAE,SAAS,OAAO,EAAE;QAC/B,eAAe,EAAE,qBAAqB;QACtC,SAAS,EAAE,mBAAmB,CAAC,OAAO,CAAC;QACvC,aAAa,EAAE,6CAA6C;KAC7D,CAAC,CAAA;AACJ,CAAC;AAUD,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAU,CAAA;AAE5D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,EAAyB;IACvH,IAAI,CAAE,oBAA0C,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACxE,MAAM,IAAI,yBAAyB,CAAC,+BAA+B,YAAY,EAAE,CAAC,CAAA;IACpF,CAAC;IACD,MAAM,SAAS,GAAG,eAAe,CAAC,SAAS,CAAC,CAAA;IAC5C,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAE1C,MAAM,WAAW,GAAG,MAAM,mBAAmB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;IACzE,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,EAAE,WAAW,CAAC,CAAA;IAC1F,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,yBAAyB,CAAC,0CAA0C,UAAU,EAAE,CAAC,CAAA;IAC7F,CAAC;IACD,sLAAsL;IACtL,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;AACxJ,CAAC","sourcesContent":["import { exec, exists, InvalidConfigurationError, sanitizeDirPath } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { withIconsLock } from \"../util/toolsetLock.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest icons-conversion bundle — selected when the config is unset / null / \"latest\".\nconst ICONS_LATEST = \"1.2.3\"\n\nconst iconsToolsChecksums = {\n  \"1.1.0\": {\n    \"icons-bundle.tar.gz\": \"2241c9501aa5ddd19317956449f50a1bc311df2c34058aae9bf8bfe62081eaec\",\n  },\n  \"1.2.0\": {\n    \"icons-bundle.tar.gz\": \"788add2400487fe00d5ceac4a8347bd71fc43c8c988fde879f929992ea0c03ea\",\n  },\n  \"1.2.1\": {\n    \"icons-bundle.tar.gz\": \"193241afc7c81ab165fa0af15ef0af88f796eb69e8e5bb4249a49310d8be242a\",\n  },\n  \"1.2.3\": {\n    \"icons-bundle.tar.gz\": \"4e5bb546c9d3ab0c2bbacc22857467bf415f742a34c2be9dd138779d2fc066f9\",\n  },\n} as const\n\nexport async function getIconsToolsetPath(icons: ToolsetConfig[\"icons\"], resourcesDir: string): Promise<string> {\n  if (typeof icons === \"object\" && icons != null) {\n    return getCustomToolsetPath(icons, resourcesDir)\n  }\n  const version = resolveToolsetVersion(icons, ICONS_LATEST)\n  return downloadBuilderToolset({\n    releaseName: `icons@${version}`,\n    filenameWithExt: \"icons-bundle.tar.gz\",\n    checksums: iconsToolsChecksums[version],\n    githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n  })\n}\n\ntype IconConversionOptions = {\n  inputFile: string\n  outputFormat: \"icns\" | \"ico\" | \"set\"\n  outDir: string\n  iconsToolset: ToolsetConfig[\"icons\"]\n  resourcesDir: string\n}\n\nconst VALID_OUTPUT_FORMATS = [\"icns\", \"ico\", \"set\"] as const\n\nexport async function runIconsTool({ inputFile, outputFormat, outDir, iconsToolset, resourcesDir }: IconConversionOptions): Promise<void> {\n  if (!(VALID_OUTPUT_FORMATS as readonly string[]).includes(outputFormat)) {\n    throw new InvalidConfigurationError(`Invalid icon output format: ${outputFormat}`)\n  }\n  const safeInput = sanitizeDirPath(inputFile)\n  const safeOutDir = sanitizeDirPath(outDir)\n\n  const toolsetPath = await getIconsToolsetPath(iconsToolset, resourcesDir)\n  const scriptPath = sanitizeDirPath(path.resolve(toolsetPath, \"icon-tool.js\"), toolsetPath)\n  if (!(await exists(scriptPath))) {\n    throw new InvalidConfigurationError(`Icons tool not found at expected path: ${scriptPath}`)\n  }\n  // Serialize icon-tool spawns across processes: each reserves a large WebAssembly.Memory, andrunning many in parallel (e.g. across vitest workers) exhausts memory. See withIconsLock.\n  await withIconsLock(() => exec(process.execPath, [scriptPath, `--input`, safeInput, `--format`, outputFormat, `--out`, safeOutDir], { shell: false }))\n}\n"]}

package/dist/toolsets/winCodeSign.d.ts

@@ -77,6 +77,15 @@ export declare function getWindowsKitsBundle({ winCodeSign, resourcesDir }: {
     appxAssets: string;
 }>;
 export declare function isOldWin6(): boolean;
+/**
+ * True only for the explicit legacy winCodeSign pin (`"0.0.0"` → winCodeSign-2.6.0). That bundle lacks
+ * the modern Windows Kits SDK (no MSIX-capable `makeappx`/`makepri`), so it cannot build MSIX — only the
+ * MSIX target gates on this. AppX still builds fine with the legacy bundle (it has its own legacy-bundle
+ * `signtool` handling in `getWindowsSignToolExe`). Unset / `null` / `"latest"` and any modern version pin
+ * resolve to a modern bundle; a custom `{ url, … }` toolset is the caller's responsibility and is not
+ * treated as legacy.
+ */
+export declare function isLegacyWinCodeSign(winCodeSign: ToolsetConfig["winCodeSign"] | Nullish): boolean;
 export declare function getAtsBundleDir(winCodeSign: string): Promise<string>;
 export declare function getDotnetRuntimeDir(winCodeSign: string): Promise<string>;
 export declare function getRceditBundle(winCodeSign: ToolsetConfig["winCodeSign"] | Nullish, resourcesDir?: string): Promise<{

package/dist/toolsets/winCodeSign.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"winCodeSign.d.ts","sourceRoot":"","sources":["../../src/toolsets/winCodeSign.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAkB,MAAM,wBAAwB,CAAA;AAMjE,eAAO,MAAM,mBAAmB,UAAU,CAAA;AAU1C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DvB,CAAA;AAaV,wBAAsB,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAOlJ;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE;IAAE,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE;;;GAevJ;AAED,wBAAgB,SAAS,YAGxB;AA2DD,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW1E;AAED,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9E;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,EAAE,YAAY,SAAK;;;GAgB3G"}
+{"version":3,"file":"winCodeSign.d.ts","sourceRoot":"","sources":["../../src/toolsets/winCodeSign.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAG9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAkB,MAAM,wBAAwB,CAAA;AAMjE,eAAO,MAAM,mBAAmB,UAAU,CAAA;AAU1C,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0DvB,CAAA;AAaV,wBAAsB,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAOlJ;AAED;;;;;;;;GAQG;AACH,wBAAsB,oBAAoB,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE;IAAE,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE;;;GAevJ;AAED,wBAAgB,SAAS,YAGxB;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,GAAG,OAAO,CAEhG;AA2DD,wBAAsB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW1E;AAED,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAW9E;AAED,wBAAsB,eAAe,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,GAAG,OAAO,EAAE,YAAY,SAAK;;;GAgB3G"}