app-builder-lib 27.0.0-alpha.13 → 27.0.0-alpha.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/codeSign/win/hsmSignManager.d.ts.map +1 -1
- package/dist/codeSign/win/hsmSignManager.js +3 -2
- package/dist/codeSign/win/hsmSignManager.js.map +1 -1
- package/dist/codeSign/win/pkcs11SignManager.d.ts.map +1 -1
- package/dist/codeSign/win/pkcs11SignManager.js +2 -1
- package/dist/codeSign/win/pkcs11SignManager.js.map +1 -1
- package/dist/codeSign/win/signtoolBaseSignManager.d.ts.map +1 -1
- package/dist/codeSign/win/signtoolBaseSignManager.js +15 -5
- package/dist/codeSign/win/signtoolBaseSignManager.js.map +1 -1
- package/dist/configuration.d.ts +78 -20
- package/dist/configuration.d.ts.map +1 -1
- package/dist/configuration.js.map +1 -1
- package/dist/indexInternal.d.ts +5 -3
- package/dist/indexInternal.d.ts.map +1 -1
- package/dist/indexInternal.js +4 -3
- package/dist/indexInternal.js.map +1 -1
- package/dist/options/FileAssociation.d.ts +1 -1
- package/dist/options/FileAssociation.js.map +1 -1
- package/dist/options/PlatformSpecificBuildOptions.d.ts +4 -1
- package/dist/options/PlatformSpecificBuildOptions.d.ts.map +1 -1
- package/dist/options/PlatformSpecificBuildOptions.js.map +1 -1
- package/dist/options/SnapOptions.d.ts +13 -3
- package/dist/options/SnapOptions.d.ts.map +1 -1
- package/dist/options/SnapOptions.js.map +1 -1
- package/dist/options/macOptions.d.ts +9 -6
- package/dist/options/macOptions.d.ts.map +1 -1
- package/dist/options/macOptions.js.map +1 -1
- package/dist/options/winOptions.d.ts +2 -2
- package/dist/options/winOptions.js.map +1 -1
- package/dist/packager.d.ts +22 -0
- package/dist/packager.d.ts.map +1 -1
- package/dist/packager.js +115 -66
- package/dist/packager.js.map +1 -1
- package/dist/platformPackager.d.ts.map +1 -1
- package/dist/platformPackager.js +10 -8
- package/dist/platformPackager.js.map +1 -1
- package/dist/publish/PublishManager.d.ts +5 -0
- package/dist/publish/PublishManager.d.ts.map +1 -1
- package/dist/publish/PublishManager.js +102 -24
- package/dist/publish/PublishManager.js.map +1 -1
- package/dist/publish/manifestUploadCheck.d.ts +12 -0
- package/dist/publish/manifestUploadCheck.d.ts.map +1 -1
- package/dist/publish/manifestUploadCheck.js +84 -12
- package/dist/publish/manifestUploadCheck.js.map +1 -1
- package/dist/publish/updateInfoBuilder.d.ts.map +1 -1
- package/dist/publish/updateInfoBuilder.js +12 -7
- package/dist/publish/updateInfoBuilder.js.map +1 -1
- package/dist/publish/updateManifestVerifier.d.ts +54 -0
- package/dist/publish/updateManifestVerifier.d.ts.map +1 -1
- package/dist/publish/updateManifestVerifier.js +121 -1
- package/dist/publish/updateManifestVerifier.js.map +1 -1
- package/dist/publish/updaterSettingsCheck.d.ts +8 -0
- package/dist/publish/updaterSettingsCheck.d.ts.map +1 -0
- package/dist/publish/updaterSettingsCheck.js +136 -0
- package/dist/publish/updaterSettingsCheck.js.map +1 -0
- package/dist/targets/ArchiveTarget.js +1 -1
- package/dist/targets/ArchiveTarget.js.map +1 -1
- package/dist/targets/archive.d.ts.map +1 -1
- package/dist/targets/archive.js +4 -3
- package/dist/targets/archive.js.map +1 -1
- package/dist/targets/blockmap/blockmap.d.ts +30 -0
- package/dist/targets/blockmap/blockmap.d.ts.map +1 -1
- package/dist/targets/blockmap/blockmap.js +99 -31
- package/dist/targets/blockmap/blockmap.js.map +1 -1
- package/dist/targets/blockmap/blockmapV3.d.ts +36 -0
- package/dist/targets/blockmap/blockmapV3.d.ts.map +1 -0
- package/dist/targets/blockmap/blockmapV3.js +41 -0
- package/dist/targets/blockmap/blockmapV3.js.map +1 -0
- package/dist/targets/blockmap/verbatimRange.d.ts +6 -0
- package/dist/targets/blockmap/verbatimRange.d.ts.map +1 -1
- package/dist/targets/blockmap/verbatimRange.js +11 -0
- package/dist/targets/blockmap/verbatimRange.js.map +1 -1
- package/dist/targets/differentialUpdateInfoBuilder.d.ts +92 -4
- package/dist/targets/differentialUpdateInfoBuilder.d.ts.map +1 -1
- package/dist/targets/differentialUpdateInfoBuilder.js +266 -10
- package/dist/targets/differentialUpdateInfoBuilder.js.map +1 -1
- package/dist/targets/linux/FlatpakTarget.js +1 -1
- package/dist/targets/linux/FlatpakTarget.js.map +1 -1
- package/dist/targets/linux/FpmTarget.d.ts.map +1 -1
- package/dist/targets/linux/FpmTarget.js +23 -31
- package/dist/targets/linux/FpmTarget.js.map +1 -1
- package/dist/targets/linux/LinuxTargetHelper.d.ts.map +1 -1
- package/dist/targets/linux/LinuxTargetHelper.js +6 -14
- package/dist/targets/linux/LinuxTargetHelper.js.map +1 -1
- package/dist/targets/linux/appimage/appLauncher.d.ts +4 -3
- package/dist/targets/linux/appimage/appLauncher.d.ts.map +1 -1
- package/dist/targets/linux/appimage/appLauncher.js +10 -6
- package/dist/targets/linux/appimage/appLauncher.js.map +1 -1
- package/dist/targets/linux/snap/coreLegacy.d.ts +8 -0
- package/dist/targets/linux/snap/coreLegacy.d.ts.map +1 -1
- package/dist/targets/linux/snap/coreLegacy.js +42 -9
- package/dist/targets/linux/snap/coreLegacy.js.map +1 -1
- package/dist/targets/mac/pkg.d.ts.map +1 -1
- package/dist/targets/mac/pkg.js +13 -9
- package/dist/targets/mac/pkg.js.map +1 -1
- package/dist/targets/targetFactory.d.ts +22 -3
- package/dist/targets/targetFactory.d.ts.map +1 -1
- package/dist/targets/targetFactory.js +70 -29
- package/dist/targets/targetFactory.js.map +1 -1
- package/dist/targets/win/MsiTarget.d.ts +7 -0
- package/dist/targets/win/MsiTarget.d.ts.map +1 -1
- package/dist/targets/win/MsiTarget.js +140 -21
- package/dist/targets/win/MsiTarget.js.map +1 -1
- package/dist/targets/win/nsis/Defines.d.ts +1 -0
- package/dist/targets/win/nsis/Defines.d.ts.map +1 -1
- package/dist/targets/win/nsis/Defines.js.map +1 -1
- package/dist/targets/win/nsis/NsisTarget.d.ts +3 -0
- package/dist/targets/win/nsis/NsisTarget.d.ts.map +1 -1
- package/dist/targets/win/nsis/NsisTarget.js +33 -12
- package/dist/targets/win/nsis/NsisTarget.js.map +1 -1
- package/dist/targets/win/nsis/nsisLicense.d.ts.map +1 -1
- package/dist/targets/win/nsis/nsisLicense.js +8 -5
- package/dist/targets/win/nsis/nsisLicense.js.map +1 -1
- package/dist/targets/win/nsis/nsisOptions.d.ts +31 -3
- package/dist/targets/win/nsis/nsisOptions.d.ts.map +1 -1
- package/dist/targets/win/nsis/nsisOptions.js.map +1 -1
- package/dist/targets/win/nsis/nsisScriptGenerator.d.ts +6 -0
- package/dist/targets/win/nsis/nsisScriptGenerator.d.ts.map +1 -1
- package/dist/targets/win/nsis/nsisScriptGenerator.js +16 -5
- package/dist/targets/win/nsis/nsisScriptGenerator.js.map +1 -1
- package/dist/targets/win/nsis/nsisUtil.d.ts.map +1 -1
- package/dist/targets/win/nsis/nsisUtil.js +11 -29
- package/dist/targets/win/nsis/nsisUtil.js.map +1 -1
- package/dist/toolsets/7zip.d.ts +10 -0
- package/dist/toolsets/7zip.d.ts.map +1 -1
- package/dist/toolsets/7zip.js +12 -1
- package/dist/toolsets/7zip.js.map +1 -1
- package/dist/toolsets/appimage.d.ts +3 -0
- package/dist/toolsets/appimage.d.ts.map +1 -1
- package/dist/toolsets/appimage.js +4 -1
- package/dist/toolsets/appimage.js.map +1 -1
- package/dist/toolsets/archive.d.ts +13 -0
- package/dist/toolsets/archive.d.ts.map +1 -0
- package/dist/toolsets/archive.js +55 -0
- package/dist/toolsets/archive.js.map +1 -0
- package/dist/toolsets/custom.d.ts.map +1 -1
- package/dist/toolsets/custom.js +19 -2
- package/dist/toolsets/custom.js.map +1 -1
- package/dist/toolsets/fpm.d.ts +23 -0
- package/dist/toolsets/fpm.d.ts.map +1 -1
- package/dist/toolsets/fpm.js +52 -19
- package/dist/toolsets/fpm.js.map +1 -1
- package/dist/toolsets/nsis.d.ts +23 -4
- package/dist/toolsets/nsis.d.ts.map +1 -1
- package/dist/toolsets/nsis.js +49 -14
- package/dist/toolsets/nsis.js.map +1 -1
- package/dist/toolsets/winCodeSign.d.ts +20 -1
- package/dist/toolsets/winCodeSign.d.ts.map +1 -1
- package/dist/toolsets/winCodeSign.js +32 -5
- package/dist/toolsets/winCodeSign.js.map +1 -1
- package/dist/toolsets/wix.d.ts +44 -0
- package/dist/toolsets/wix.d.ts.map +1 -0
- package/dist/toolsets/wix.js +91 -0
- package/dist/toolsets/wix.js.map +1 -0
- package/dist/util/buildOutputVerifier.d.ts +2 -1
- package/dist/util/buildOutputVerifier.d.ts.map +1 -1
- package/dist/util/buildOutputVerifier.js +41 -63
- package/dist/util/buildOutputVerifier.js.map +1 -1
- package/dist/util/bundledTool.d.ts +8 -0
- package/dist/util/bundledTool.d.ts.map +1 -1
- package/dist/util/bundledTool.js +34 -0
- package/dist/util/bundledTool.js.map +1 -1
- package/dist/util/electronGet.d.ts.map +1 -1
- package/dist/util/electronGet.js +107 -10
- package/dist/util/electronGet.js.map +1 -1
- package/dist/util/electronUpdaterCompatibility.d.ts +64 -0
- package/dist/util/electronUpdaterCompatibility.d.ts.map +1 -0
- package/dist/util/electronUpdaterCompatibility.js +82 -0
- package/dist/util/electronUpdaterCompatibility.js.map +1 -0
- package/dist/util/flags.d.ts +5 -0
- package/dist/util/flags.d.ts.map +1 -1
- package/dist/util/flags.js +8 -2
- package/dist/util/flags.js.map +1 -1
- package/dist/util/mac/macosVersion.d.ts +0 -1
- package/dist/util/mac/macosVersion.d.ts.map +1 -1
- package/dist/util/mac/macosVersion.js +0 -21
- package/dist/util/mac/macosVersion.js.map +1 -1
- package/dist/util/packageMetadata.d.ts +14 -1
- package/dist/util/packageMetadata.d.ts.map +1 -1
- package/dist/util/packageMetadata.js +115 -51
- package/dist/util/packageMetadata.js.map +1 -1
- package/dist/util/removedEnvVars.js +1 -1
- package/dist/util/removedEnvVars.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/dist/version.js.map +1 -1
- package/package.json +8 -8
- package/scheme.json +182 -49
- package/templates/msi/template.xml +5 -5
- package/templates/msiWrapped/template.xml +1 -1
- package/templates/nsis/assistedInstaller.nsh +37 -1
- package/templates/nsis/common.nsh +142 -1
- package/templates/nsis/include/installUtil.nsh +12 -0
- package/templates/nsis/include/installer.nsh +12 -0
- package/templates/nsis/installSection.nsh +3 -0
- package/templates/nsis/installer.nsi +25 -13
- package/templates/nsis/multiUser.nsh +50 -10
- package/templates/nsis/portable.nsi +1 -1
- package/templates/nsis/uninstaller.nsh +6 -0
- package/dist/toolsets/linuxToolsMac.d.ts +0 -8
- package/dist/toolsets/linuxToolsMac.d.ts.map +0 -1
- package/dist/toolsets/linuxToolsMac.js +0 -44
- package/dist/toolsets/linuxToolsMac.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"7zip.js","sourceRoot":"","sources":["../../src/toolsets/7zip.ts"],"names":[],"mappings":"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","sourcesContent":["import { Nullish } from \"builder-util-runtime\"\nimport { chmod } from \"node:fs/promises\"\nimport * as path from \"path\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest 7-Zip bundle — selected when the config is unset / null / \"latest\".\nconst SEVEN_ZIP_LATEST = \"1.0
|
|
1
|
+
{"version":3,"file":"7zip.js","sourceRoot":"","sources":["../../src/toolsets/7zip.ts"],"names":[],"mappings":"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","sourcesContent":["import { Nullish } from \"builder-util-runtime\"\nimport { chmod } from \"node:fs/promises\"\nimport * as path from \"path\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest 7-Zip bundle — selected when the config is unset / null / \"latest\".\nconst SEVEN_ZIP_LATEST = \"1.1.0\"\n\nconst sevenZipChecksums = {\n // shipped the 32-bit 7za.exe for every Windows arch — 1.75 GiB memory cap, no LZMA2 multithreading on x64/arm64 (electron-builder-binaries#222)\n \"1.0.0\": {\n \"7zip-linux-ia32.tar.gz\": \"24a5d5bfe81506d0bfe21a812588119ae3deb757e8ba084b2339d8e899543686\",\n \"7zip-darwin-arm64.tar.gz\": \"496a341abe210aae1a25bc202ee97f6de6c76a3dc80f91d96616be05502d72c1\",\n \"7zip-darwin-x86_64.tar.gz\": \"496a341abe210aae1a25bc202ee97f6de6c76a3dc80f91d96616be05502d72c1\",\n \"7zip-linux-arm64.tar.gz\": \"5aff5034206b78f8261249ceb922b5c7e04c9bdb733784d8f5b6df9732cf1f79\",\n \"7zip-win-arm64.tar.gz\": \"ac3f38f96ce7498096a123bb0862dd6db863a7353c9e9e1c15f73c183adf6620\",\n \"7zip-win-ia32.tar.gz\": \"ac3f38f96ce7498096a123bb0862dd6db863a7353c9e9e1c15f73c183adf6620\",\n \"7zip-win-x64.tar.gz\": \"be071f15bd6da2f78fe81c6ddef2009b0c4d8a51f36b780cb806c7e6df95e1b3\",\n \"7zip-linux-x64.tar.gz\": \"d151bb44b2a9d9bfc52813ce4cac042916394a0ab8a56bd5d221a5dc9ef8d5d7\",\n },\n // correct per-arch Windows binaries (x64, ia32, arm64)\n \"1.0.1\": {\n \"7zip-linux-ia32.tar.gz\": \"f9e4084ef21d790bfe6147f0306118b0136b0824a7113f053b712824db19988f\",\n \"7zip-darwin-arm64.tar.gz\": \"8e307a68bb75a7d1b7366a4e34cb4b442fa678d01b421d6db2314567010d2876\",\n \"7zip-darwin-x86_64.tar.gz\": \"8e307a68bb75a7d1b7366a4e34cb4b442fa678d01b421d6db2314567010d2876\",\n \"7zip-linux-arm64.tar.gz\": \"9ac9acd3f8fe1d9175dd279e715e36e188373581db320d9e520f2aaafa360ce5\",\n \"7zip-win-arm64.tar.gz\": \"1b6273d377d5ef7e2a9bb7f9b64b5cb7678ba7d0e503aa5c93305012ffa299d2\",\n \"7zip-win-ia32.tar.gz\": \"2beef271bd1b3eb42021acfb24f47d268d03139e794f41628b89e728fa58bed6\",\n \"7zip-win-x64.tar.gz\": \"db50b64348d9560b875a00bd7e02f02b5f7f4b54ff5efa5908c38858c89c9f33\",\n \"7zip-linux-x64.tar.gz\": \"c6c2d744f5e71f100e7631786bca78b6f1738734454e8dd4bf6078d4895765f7\",\n },\n // 7-Zip 26.05 (was 24.09) — upstream security fixes incl. CVE-2025-11001 / CVE-2025-11002, CVE-2025-55188, CVE-2026-14266\n \"1.1.0\": {\n \"7zip-linux-ia32.tar.gz\": \"cd5d5255fc2f5a65f8d248f42ed5cbe5f9f6f701a12a26f40631740ef400794f\",\n \"7zip-darwin-arm64.tar.gz\": \"4d04c3a7c4c10b4b70cf25ab4e5ed6be7a141e98aefc536a87174ddb0bc3c050\",\n \"7zip-darwin-x86_64.tar.gz\": \"4d04c3a7c4c10b4b70cf25ab4e5ed6be7a141e98aefc536a87174ddb0bc3c050\",\n \"7zip-linux-arm64.tar.gz\": \"6250e76fe2c0af4247cc9ad41f6f9365ae95deae23a2592f42ba005cc20d8939\",\n \"7zip-win-arm64.tar.gz\": \"25aabfe776ffcd7dc172479beb06dd0505fd0b4e89451ceedb99efbd255ef829\",\n \"7zip-win-ia32.tar.gz\": \"020186756c2b370c7f840fb90a78e0b2e556fdcd6d356bc4f412021bd78cda5d\",\n \"7zip-win-x64.tar.gz\": \"032e591acc4c0eb3f2e1fc05ff3ec867e57f63369c74d13c0c73f973cae5fd6a\",\n \"7zip-linux-x64.tar.gz\": \"98ac470cf076f19241b5ee259e135de0adc3c3b8076c41682d6468c2a9990845\",\n },\n} as const\n\nexport type SevenZipVersion = keyof typeof sevenZipChecksums\n\nfunction getFilename(): keyof (typeof sevenZipChecksums)[SevenZipVersion] {\n const { platform, arch } = process\n if (platform === \"darwin\") {\n return arch === \"arm64\" ? \"7zip-darwin-arm64.tar.gz\" : \"7zip-darwin-x86_64.tar.gz\"\n }\n if (platform === \"linux\") {\n if (arch === \"arm64\") {\n return \"7zip-linux-arm64.tar.gz\"\n }\n if (arch === \"ia32\") {\n return \"7zip-linux-ia32.tar.gz\"\n }\n return \"7zip-linux-x64.tar.gz\"\n }\n if (platform === \"win32\") {\n if (arch === \"arm64\") {\n return \"7zip-win-arm64.tar.gz\"\n }\n if (arch === \"ia32\") {\n return \"7zip-win-ia32.tar.gz\"\n }\n return \"7zip-win-x64.tar.gz\"\n }\n throw new Error(`Unsupported platform for 7zip toolset: ${platform}/${arch}`)\n}\n\nlet _customPath: string | null = null\nlet _version: SevenZipVersion = SEVEN_ZIP_LATEST\nlet _resolvedPath: Promise<string> | null = null\n\n/**\n * Override the 7za binary path with a pre-resolved absolute path.\n * Called by the packager when `toolsets.sevenZip` is a `ToolsetCustom` config.\n * Resets the resolution cache so the next `getPath7za()` call uses this path.\n */\nexport function setSevenZipPath(customPath: string): void {\n _customPath = customPath\n _resolvedPath = null\n}\n\n/**\n * Pin the 7-Zip bundle version.\n * Called by the packager when `toolsets.sevenZip` is a version string (unset / null / `\"latest\"`\n * resolve to the newest bundle). Resets the resolution cache so the next `getPath7za()` call\n * downloads the pinned version.\n */\nexport function setSevenZipVersion(version: SevenZipVersion | \"latest\" | Nullish): void {\n _version = resolveToolsetVersion(version, SEVEN_ZIP_LATEST)\n _resolvedPath = null\n}\n\n/** Returns the path to the 7za executable, downloading it on first call. Resets on failure so callers can retry. */\nexport function getPath7za(): Promise<string> {\n if (_resolvedPath == null) {\n _resolvedPath = resolve().catch(err => {\n _resolvedPath = null\n throw err\n })\n }\n return _resolvedPath\n}\n\nasync function resolve(): Promise<string> {\n if (_customPath != null) {\n if (process.platform !== \"win32\") {\n await chmod(_customPath, 0o755)\n }\n return _customPath\n }\n\n const filename = getFilename()\n const toolDir = await downloadBuilderToolset({\n releaseName: `7zip@${_version}`,\n filenameWithExt: filename,\n checksums: sevenZipChecksums[_version],\n githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n })\n\n const bin = path.join(toolDir, \"bin\", process.platform === \"win32\" ? \"7za.exe\" : \"7za\")\n if (process.platform !== \"win32\") {\n await chmod(bin, 0o755)\n }\n return bin\n}\n"]}
|
|
@@ -10,6 +10,9 @@ export declare const appimageChecksums: {
|
|
|
10
10
|
readonly "1.1.0": {
|
|
11
11
|
readonly "appimage-tools-runtime-20251108.tar.gz": "098182ab8d3bb93db8a23691671f665ff92316249ace850aec63b9d010ec7fe0";
|
|
12
12
|
};
|
|
13
|
+
readonly "1.2.1": {
|
|
14
|
+
readonly "appimage-tools-runtime-20251108.tar.gz": "2e43e1f7ea58a38822d060f1f437f1201fae7d293ae3b45167a9eea41d440353";
|
|
15
|
+
};
|
|
13
16
|
};
|
|
14
17
|
export declare function getAppImageTools(toolset: ToolsetConfig["appimage"], targetArch: Arch, resourcesDir: string): Promise<{
|
|
15
18
|
mksquashfs: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appimage.d.ts","sourceRoot":"","sources":["../../src/toolsets/appimage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA6B,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAQnD,eAAO,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"appimage.d.ts","sourceRoot":"","sources":["../../src/toolsets/appimage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAA6B,MAAM,cAAc,CAAA;AAE9D,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAQnD,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;CAapB,CAAA;AAEV,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM;;;;;GAwDhH"}
|
|
@@ -4,7 +4,7 @@ import { downloadBuilderToolset } from "../util/electronGet.js";
|
|
|
4
4
|
import { getCustomToolsetPath } from "./custom.js";
|
|
5
5
|
import { resolveToolsetVersion } from "./version.js";
|
|
6
6
|
// Newest AppImage bundle — selected when the config is unset / null / "latest".
|
|
7
|
-
const APPIMAGE_LATEST = "1.1
|
|
7
|
+
const APPIMAGE_LATEST = "1.2.1";
|
|
8
8
|
export const appimageChecksums = {
|
|
9
9
|
"0.0.0": {
|
|
10
10
|
"appimage-12.0.1.7z": "d12ff7eb8f1d1ec4652ca5237a7fbdca33acc0c758045636feca62dc6ecb8ec4",
|
|
@@ -15,6 +15,9 @@ export const appimageChecksums = {
|
|
|
15
15
|
"1.1.0": {
|
|
16
16
|
"appimage-tools-runtime-20251108.tar.gz": "098182ab8d3bb93db8a23691671f665ff92316249ace850aec63b9d010ec7fe0",
|
|
17
17
|
},
|
|
18
|
+
"1.2.1": {
|
|
19
|
+
"appimage-tools-runtime-20251108.tar.gz": "2e43e1f7ea58a38822d060f1f437f1201fae7d293ae3b45167a9eea41d440353",
|
|
20
|
+
},
|
|
18
21
|
};
|
|
19
22
|
export async function getAppImageTools(toolset, targetArch, resourcesDir) {
|
|
20
23
|
const runtimeArch = targetArch === Arch.armv7l ? "arm32" : targetArch === Arch.arm64 ? "arm64" : targetArch === Arch.ia32 ? "ia32" : "x64";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appimage.js","sourceRoot":"","sources":["../../src/toolsets/appimage.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, InvalidConfigurationError } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest AppImage bundle — selected when the config is unset / null / \"latest\".\nconst APPIMAGE_LATEST = \"1.1
|
|
1
|
+
{"version":3,"file":"appimage.js","sourceRoot":"","sources":["../../src/toolsets/appimage.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arch, InvalidConfigurationError } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest AppImage bundle — selected when the config is unset / null / \"latest\".\nconst APPIMAGE_LATEST = \"1.2.1\"\n\nexport const appimageChecksums = {\n \"0.0.0\": {\n \"appimage-12.0.1.7z\": \"d12ff7eb8f1d1ec4652ca5237a7fbdca33acc0c758045636feca62dc6ecb8ec4\",\n },\n \"1.0.3\": {\n \"appimage-tools-runtime-20251108.tar.gz\": \"84021a78ee214ae6fd33a2d62a92ba25542dd10bc86bf117a9b2d0bba44e7665\",\n },\n \"1.1.0\": {\n \"appimage-tools-runtime-20251108.tar.gz\": \"098182ab8d3bb93db8a23691671f665ff92316249ace850aec63b9d010ec7fe0\",\n },\n \"1.2.1\": {\n \"appimage-tools-runtime-20251108.tar.gz\": \"2e43e1f7ea58a38822d060f1f437f1201fae7d293ae3b45167a9eea41d440353\",\n },\n} as const\n\nexport async function getAppImageTools(toolset: ToolsetConfig[\"appimage\"], targetArch: Arch, resourcesDir: string) {\n const runtimeArch = targetArch === Arch.armv7l ? \"arm32\" : targetArch === Arch.arm64 ? \"arm64\" : targetArch === Arch.ia32 ? \"ia32\" : \"x64\"\n\n // Static-runtime layout: tools at root, runtimes/ subdir, lib/{arch}/ subdir\n const getPaths = (artifactPath: string) => ({\n mksquashfs: path.resolve(artifactPath, \"mksquashfs\"),\n desktopFileValidate: path.resolve(artifactPath, \"desktop-file-validate\"),\n runtime: path.resolve(artifactPath, \"runtimes\", `runtime-${runtimeArch}`),\n runtimeLibraries: path.resolve(artifactPath, \"lib\", runtimeArch),\n })\n\n // FUSE2 layout: tools under a host-platform subdir; runtime files at root with target-arch suffix\n const getFuse2Paths = (artifactPath: string) => {\n // mksquashfs/desktop-file-validate are HOST binaries — use process.arch, not targetArch\n const hostArch = process.arch === \"arm\" ? \"arm32\" : process.arch === \"arm64\" ? \"arm64\" : process.arch === \"ia32\" ? \"ia32\" : \"x64\"\n const toolRoot = process.platform === \"linux\" ? `linux-${hostArch}` : \"darwin\"\n // Runtime files live at root; armv7l target uses \"armv7l\" filename, not the internal \"arm32\" alias\n const runtimeSuffix = targetArch === Arch.armv7l ? \"armv7l\" : runtimeArch\n // FUSE2 tree only ships lib/ia32 and lib/x64; arm targets fall back to x64 here\n const libArch = targetArch === Arch.ia32 ? \"ia32\" : \"x64\"\n return {\n mksquashfs: path.resolve(artifactPath, toolRoot, \"mksquashfs\"),\n desktopFileValidate: path.resolve(artifactPath, toolRoot, \"desktop-file-validate\"),\n runtime: path.resolve(artifactPath, `runtime-${runtimeSuffix}`),\n runtimeLibraries: path.resolve(artifactPath, \"lib\", libArch),\n }\n }\n\n if (typeof toolset === \"object\" && toolset != null) {\n const vendorPath = await getCustomToolsetPath(toolset, resourcesDir)\n return getPaths(vendorPath)\n }\n\n // Unset / null / \"latest\" → newest; an explicit pin selects exactly that release.\n const version = resolveToolsetVersion(toolset, APPIMAGE_LATEST)\n // The `toolsets.appimage` type and scheme.json only admit known versions, but a programmatic config\n // bypasses both. Never forward an unknown version: without a checksum entry the downloader would run\n // with integrity verification disabled.\n if (!Object.prototype.hasOwnProperty.call(appimageChecksums, version)) {\n throw new InvalidConfigurationError(\n `Unknown toolsets.appimage version \"${version}\". Known versions: ${Object.keys(appimageChecksums).join(\", \")} (or \"latest\"). ` +\n `To use a custom bundle, set toolsets.appimage to a ToolsetCustom object (url + checksum) instead.`\n )\n }\n const checksums: Record<string, string> = appimageChecksums[version]\n // Each release ships a single archive: its checksum entry's key.\n const filenameWithExt = Object.keys(checksums)[0]\n // Only the explicit legacy pin selects the FUSE2 runtime, published under the pre-v27 release name.\n const isFuse2 = version === \"0.0.0\"\n const artifactPath = await downloadBuilderToolset({\n releaseName: isFuse2 ? \"appimage-12.0.1\" : `appimage@${version}`,\n filenameWithExt,\n checksums,\n githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n })\n return isFuse2 ? getFuse2Paths(artifactPath) : getPaths(artifactPath)\n}\n"]}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ToolsetConfig } from "../configuration.js";
|
|
2
|
+
export declare const archiveChecksums: {
|
|
3
|
+
readonly "1.0.0": {
|
|
4
|
+
readonly "archive-linux-amd64.7z": "e8c2f1d611492cf51dfc1703f48a2b8804e15fde44d09c0e5d3d9b0b4410abb6";
|
|
5
|
+
readonly "archive-linux-arm64v8.7z": "a473505a58f7f059051587a84405e2e13382820b64893fa82fe16ceb1b80c392";
|
|
6
|
+
readonly "archive-linux-i386.7z": "09209547ba629c6b8c18bad4e4c24b55c8c6c407cf8ec0e4662a0816aa597640";
|
|
7
|
+
readonly "archive-darwin-arm64.7z": "07505ce02339a9ca01a1d47b14bbed95e6bc26fdfe284a2cdea1e54f92753057";
|
|
8
|
+
readonly "archive-darwin-x86_64.7z": "a0d55100cd2bcd5175ea5deae1d458885e1f478b4917994501d3e1bcb4f6b8c4";
|
|
9
|
+
};
|
|
10
|
+
};
|
|
11
|
+
/** @returns the toolset's `bin` directory, which electron-builder puts first on `PATH` for fpm, or `null` on a host with no bundle (its own tools are used). */
|
|
12
|
+
export declare function getArchiveToolsetBinDir(toolset: ToolsetConfig["archive"], resourcesDir: string): Promise<string | null>;
|
|
13
|
+
//# sourceMappingURL=archive.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../src/toolsets/archive.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAUnD,eAAO,MAAM,gBAAgB;;;;;;;;CAQnB,CAAA;AAUV,gKAAgK;AAChK,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+B7H"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { InvalidConfigurationError } from "builder-util";
|
|
2
|
+
import * as path from "path";
|
|
3
|
+
import { downloadBuilderToolset } from "../util/electronGet.js";
|
|
4
|
+
import { getCustomToolsetPath } from "./custom.js";
|
|
5
|
+
import { resolveToolsetVersion } from "./version.js";
|
|
6
|
+
// Newest archive bundle — selected when the config is unset / null / "latest".
|
|
7
|
+
const ARCHIVE_LATEST = "1.0.0";
|
|
8
|
+
// Each archive has a root bin/ with xz, lzip, GNU tar (tar, gtar), GNU ar (ar, gar) and bsdtar,
|
|
9
|
+
// plus rpm and rpmbuild (rpm 6.1.0) on linux-amd64, linux-arm64v8 and darwin-arm64 only.
|
|
10
|
+
export const archiveChecksums = {
|
|
11
|
+
"1.0.0": {
|
|
12
|
+
"archive-linux-amd64.7z": "e8c2f1d611492cf51dfc1703f48a2b8804e15fde44d09c0e5d3d9b0b4410abb6",
|
|
13
|
+
"archive-linux-arm64v8.7z": "a473505a58f7f059051587a84405e2e13382820b64893fa82fe16ceb1b80c392",
|
|
14
|
+
"archive-linux-i386.7z": "09209547ba629c6b8c18bad4e4c24b55c8c6c407cf8ec0e4662a0816aa597640",
|
|
15
|
+
"archive-darwin-arm64.7z": "07505ce02339a9ca01a1d47b14bbed95e6bc26fdfe284a2cdea1e54f92753057",
|
|
16
|
+
"archive-darwin-x86_64.7z": "a0d55100cd2bcd5175ea5deae1d458885e1f478b4917994501d3e1bcb4f6b8c4",
|
|
17
|
+
},
|
|
18
|
+
};
|
|
19
|
+
const hostSuffixes = {
|
|
20
|
+
"linux-x64": "linux-amd64",
|
|
21
|
+
"linux-arm64": "linux-arm64v8",
|
|
22
|
+
"linux-ia32": "linux-i386",
|
|
23
|
+
"darwin-arm64": "darwin-arm64",
|
|
24
|
+
"darwin-x64": "darwin-x86_64",
|
|
25
|
+
};
|
|
26
|
+
/** @returns the toolset's `bin` directory, which electron-builder puts first on `PATH` for fpm, or `null` on a host with no bundle (its own tools are used). */
|
|
27
|
+
export async function getArchiveToolsetBinDir(toolset, resourcesDir) {
|
|
28
|
+
if (typeof toolset === "object" && toolset != null) {
|
|
29
|
+
return path.join(await getCustomToolsetPath(toolset, resourcesDir), "bin");
|
|
30
|
+
}
|
|
31
|
+
if (toolset === "system") {
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
// Unset / null / "latest" → newest; an explicit pin selects exactly that release.
|
|
35
|
+
const version = resolveToolsetVersion(toolset, ARCHIVE_LATEST);
|
|
36
|
+
// Never download without a checksum entry: the downloader would run with integrity verification disabled.
|
|
37
|
+
if (!Object.prototype.hasOwnProperty.call(archiveChecksums, version)) {
|
|
38
|
+
throw new InvalidConfigurationError(`Unknown toolsets.archive version "${version}". Known versions: ${Object.keys(archiveChecksums).join(", ")} (or "latest"). ` +
|
|
39
|
+
`To use a custom bundle, set toolsets.archive to a ToolsetCustom object (url + checksum) instead.`);
|
|
40
|
+
}
|
|
41
|
+
const suffix = hostSuffixes[`${process.platform}-${process.arch}`];
|
|
42
|
+
if (suffix == null) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
const checksums = archiveChecksums[version];
|
|
46
|
+
const filenameWithExt = `archive-${suffix}.7z`;
|
|
47
|
+
const bundleDir = await downloadBuilderToolset({
|
|
48
|
+
releaseName: `archive@${version}`,
|
|
49
|
+
filenameWithExt,
|
|
50
|
+
checksums,
|
|
51
|
+
githubOrgRepo: "electron-userland/electron-builder-binaries",
|
|
52
|
+
});
|
|
53
|
+
return path.join(bundleDir, "bin");
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=archive.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../src/toolsets/archive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,+EAA+E;AAC/E,MAAM,cAAc,GAAG,OAAO,CAAA;AAE9B,gGAAgG;AAChG,yFAAyF;AACzF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,OAAO,EAAE;QACP,wBAAwB,EAAE,kEAAkE;QAC5F,0BAA0B,EAAE,kEAAkE;QAC9F,uBAAuB,EAAE,kEAAkE;QAC3F,yBAAyB,EAAE,kEAAkE;QAC7F,0BAA0B,EAAE,kEAAkE;KAC/F;CACO,CAAA;AAEV,MAAM,YAAY,GAA2B;IAC3C,WAAW,EAAE,aAAa;IAC1B,aAAa,EAAE,eAAe;IAC9B,YAAY,EAAE,YAAY;IAC1B,cAAc,EAAE,cAAc;IAC9B,YAAY,EAAE,eAAe;CAC9B,CAAA;AAED,gKAAgK;AAChK,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAiC,EAAE,YAAoB;IACnG,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,KAAK,CAAC,CAAA;IAC5E,CAAC;IAED,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,kFAAkF;IAClF,MAAM,OAAO,GAAG,qBAAqB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAA;IAC9D,0GAA0G;IAC1G,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,CAAC;QACrE,MAAM,IAAI,yBAAyB,CACjC,qCAAqC,OAAO,sBAAsB,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB;YAC1H,kGAAkG,CACrG,CAAA;IACH,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAA;IAClE,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,OAAO,IAAI,CAAA;IACb,CAAC;IACD,MAAM,SAAS,GAA2B,gBAAgB,CAAC,OAAO,CAAC,CAAA;IACnE,MAAM,eAAe,GAAG,WAAW,MAAM,KAAK,CAAA;IAC9C,MAAM,SAAS,GAAG,MAAM,sBAAsB,CAAC;QAC7C,WAAW,EAAE,WAAW,OAAO,EAAE;QACjC,eAAe;QACf,SAAS;QACT,aAAa,EAAE,6CAA6C;KAC7D,CAAC,CAAA;IACF,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;AACpC,CAAC","sourcesContent":["import { InvalidConfigurationError } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest archive bundle — selected when the config is unset / null / \"latest\".\nconst ARCHIVE_LATEST = \"1.0.0\"\n\n// Each archive has a root bin/ with xz, lzip, GNU tar (tar, gtar), GNU ar (ar, gar) and bsdtar,\n// plus rpm and rpmbuild (rpm 6.1.0) on linux-amd64, linux-arm64v8 and darwin-arm64 only.\nexport const archiveChecksums = {\n \"1.0.0\": {\n \"archive-linux-amd64.7z\": \"e8c2f1d611492cf51dfc1703f48a2b8804e15fde44d09c0e5d3d9b0b4410abb6\",\n \"archive-linux-arm64v8.7z\": \"a473505a58f7f059051587a84405e2e13382820b64893fa82fe16ceb1b80c392\",\n \"archive-linux-i386.7z\": \"09209547ba629c6b8c18bad4e4c24b55c8c6c407cf8ec0e4662a0816aa597640\",\n \"archive-darwin-arm64.7z\": \"07505ce02339a9ca01a1d47b14bbed95e6bc26fdfe284a2cdea1e54f92753057\",\n \"archive-darwin-x86_64.7z\": \"a0d55100cd2bcd5175ea5deae1d458885e1f478b4917994501d3e1bcb4f6b8c4\",\n },\n} as const\n\nconst hostSuffixes: Record<string, string> = {\n \"linux-x64\": \"linux-amd64\",\n \"linux-arm64\": \"linux-arm64v8\",\n \"linux-ia32\": \"linux-i386\",\n \"darwin-arm64\": \"darwin-arm64\",\n \"darwin-x64\": \"darwin-x86_64\",\n}\n\n/** @returns the toolset's `bin` directory, which electron-builder puts first on `PATH` for fpm, or `null` on a host with no bundle (its own tools are used). */\nexport async function getArchiveToolsetBinDir(toolset: ToolsetConfig[\"archive\"], resourcesDir: string): Promise<string | null> {\n if (typeof toolset === \"object\" && toolset != null) {\n return path.join(await getCustomToolsetPath(toolset, resourcesDir), \"bin\")\n }\n\n if (toolset === \"system\") {\n return null\n }\n\n // Unset / null / \"latest\" → newest; an explicit pin selects exactly that release.\n const version = resolveToolsetVersion(toolset, ARCHIVE_LATEST)\n // Never download without a checksum entry: the downloader would run with integrity verification disabled.\n if (!Object.prototype.hasOwnProperty.call(archiveChecksums, version)) {\n throw new InvalidConfigurationError(\n `Unknown toolsets.archive version \"${version}\". Known versions: ${Object.keys(archiveChecksums).join(\", \")} (or \"latest\"). ` +\n `To use a custom bundle, set toolsets.archive to a ToolsetCustom object (url + checksum) instead.`\n )\n }\n const suffix = hostSuffixes[`${process.platform}-${process.arch}`]\n if (suffix == null) {\n return null\n }\n const checksums: Record<string, string> = archiveChecksums[version]\n const filenameWithExt = `archive-${suffix}.7z`\n const bundleDir = await downloadBuilderToolset({\n releaseName: `archive@${version}`,\n filenameWithExt,\n checksums,\n githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n })\n return path.join(bundleDir, \"bin\")\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAwDnD,wBAAgB,uBAAuB,IAAI,IAAI,CAE9C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,aAAa,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlG"}
|
package/dist/toolsets/custom.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { exists, InvalidConfigurationError, sanitizeDirPath, validateSecuredUrl } from "builder-util";
|
|
2
2
|
import { mkdir, rm, stat } from "fs/promises";
|
|
3
3
|
import * as path from "path";
|
|
4
|
+
import { fileURLToPath } from "url";
|
|
4
5
|
import { ACCEPTED_CHECKSUM_FORMATS, checksumCacheKey, checksumMismatchMessage, parseChecksum, verifyFileChecksum } from "../util/checksum.js";
|
|
5
6
|
import { cacheDirectoryOverrideAllowed, downloadBuilderToolset, extractArchive, hashUrlSafe } from "../util/electronGet.js";
|
|
6
7
|
async function validateCustomToolset(custom, resourcesDir) {
|
|
@@ -16,7 +17,7 @@ async function validateCustomToolset(custom, resourcesDir) {
|
|
|
16
17
|
// Ignore. If the URL is invalid, validate it as a file path
|
|
17
18
|
}
|
|
18
19
|
if (url.startsWith("file://")) {
|
|
19
|
-
const p = url
|
|
20
|
+
const p = fileUrlToPath(url);
|
|
20
21
|
const isWithinResources = resourcesDir ? path.normalize(p).startsWith(path.normalize(resourcesDir + path.sep)) : false;
|
|
21
22
|
const isValid = path.isAbsolute(p) || isWithinResources;
|
|
22
23
|
const type = isValid &&
|
|
@@ -30,9 +31,25 @@ async function validateCustomToolset(custom, resourcesDir) {
|
|
|
30
31
|
}
|
|
31
32
|
throw new Error(`Invalid custom toolset: ${url}. Must be a valid https:// URL or a file:// path.`);
|
|
32
33
|
}
|
|
34
|
+
// The path of a file:// toolset URL. "file:///..." is converted as a file URL, so that "file:///C:/tools/nsis.zip" (the form
|
|
35
|
+
// pathToFileURL gives on Windows) is found on Windows instead of being read as "/C:/tools/nsis.zip", and percent-encoded
|
|
36
|
+
// characters are decoded. "file://<relative path>" and "file://C:\..." are not file URLs and stay the path as written, and so
|
|
37
|
+
// does a path with "?" or "#" in it: as a URL it would be cut there ("file:///opt/toolsets/#3/nsis.zip" would be "/opt/toolsets/").
|
|
38
|
+
function fileUrlToPath(url) {
|
|
39
|
+
const p = url.slice("file://".length);
|
|
40
|
+
if (p.startsWith("/") && !/[?#]/.test(p)) {
|
|
41
|
+
try {
|
|
42
|
+
return fileURLToPath(url);
|
|
43
|
+
}
|
|
44
|
+
catch {
|
|
45
|
+
// not the URL of a path on this platform, such as "file:///opt/..." on Windows
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return p;
|
|
49
|
+
}
|
|
33
50
|
// Strip the file:// prefix and sanitize the path against resourcesDir (relative paths must be within it)
|
|
34
51
|
function resolveFilePath(url, resourcesDir) {
|
|
35
|
-
const p = url.startsWith("file://") ? url
|
|
52
|
+
const p = url.startsWith("file://") ? fileUrlToPath(url) : url;
|
|
36
53
|
return path.isAbsolute(p) ? sanitizeDirPath(p) : sanitizeDirPath(p, resourcesDir);
|
|
37
54
|
}
|
|
38
55
|
const _customToolsetCache = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"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","sourcesContent":["import { exists, InvalidConfigurationError, sanitizeDirPath, validateSecuredUrl } from \"builder-util\"\nimport { mkdir, rm, stat } from \"fs/promises\"\nimport * as path from \"path\"\nimport { ToolsetCustom } from \"../configuration.js\"\nimport { ACCEPTED_CHECKSUM_FORMATS, checksumCacheKey, checksumMismatchMessage, ExpectedChecksum, parseChecksum, verifyFileChecksum } from \"../util/checksum.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: memoChecksumKey(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\n// Equivalent spellings of one checksum (uppercase hex, surrounding whitespace) share a memo entry; an invalid value is\n// keyed verbatim and fails in _resolveCustomToolsetPath with the configuration error.\nfunction memoChecksumKey(checksum: string | undefined): string {\n if (!checksum) {\n return \"\"\n }\n try {\n return checksumCacheKey(parseChecksum(checksum, \"ToolsetCustom.checksum\"))\n } catch {\n return checksum\n }\n}\n\nconst CHECKSUM_DOCS_URL = \"https://www.electron.build/docs/toolsets#custom-toolset-checksum\"\n\n/**\n * Classifies the checksum of a downloaded or archive toolset up front, so a value in an unsupported format fails before\n * anything is downloaded or extracted, without echoing the value. A SHA-256 hex value is verified by `@electron/get` for a\n * download; a base64 SHA-512 (the format v26 used for all toolset checksums) is verified by electron-builder.\n */\nfunction normalizeChecksum(checksum: string | undefined, type: string, url: string): ExpectedChecksum {\n if (!checksum) {\n throw new InvalidConfigurationError(`ToolsetCustom.checksum is required for ${type} toolsets (url: ${url}): ${ACCEPTED_CHECKSUM_FORMATS}. See ${CHECKSUM_DOCS_URL}`)\n }\n return parseChecksum(checksum, `ToolsetCustom.checksum for ${type} toolset ${url}`, CHECKSUM_DOCS_URL)\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 const checksum = normalizeChecksum(toolset.checksum, String(type), toolset.url)\n // hex form of the digest: a base64 SHA-512 may contain \"/\" or \"+\", which must not reach the cache directory name\n const binaryVersion = toolset.version ?? checksumCacheKey(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)]: checksum.value },\n overrideUrl: toolset.url,\n })\n } else if (type === \"file\") {\n const archivePath = resolveFilePath(toolset.url, resourcesDir)\n // Verify the local archive on every resolution, before anything is extracted: the archive is re-extracted each time anyway\n // (see below), so hashing it adds little, and a stale extraction can never outlive a changed archive. The user's file is\n // never modified or removed, whatever the result.\n const { matches, actual } = await verifyFileChecksum(archivePath, checksum)\n if (!matches) {\n throw new InvalidConfigurationError(\n `${checksumMismatchMessage(`the local toolset archive ${archivePath}`, checksum, actual)} ` +\n `The archive was not extracted and has been left in place. Update ToolsetCustom.checksum if the archive was changed intentionally. See ${CHECKSUM_DOCS_URL}`\n )\n }\n\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 rm(toolsetTarget, { recursive: true })\n }\n await extractArchive(archivePath, toolsetTarget)\n return toolsetTarget\n }\n\n throw new Error(`Unsupported custom toolset type: ${type}`)\n}\n"]}
|
|
1
|
+
{"version":3,"file":"custom.js","sourceRoot":"","sources":["../../src/toolsets/custom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,yBAAyB,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAA;AACrG,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAA;AAEnC,OAAO,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,uBAAuB,EAAoB,aAAa,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AAC/J,OAAO,EAAE,6BAA6B,EAAE,sBAAsB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAE3H,KAAK,UAAU,qBAAqB,CAAC,MAAqB,EAAE,YAAqB;IAC/E,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAA;QACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,qCAAqC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;QACrE,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAA;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,4DAA4D;IAC9D,CAAC;IACD,IAAI,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;QACtH,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,iBAAiB,CAAA;QACvD,MAAM,IAAI,GACR,OAAO;YACP,CAAC,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;iBACX,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;iBACxE,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;QACxB,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAA;QAClC,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,2BAA2B,GAAG,mDAAmD,CAAC,CAAA;AACpG,CAAC;AAED,6HAA6H;AAC7H,yHAAyH;AACzH,8HAA8H;AAC9H,oIAAoI;AACpI,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACrC,IAAI,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,OAAO,aAAa,CAAC,GAAG,CAAC,CAAA;QAC3B,CAAC;QAAC,MAAM,CAAC;YACP,+EAA+E;QACjF,CAAC;IACH,CAAC;IACD,OAAO,CAAC,CAAA;AACV,CAAC;AAED,yGAAyG;AACzG,SAAS,eAAe,CAAC,GAAW,EAAE,YAAqB;IACzD,MAAM,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;IAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE,YAAY,CAAC,CAAA;AACnF,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,EAA2B,CAAA;AAE9D,MAAM,UAAU,uBAAuB;IACrC,mBAAmB,CAAC,KAAK,EAAE,CAAA;AAC7B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,MAAqB,EAAE,YAAqB;IAC/E,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC,CAAA;IACzG,IAAI,MAAM,GAAG,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACzC,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;QACnB,MAAM,GAAG,yBAAyB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QACxD,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC;AAED,uHAAuH;AACvH,sFAAsF;AACtF,SAAS,eAAe,CAAC,QAA4B;IACnD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC;QACH,OAAO,gBAAgB,CAAC,aAAa,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC,CAAA;IAC5E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,CAAA;IACjB,CAAC;AACH,CAAC;AAED,MAAM,iBAAiB,GAAG,kEAAkE,CAAA;AAE5F;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,QAA4B,EAAE,IAAY,EAAE,GAAW;IAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,yBAAyB,CAAC,0CAA0C,IAAI,mBAAmB,GAAG,MAAM,yBAAyB,SAAS,iBAAiB,EAAE,CAAC,CAAA;IACtK,CAAC;IACD,OAAO,aAAa,CAAC,QAAQ,EAAE,8BAA8B,IAAI,YAAY,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAA;AACxG,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,MAAqB,EAAE,YAAqB;IACnF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAE3E,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,OAAO,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAC/E,iHAAiH;IACjH,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACnF,MAAM,WAAW,GAAG,GAAG,aAAa,IAAI,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAA;IAElE,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;QACnB,OAAO,sBAAsB,CAAC;YAC5B,WAAW,EAAE,WAAW;YACxB,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;YAC3C,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE;YAC3D,WAAW,EAAE,OAAO,CAAC,GAAG;SACzB,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QAC3B,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAA;QAC9D,2HAA2H;QAC3H,yHAAyH;QACzH,kDAAkD;QAClD,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,kBAAkB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,yBAAyB,CACjC,GAAG,uBAAuB,CAAC,6BAA6B,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,GAAG;gBACzF,yIAAyI,iBAAiB,EAAE,CAC/J,CAAA;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,6BAA6B,CAAC,KAAK,CAAA;QAC1D,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAA;QAC/D,MAAM,KAAK,CAAC,gBAAgB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAElD,+FAA+F;QAC/F,uGAAuG;QACvG,yFAAyF;QACzF,MAAM,aAAa,GAAG,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC,EAAE,gBAAgB,CAAC,CAAA;QACjG,IAAI,MAAM,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;YAChC,MAAM,EAAE,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9C,CAAC;QACD,MAAM,cAAc,CAAC,WAAW,EAAE,aAAa,CAAC,CAAA;QAChD,OAAO,aAAa,CAAA;IACtB,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAA;AAC7D,CAAC","sourcesContent":["import { exists, InvalidConfigurationError, sanitizeDirPath, validateSecuredUrl } from \"builder-util\"\nimport { mkdir, rm, stat } from \"fs/promises\"\nimport * as path from \"path\"\nimport { fileURLToPath } from \"url\"\nimport { ToolsetCustom } from \"../configuration.js\"\nimport { ACCEPTED_CHECKSUM_FORMATS, checksumCacheKey, checksumMismatchMessage, ExpectedChecksum, parseChecksum, verifyFileChecksum } from \"../util/checksum.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 = fileUrlToPath(url)\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// The path of a file:// toolset URL. \"file:///...\" is converted as a file URL, so that \"file:///C:/tools/nsis.zip\" (the form\n// pathToFileURL gives on Windows) is found on Windows instead of being read as \"/C:/tools/nsis.zip\", and percent-encoded\n// characters are decoded. \"file://<relative path>\" and \"file://C:\\...\" are not file URLs and stay the path as written, and so\n// does a path with \"?\" or \"#\" in it: as a URL it would be cut there (\"file:///opt/toolsets/#3/nsis.zip\" would be \"/opt/toolsets/\").\nfunction fileUrlToPath(url: string): string {\n const p = url.slice(\"file://\".length)\n if (p.startsWith(\"/\") && !/[?#]/.test(p)) {\n try {\n return fileURLToPath(url)\n } catch {\n // not the URL of a path on this platform, such as \"file:///opt/...\" on Windows\n }\n }\n return p\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://\") ? fileUrlToPath(url) : 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: memoChecksumKey(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\n// Equivalent spellings of one checksum (uppercase hex, surrounding whitespace) share a memo entry; an invalid value is\n// keyed verbatim and fails in _resolveCustomToolsetPath with the configuration error.\nfunction memoChecksumKey(checksum: string | undefined): string {\n if (!checksum) {\n return \"\"\n }\n try {\n return checksumCacheKey(parseChecksum(checksum, \"ToolsetCustom.checksum\"))\n } catch {\n return checksum\n }\n}\n\nconst CHECKSUM_DOCS_URL = \"https://www.electron.build/docs/toolsets#custom-toolset-checksum\"\n\n/**\n * Classifies the checksum of a downloaded or archive toolset up front, so a value in an unsupported format fails before\n * anything is downloaded or extracted, without echoing the value. A SHA-256 hex value is verified by `@electron/get` for a\n * download; a base64 SHA-512 (the format v26 used for all toolset checksums) is verified by electron-builder.\n */\nfunction normalizeChecksum(checksum: string | undefined, type: string, url: string): ExpectedChecksum {\n if (!checksum) {\n throw new InvalidConfigurationError(`ToolsetCustom.checksum is required for ${type} toolsets (url: ${url}): ${ACCEPTED_CHECKSUM_FORMATS}. See ${CHECKSUM_DOCS_URL}`)\n }\n return parseChecksum(checksum, `ToolsetCustom.checksum for ${type} toolset ${url}`, CHECKSUM_DOCS_URL)\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 const checksum = normalizeChecksum(toolset.checksum, String(type), toolset.url)\n // hex form of the digest: a base64 SHA-512 may contain \"/\" or \"+\", which must not reach the cache directory name\n const binaryVersion = toolset.version ?? checksumCacheKey(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)]: checksum.value },\n overrideUrl: toolset.url,\n })\n } else if (type === \"file\") {\n const archivePath = resolveFilePath(toolset.url, resourcesDir)\n // Verify the local archive on every resolution, before anything is extracted: the archive is re-extracted each time anyway\n // (see below), so hashing it adds little, and a stale extraction can never outlive a changed archive. The user's file is\n // never modified or removed, whatever the result.\n const { matches, actual } = await verifyFileChecksum(archivePath, checksum)\n if (!matches) {\n throw new InvalidConfigurationError(\n `${checksumMismatchMessage(`the local toolset archive ${archivePath}`, checksum, actual)} ` +\n `The archive was not extracted and has been left in place. Update ToolsetCustom.checksum if the archive was changed intentionally. See ${CHECKSUM_DOCS_URL}`\n )\n }\n\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 rm(toolsetTarget, { recursive: true })\n }\n await extractArchive(archivePath, toolsetTarget)\n return toolsetTarget\n }\n\n throw new Error(`Unsupported custom toolset type: ${type}`)\n}\n"]}
|
package/dist/toolsets/fpm.d.ts
CHANGED
|
@@ -1,3 +1,26 @@
|
|
|
1
1
|
import { ToolsetConfig } from "../configuration.js";
|
|
2
|
+
export declare const fpmChecksums: {
|
|
3
|
+
readonly "2.2.1": {
|
|
4
|
+
readonly "fpm-1.17.0-ruby-3.4.3-linux-amd64.7z": "2ef73acbcbfd26503369cb3a9b0345aa7fae251d69130537ee6ff47b402f828e";
|
|
5
|
+
readonly "fpm-1.17.0-ruby-3.4.3-darwin-x86_64.7z": "50eff4214e3e30e2a8bbc35854f80acabb3260ea9e87f5835c60f898eedb320e";
|
|
6
|
+
readonly "fpm-1.17.0-ruby-3.4.3-linux-arm64v8.7z": "553f047eacbc63423bae1eca5958bcdc720c1f6f4135cb815f5ec99f48d3bd55";
|
|
7
|
+
readonly "fpm-1.17.0-ruby-3.4.3-darwin-arm64.7z": "e44b60765367cd11b0b9fa5f1966762137ee45ec02d49a3e9668475031e97873";
|
|
8
|
+
readonly "fpm-1.17.0-ruby-3.4.3-linux-i386.7z": "f4091110728de8259dcab181761e74141b4b65d409a26e642c7271bd0b61eab4";
|
|
9
|
+
};
|
|
10
|
+
readonly "2.3.1": {
|
|
11
|
+
readonly "fpm-1.18.0-ruby-3.4.12-darwin-arm64.7z": "40846b25ece8b24f30b6cbe3838a7cf3fd05b7e8f2133a50b6ef6f1ee12ba7c3";
|
|
12
|
+
readonly "fpm-1.18.0-ruby-3.4.12-darwin-x86_64.7z": "4299d345d906be224b47885ca1bb87b6a2cf688e1b04024d480987b051c68f76";
|
|
13
|
+
readonly "fpm-1.18.0-ruby-3.4.12-linux-amd64.7z": "25c7518f5187047fbd0268c8150f9fb795058f851c3954a0407bee7ed199ff87";
|
|
14
|
+
readonly "fpm-1.18.0-ruby-3.4.12-linux-arm64v8.7z": "ffa94aff17e68137867a4d2e63cebb4ff041ab7d360ec429430f0369162db983";
|
|
15
|
+
readonly "fpm-1.18.0-ruby-3.4.12-linux-i386.7z": "7b53b41729dbbcd75d3f4da16ae310d9dae6892b276c9d443e4e3e64990540c0";
|
|
16
|
+
};
|
|
17
|
+
};
|
|
18
|
+
/**
|
|
19
|
+
* Resolve the archive of fpm bundle `version` for a host platform and arch, from that version's own checksum entry.
|
|
20
|
+
*
|
|
21
|
+
* Throws an {@link InvalidConfigurationError} for a version that has no checksum entry, or a host the release publishes
|
|
22
|
+
* no archive for, instead of downloading without a checksum to verify against.
|
|
23
|
+
*/
|
|
24
|
+
export declare function getFpmArchiveName(version: string, platform: NodeJS.Platform, arch: string): string;
|
|
2
25
|
export declare function getFpmPath(toolset: ToolsetConfig["fpm"], resourcesDir: string): Promise<string>;
|
|
3
26
|
//# sourceMappingURL=fpm.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fpm.d.ts","sourceRoot":"","sources":["../../src/toolsets/fpm.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"fpm.d.ts","sourceRoot":"","sources":["../../src/toolsets/fpm.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAUnD,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAgBf,CAAA;AAuBV;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAiBlG;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,EAAE,YAAY,EAAE,MAAM,mBAyBnF"}
|
package/dist/toolsets/fpm.js
CHANGED
|
@@ -4,8 +4,10 @@ import { downloadBuilderToolset } from "../util/electronGet.js";
|
|
|
4
4
|
import { getCustomToolsetPath } from "./custom.js";
|
|
5
5
|
import { resolveToolsetVersion } from "./version.js";
|
|
6
6
|
// Newest FPM bundle — selected when the config is unset / null / "latest".
|
|
7
|
-
const FPM_LATEST = "2.
|
|
8
|
-
|
|
7
|
+
const FPM_LATEST = "2.3.1";
|
|
8
|
+
// Archive names carry the bundled fpm and Ruby versions, so they differ between releases: the keys of each
|
|
9
|
+
// version's entry are its archive names, and `getFpmArchiveName` picks the one for the host platform.
|
|
10
|
+
export const fpmChecksums = {
|
|
9
11
|
"2.2.1": {
|
|
10
12
|
"fpm-1.17.0-ruby-3.4.3-linux-amd64.7z": "2ef73acbcbfd26503369cb3a9b0345aa7fae251d69130537ee6ff47b402f828e",
|
|
11
13
|
"fpm-1.17.0-ruby-3.4.3-darwin-x86_64.7z": "50eff4214e3e30e2a8bbc35854f80acabb3260ea9e87f5835c60f898eedb320e",
|
|
@@ -13,7 +15,54 @@ const fpmChecksums = {
|
|
|
13
15
|
"fpm-1.17.0-ruby-3.4.3-darwin-arm64.7z": "e44b60765367cd11b0b9fa5f1966762137ee45ec02d49a3e9668475031e97873",
|
|
14
16
|
"fpm-1.17.0-ruby-3.4.3-linux-i386.7z": "f4091110728de8259dcab181761e74141b4b65d409a26e642c7271bd0b61eab4",
|
|
15
17
|
},
|
|
18
|
+
// fpm 1.18.0, Ruby 3.4.12; Linux bundles link a static OpenSSL 3.5.9 (glibc floor still 2.28)
|
|
19
|
+
"2.3.1": {
|
|
20
|
+
"fpm-1.18.0-ruby-3.4.12-darwin-arm64.7z": "40846b25ece8b24f30b6cbe3838a7cf3fd05b7e8f2133a50b6ef6f1ee12ba7c3",
|
|
21
|
+
"fpm-1.18.0-ruby-3.4.12-darwin-x86_64.7z": "4299d345d906be224b47885ca1bb87b6a2cf688e1b04024d480987b051c68f76",
|
|
22
|
+
"fpm-1.18.0-ruby-3.4.12-linux-amd64.7z": "25c7518f5187047fbd0268c8150f9fb795058f851c3954a0407bee7ed199ff87",
|
|
23
|
+
"fpm-1.18.0-ruby-3.4.12-linux-arm64v8.7z": "ffa94aff17e68137867a4d2e63cebb4ff041ab7d360ec429430f0369162db983",
|
|
24
|
+
"fpm-1.18.0-ruby-3.4.12-linux-i386.7z": "7b53b41729dbbcd75d3f4da16ae310d9dae6892b276c9d443e4e3e64990540c0",
|
|
25
|
+
},
|
|
16
26
|
};
|
|
27
|
+
/**
|
|
28
|
+
* The platform/arch suffix of an fpm archive name (`fpm-<fpm>-ruby-<ruby>-<suffix>.7z`), or `null` for a host no
|
|
29
|
+
* release publishes a bundle for. Every release uses the same suffixes.
|
|
30
|
+
*/
|
|
31
|
+
function fpmArchiveSuffix(platform, arch) {
|
|
32
|
+
if (platform === "linux") {
|
|
33
|
+
if (arch === "x64") {
|
|
34
|
+
return "linux-amd64";
|
|
35
|
+
}
|
|
36
|
+
else if (arch === "arm64") {
|
|
37
|
+
return "linux-arm64v8";
|
|
38
|
+
}
|
|
39
|
+
return "linux-i386";
|
|
40
|
+
}
|
|
41
|
+
if (platform === "darwin") {
|
|
42
|
+
return arch === "arm64" ? "darwin-arm64" : "darwin-x86_64";
|
|
43
|
+
}
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Resolve the archive of fpm bundle `version` for a host platform and arch, from that version's own checksum entry.
|
|
48
|
+
*
|
|
49
|
+
* Throws an {@link InvalidConfigurationError} for a version that has no checksum entry, or a host the release publishes
|
|
50
|
+
* no archive for, instead of downloading without a checksum to verify against.
|
|
51
|
+
*/
|
|
52
|
+
export function getFpmArchiveName(version, platform, arch) {
|
|
53
|
+
// The `toolsets.fpm` type and scheme.json only admit known versions, but a programmatic config bypasses both.
|
|
54
|
+
if (!Object.prototype.hasOwnProperty.call(fpmChecksums, version)) {
|
|
55
|
+
throw new InvalidConfigurationError(`Unknown toolsets.fpm version "${version}". Known versions: ${Object.keys(fpmChecksums).join(", ")} (or "latest"). ` +
|
|
56
|
+
`To use a custom bundle, set toolsets.fpm to a ToolsetCustom object (url + checksum) instead.`);
|
|
57
|
+
}
|
|
58
|
+
const suffix = fpmArchiveSuffix(platform, arch);
|
|
59
|
+
const filename = suffix == null ? undefined : Object.keys(fpmChecksums[version]).find(it => it.endsWith(`-${suffix}.7z`));
|
|
60
|
+
if (filename == null) {
|
|
61
|
+
throw new InvalidConfigurationError(`fpm@${version} has no bundle for ${platform}-${arch}. ` +
|
|
62
|
+
`Configure a custom toolset pointing at the directory containing your fpm executable, e.g. toolsets: { fpm: { url: "file:///absolute/path/to/fpm/dir" } }`);
|
|
63
|
+
}
|
|
64
|
+
return filename;
|
|
65
|
+
}
|
|
17
66
|
export async function getFpmPath(toolset, resourcesDir) {
|
|
18
67
|
const exec = "fpm";
|
|
19
68
|
// A custom toolset is an explicit user override — honored on every platform, before any platform default/fallback.
|
|
@@ -26,24 +75,8 @@ export async function getFpmPath(toolset, resourcesDir) {
|
|
|
26
75
|
// vector), require an explicit custom toolset pointing at the directory that contains the fpm executable.
|
|
27
76
|
throw new InvalidConfigurationError(`fpm is not bundled for Windows. Configure a custom toolset pointing at the directory containing your fpm executable, e.g. toolsets: { fpm: { url: "file:///absolute/path/to/fpm/dir" } }`);
|
|
28
77
|
}
|
|
29
|
-
const getKey = () => {
|
|
30
|
-
if (process.platform === "linux") {
|
|
31
|
-
if (process.arch == "x64") {
|
|
32
|
-
return "fpm-1.17.0-ruby-3.4.3-linux-amd64.7z";
|
|
33
|
-
}
|
|
34
|
-
else if (process.arch === "arm64") {
|
|
35
|
-
return "fpm-1.17.0-ruby-3.4.3-linux-arm64v8.7z";
|
|
36
|
-
}
|
|
37
|
-
return "fpm-1.17.0-ruby-3.4.3-linux-i386.7z";
|
|
38
|
-
}
|
|
39
|
-
// darwin arm64
|
|
40
|
-
if (process.arch === "arm64") {
|
|
41
|
-
return "fpm-1.17.0-ruby-3.4.3-darwin-arm64.7z";
|
|
42
|
-
}
|
|
43
|
-
return "fpm-1.17.0-ruby-3.4.3-darwin-x86_64.7z";
|
|
44
|
-
};
|
|
45
|
-
const filename = getKey();
|
|
46
78
|
const version = resolveToolsetVersion(toolset, FPM_LATEST);
|
|
79
|
+
const filename = getFpmArchiveName(version, process.platform, process.arch);
|
|
47
80
|
const fpmPath = await downloadBuilderToolset({
|
|
48
81
|
releaseName: `fpm@${version}`,
|
|
49
82
|
filenameWithExt: filename,
|
package/dist/toolsets/fpm.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fpm.js","sourceRoot":"","sources":["../../src/toolsets/fpm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAE5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAEpD,2EAA2E;AAC3E,MAAM,UAAU,GAAG,OAAO,CAAA;AAE1B,MAAM,YAAY,GAAG;
|
|
1
|
+
{"version":3,"file":"fpm.js","sourceRoot":"","sources":["../../src/toolsets/fpm.ts"],"names":[],"mappings":"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","sourcesContent":["import { InvalidConfigurationError } from \"builder-util\"\nimport * as path from \"path\"\nimport { ToolsetConfig } from \"../configuration.js\"\nimport { downloadBuilderToolset } from \"../util/electronGet.js\"\nimport { getCustomToolsetPath } from \"./custom.js\"\nimport { resolveToolsetVersion } from \"./version.js\"\n\n// Newest FPM bundle — selected when the config is unset / null / \"latest\".\nconst FPM_LATEST = \"2.3.1\"\n\n// Archive names carry the bundled fpm and Ruby versions, so they differ between releases: the keys of each\n// version's entry are its archive names, and `getFpmArchiveName` picks the one for the host platform.\nexport const fpmChecksums = {\n \"2.2.1\": {\n \"fpm-1.17.0-ruby-3.4.3-linux-amd64.7z\": \"2ef73acbcbfd26503369cb3a9b0345aa7fae251d69130537ee6ff47b402f828e\",\n \"fpm-1.17.0-ruby-3.4.3-darwin-x86_64.7z\": \"50eff4214e3e30e2a8bbc35854f80acabb3260ea9e87f5835c60f898eedb320e\",\n \"fpm-1.17.0-ruby-3.4.3-linux-arm64v8.7z\": \"553f047eacbc63423bae1eca5958bcdc720c1f6f4135cb815f5ec99f48d3bd55\",\n \"fpm-1.17.0-ruby-3.4.3-darwin-arm64.7z\": \"e44b60765367cd11b0b9fa5f1966762137ee45ec02d49a3e9668475031e97873\",\n \"fpm-1.17.0-ruby-3.4.3-linux-i386.7z\": \"f4091110728de8259dcab181761e74141b4b65d409a26e642c7271bd0b61eab4\",\n },\n // fpm 1.18.0, Ruby 3.4.12; Linux bundles link a static OpenSSL 3.5.9 (glibc floor still 2.28)\n \"2.3.1\": {\n \"fpm-1.18.0-ruby-3.4.12-darwin-arm64.7z\": \"40846b25ece8b24f30b6cbe3838a7cf3fd05b7e8f2133a50b6ef6f1ee12ba7c3\",\n \"fpm-1.18.0-ruby-3.4.12-darwin-x86_64.7z\": \"4299d345d906be224b47885ca1bb87b6a2cf688e1b04024d480987b051c68f76\",\n \"fpm-1.18.0-ruby-3.4.12-linux-amd64.7z\": \"25c7518f5187047fbd0268c8150f9fb795058f851c3954a0407bee7ed199ff87\",\n \"fpm-1.18.0-ruby-3.4.12-linux-arm64v8.7z\": \"ffa94aff17e68137867a4d2e63cebb4ff041ab7d360ec429430f0369162db983\",\n \"fpm-1.18.0-ruby-3.4.12-linux-i386.7z\": \"7b53b41729dbbcd75d3f4da16ae310d9dae6892b276c9d443e4e3e64990540c0\",\n },\n} as const\n\ntype FpmVersion = keyof typeof fpmChecksums\n\n/**\n * The platform/arch suffix of an fpm archive name (`fpm-<fpm>-ruby-<ruby>-<suffix>.7z`), or `null` for a host no\n * release publishes a bundle for. Every release uses the same suffixes.\n */\nfunction fpmArchiveSuffix(platform: NodeJS.Platform, arch: string): string | null {\n if (platform === \"linux\") {\n if (arch === \"x64\") {\n return \"linux-amd64\"\n } else if (arch === \"arm64\") {\n return \"linux-arm64v8\"\n }\n return \"linux-i386\"\n }\n if (platform === \"darwin\") {\n return arch === \"arm64\" ? \"darwin-arm64\" : \"darwin-x86_64\"\n }\n return null\n}\n\n/**\n * Resolve the archive of fpm bundle `version` for a host platform and arch, from that version's own checksum entry.\n *\n * Throws an {@link InvalidConfigurationError} for a version that has no checksum entry, or a host the release publishes\n * no archive for, instead of downloading without a checksum to verify against.\n */\nexport function getFpmArchiveName(version: string, platform: NodeJS.Platform, arch: string): string {\n // The `toolsets.fpm` type and scheme.json only admit known versions, but a programmatic config bypasses both.\n if (!Object.prototype.hasOwnProperty.call(fpmChecksums, version)) {\n throw new InvalidConfigurationError(\n `Unknown toolsets.fpm version \"${version}\". Known versions: ${Object.keys(fpmChecksums).join(\", \")} (or \"latest\"). ` +\n `To use a custom bundle, set toolsets.fpm to a ToolsetCustom object (url + checksum) instead.`\n )\n }\n const suffix = fpmArchiveSuffix(platform, arch)\n const filename = suffix == null ? undefined : Object.keys(fpmChecksums[version as FpmVersion]).find(it => it.endsWith(`-${suffix}.7z`))\n if (filename == null) {\n throw new InvalidConfigurationError(\n `fpm@${version} has no bundle for ${platform}-${arch}. ` +\n `Configure a custom toolset pointing at the directory containing your fpm executable, e.g. toolsets: { fpm: { url: \"file:///absolute/path/to/fpm/dir\" } }`\n )\n }\n return filename\n}\n\nexport async function getFpmPath(toolset: ToolsetConfig[\"fpm\"], resourcesDir: string) {\n const exec = \"fpm\"\n // A custom toolset is an explicit user override — honored on every platform, before any platform default/fallback.\n if (typeof toolset === \"object\" && toolset != null) {\n const vendorPath = await getCustomToolsetPath(toolset, resourcesDir)\n return path.resolve(vendorPath, exec)\n }\n\n if (process.platform === \"win32\") {\n // No fpm binary is bundled for Windows. Rather than resolving a bare `fpm` from $PATH (a binary-hijack\n // vector), require an explicit custom toolset pointing at the directory that contains the fpm executable.\n throw new InvalidConfigurationError(\n `fpm is not bundled for Windows. Configure a custom toolset pointing at the directory containing your fpm executable, e.g. toolsets: { fpm: { url: \"file:///absolute/path/to/fpm/dir\" } }`\n )\n }\n\n const version = resolveToolsetVersion(toolset, FPM_LATEST)\n const filename = getFpmArchiveName(version, process.platform, process.arch)\n const fpmPath = await downloadBuilderToolset({\n releaseName: `fpm@${version}`,\n filenameWithExt: filename,\n checksums: fpmChecksums[version],\n githubOrgRepo: \"electron-userland/electron-builder-binaries\",\n })\n return path.resolve(fpmPath, exec)\n}\n"]}
|
package/dist/toolsets/nsis.d.ts
CHANGED
|
@@ -1,18 +1,37 @@
|
|
|
1
1
|
import { Nullish } from "builder-util-runtime";
|
|
2
2
|
import { ToolsetConfig } from "../configuration.js";
|
|
3
3
|
import { ToolInfo } from "../util/bundledTool.js";
|
|
4
|
+
/** Which variant of a bundled NSIS toolset to use. */
|
|
5
|
+
export interface NsisToolsetOptions {
|
|
6
|
+
/**
|
|
7
|
+
* The target's `installerDebugLogging`: selects the log-enabled bundle (makensis and stubs compiled with `NSIS_CONFIG_LOG=yes`) for the
|
|
8
|
+
* versions that publish one. Ignored for the other versions and for a custom bundle.
|
|
9
|
+
*/
|
|
10
|
+
readonly debugLogging?: boolean;
|
|
11
|
+
}
|
|
4
12
|
export declare const nsisChecksums: {
|
|
5
13
|
readonly "0.0.0": {};
|
|
6
14
|
readonly "1.2.1": {
|
|
7
15
|
readonly "nsis-bundle-3.12.tar.gz": "56997fdefe25e7928a1a68b4583d08b240b66cf660234053b20131a74cc082f4";
|
|
8
16
|
};
|
|
17
|
+
readonly "2.0.4": {
|
|
18
|
+
readonly "nsis-bundle-3.13.tar.gz": "c18e9ad9684cf4c5bbd7b768cbf1b056d40771d7bd9ae1b513346452decf89d2";
|
|
19
|
+
readonly "nsis-bundle-3.13-log.tar.gz": "1803e6d45c91f6ed7860935940073fdc7857d52f2dabe123352c4676aeb635c7";
|
|
20
|
+
};
|
|
9
21
|
};
|
|
22
|
+
/**
|
|
23
|
+
* Whether `toolsets.nsis` can provide a log-enabled NSIS, which `installerDebugLogging` needs. The default (unset / `"latest"`) and
|
|
24
|
+
* `"2.0.4"` can (their `-log` bundle); the older pinned bundles (`"0.0.0"`, `"1.2.1"`) cannot. A custom bundle is assumed to be
|
|
25
|
+
* log-enabled (makensis rejects `LogSet` if it is not).
|
|
26
|
+
*/
|
|
27
|
+
export declare function isNsisLoggingSupported(nsis: ToolsetConfig["nsis"] | Nullish): boolean;
|
|
10
28
|
/**
|
|
11
29
|
* `installerDebugLogging` emits `LogSet`, which only a `makensis` compiled with `NSIS_CONFIG_LOG=yes` accepts ("LogSet specified,
|
|
12
|
-
* NSIS_CONFIG_LOG not defined" otherwise).
|
|
30
|
+
* NSIS_CONFIG_LOG not defined" otherwise). nsis@2.0.4 and newer publish a log-enabled bundle next to the default one; the older pinned
|
|
31
|
+
* bundles are not log-enabled.
|
|
13
32
|
*/
|
|
14
33
|
export declare function assertInstallerDebugLoggingSupported(nsis: ToolsetConfig["nsis"] | Nullish, targetName: string): void;
|
|
15
|
-
export declare function getMakeNsisPath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string): Promise<ToolInfo>;
|
|
16
|
-
export declare function getNsisPluginsPath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string): Promise<string>;
|
|
17
|
-
export declare function getNsisElevatePath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string): Promise<string>;
|
|
34
|
+
export declare function getMakeNsisPath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string, options?: NsisToolsetOptions): Promise<ToolInfo>;
|
|
35
|
+
export declare function getNsisPluginsPath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string, options?: NsisToolsetOptions): Promise<string>;
|
|
36
|
+
export declare function getNsisElevatePath(nsis: ToolsetConfig["nsis"] | Nullish, resourcesDir: string, options?: NsisToolsetOptions): Promise<string>;
|
|
18
37
|
//# sourceMappingURL=nsis.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nsis.d.ts","sourceRoot":"","sources":["../../src/toolsets/nsis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"nsis.d.ts","sourceRoot":"","sources":["../../src/toolsets/nsis.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAUjD,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAA;CAChC;AAmBD,eAAO,MAAM,aAAa;;;;;;;;;CAehB,CAAA;AAaV;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,GAAG,OAAO,CAMrF;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAYpH;AAuBD,wBAAsB,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA4BtJ;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAcvJ;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,GAAG,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,OAAO,GAAE,kBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CASvJ"}
|