diff --git a/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch b/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch index d4381aa11c..cb835faf39 100644 --- a/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch +++ b/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch @@ -1,75 +1,56 @@ -diff --git a/out/macPackager.js b/out/macPackager.js -index 852f6c4d16f86a7bb8a78bf1ed5a14647a279aa1..60e7f5f16a844541eb1909b215fcda1811e924b8 100644 ---- a/out/macPackager.js -+++ b/out/macPackager.js -@@ -423,7 +423,7 @@ class MacPackager extends platformPackager_1.PlatformPackager { - } - appPlist.CFBundleName = appInfo.productName; - appPlist.CFBundleDisplayName = appInfo.productName; -- const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion; -+ const minimumSystemVersion = this.platformSpecificBuildOptions.LSMinimumSystemVersion; - if (minimumSystemVersion != null) { - appPlist.LSMinimumSystemVersion = minimumSystemVersion; - } -diff --git a/out/publish/updateInfoBuilder.js b/out/publish/updateInfoBuilder.js -index 7924c5b47d01f8dfccccb8f46658015fa66da1f7..1a1588923c3939ae1297b87931ba83f0ebc052d8 100644 ---- a/out/publish/updateInfoBuilder.js -+++ b/out/publish/updateInfoBuilder.js -@@ -133,6 +133,7 @@ async function createUpdateInfo(version, event, releaseInfo) { - const customUpdateInfo = event.updateInfo; - const url = path.basename(event.file); - const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await (0, hash_1.hashFile)(event.file)); -+ const minimumSystemVersion = customUpdateInfo == null ? null : customUpdateInfo.minimumSystemVersion; - const files = [{ url, sha512 }]; - const result = { - // @ts-ignore -@@ -143,9 +144,13 @@ async function createUpdateInfo(version, event, releaseInfo) { - path: url /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */, - // @ts-ignore - sha512 /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */, -+ minimumSystemVersion, - ...releaseInfo, - }; - if (customUpdateInfo != null) { -+ if (customUpdateInfo.minimumSystemVersion) { -+ delete customUpdateInfo.minimumSystemVersion; -+ } - // file info or nsis web installer packages info - Object.assign("sha512" in customUpdateInfo ? files[0] : result, customUpdateInfo); - } -diff --git a/out/targets/ArchiveTarget.js b/out/targets/ArchiveTarget.js -index e1f52a5fa86fff6643b2e57eaf2af318d541f865..47cc347f154a24b365e70ae5e1f6d309f3582ed0 100644 ---- a/out/targets/ArchiveTarget.js -+++ b/out/targets/ArchiveTarget.js -@@ -69,6 +69,9 @@ class ArchiveTarget extends core_1.Target { - } - } - } -+ if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) { -+ updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion; -+ } - await packager.info.emitArtifactBuildCompleted({ - updateInfo, - file: artifactPath, -diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js -index e8bd7bb46c8a54b3f55cf3a853ef924195271e01..f956e9f3fe9eb903c78aef3502553b01de4b89b1 100644 ---- a/out/targets/nsis/NsisTarget.js -+++ b/out/targets/nsis/NsisTarget.js -@@ -305,6 +305,9 @@ class NsisTarget extends core_1.Target { - if (updateInfo != null && isPerMachine && (oneClick || options.packElevateHelper)) { - updateInfo.isAdminRightsRequired = true; - } -+ if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) { -+ updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion; -+ } - await packager.info.emitArtifactBuildCompleted({ - file: installerPath, - updateInfo, +diff --git a/out/configuration.d.ts b/out/configuration.d.ts +index 7ad2646c023e7980021a010fc505aad7d1b52831..60849d54420d2b42e1b0977a4143ca6f598abab1 100644 +--- a/out/configuration.d.ts ++++ b/out/configuration.d.ts +@@ -173,6 +173,10 @@ export interface CommonConfiguration { + * [Experimental] Configuration for concurrent builds. + */ + readonly concurrency?: Concurrency | null; ++ /** ++ * The modules to exclude from the rebuild. ++ */ ++ readonly excludeReBuildModules?: Array | null; + } + export interface Configuration extends CommonConfiguration, PlatformSpecificBuildOptions, Hooks { + /** +diff --git a/out/util/yarn.js b/out/util/yarn.js +index 1ee20f8b252a8f28d0c7b103789cf0a9a427aec1..c2878ec54d57da50bf14225e0c70c9c88664eb8a 100644 +--- a/out/util/yarn.js ++++ b/out/util/yarn.js +@@ -140,6 +140,7 @@ async function rebuild(config, { appDir, projectDir }, options) { + arch, + platform, + buildFromSource, ++ ignoreModules: config.excludeReBuildModules || undefined, + projectRootPath: projectDir, + mode: config.nativeRebuilder || "sequential", + disablePreGypCopy: true, diff --git a/scheme.json b/scheme.json -index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43ebd0fa8b61 100644 +index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..c8827e218f66c45bdaec86b898fb932b9b98764c 100644 --- a/scheme.json +++ b/scheme.json -@@ -1975,6 +1975,13 @@ +@@ -1825,6 +1825,20 @@ + "string" + ] + }, ++ "excludeReBuildModules": { ++ "anyOf": [ ++ { ++ "items": { ++ "type": "string" ++ }, ++ "type": "array" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "description": "The modules to exclude from the rebuild." ++ }, + "executableArgs": { + "anyOf": [ + { +@@ -1975,6 +1989,13 @@ ], "description": "The mime types in addition to specified in the file associations. Use it if you don't want to register a new mime type, but reuse existing." }, @@ -83,7 +64,7 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "packageCategory": { "description": "backward compatibility + to allow specify fpm-only category for all possible fpm targets in one place", "type": [ -@@ -2327,6 +2334,13 @@ +@@ -2327,6 +2348,13 @@ "MacConfiguration": { "additionalProperties": false, "properties": { @@ -97,7 +78,28 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "additionalArguments": { "anyOf": [ { -@@ -2737,7 +2751,7 @@ +@@ -2527,6 +2555,20 @@ + "string" + ] + }, ++ "excludeReBuildModules": { ++ "anyOf": [ ++ { ++ "items": { ++ "type": "string" ++ }, ++ "type": "array" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "description": "The modules to exclude from the rebuild." ++ }, + "executableName": { + "description": "The executable name. Defaults to `productName`.", + "type": [ +@@ -2737,7 +2779,7 @@ "type": "boolean" }, "minimumSystemVersion": { @@ -106,7 +108,7 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "type": [ "null", "string" -@@ -2959,6 +2973,13 @@ +@@ -2959,6 +3001,13 @@ "MasConfiguration": { "additionalProperties": false, "properties": { @@ -120,7 +122,28 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "additionalArguments": { "anyOf": [ { -@@ -3369,7 +3390,7 @@ +@@ -3159,6 +3208,20 @@ + "string" + ] + }, ++ "excludeReBuildModules": { ++ "anyOf": [ ++ { ++ "items": { ++ "type": "string" ++ }, ++ "type": "array" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "description": "The modules to exclude from the rebuild." ++ }, + "executableName": { + "description": "The executable name. Defaults to `productName`.", + "type": [ +@@ -3369,7 +3432,7 @@ "type": "boolean" }, "minimumSystemVersion": { @@ -129,7 +152,28 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "type": [ "null", "string" -@@ -6507,6 +6528,13 @@ +@@ -6381,6 +6444,20 @@ + "string" + ] + }, ++ "excludeReBuildModules": { ++ "anyOf": [ ++ { ++ "items": { ++ "type": "string" ++ }, ++ "type": "array" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "description": "The modules to exclude from the rebuild." ++ }, + "executableName": { + "description": "The executable name. Defaults to `productName`.", + "type": [ +@@ -6507,6 +6584,13 @@ "string" ] }, @@ -143,7 +187,28 @@ index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43eb "protocols": { "anyOf": [ { -@@ -7376,6 +7404,13 @@ +@@ -7153,6 +7237,20 @@ + "string" + ] + }, ++ "excludeReBuildModules": { ++ "anyOf": [ ++ { ++ "items": { ++ "type": "string" ++ }, ++ "type": "array" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "description": "The modules to exclude from the rebuild." ++ }, + "executableName": { + "description": "The executable name. Defaults to `productName`.", + "type": [ +@@ -7376,6 +7474,13 @@ ], "description": "MAS (Mac Application Store) development options (`mas-dev` target)." }, diff --git a/yarn.lock b/yarn.lock index 74b503ec1c..5f27227669 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6036,7 +6036,7 @@ __metadata: "app-builder-lib@patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch": version: 26.0.15 - resolution: "app-builder-lib@patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch::version=26.0.15&hash=b02ae9" + resolution: "app-builder-lib@patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch::version=26.0.15&hash=1e6426" dependencies: "@develar/schema-utils": "npm:~2.6.5" "@electron/asar": "npm:3.4.1" @@ -6074,7 +6074,7 @@ __metadata: peerDependencies: dmg-builder: 26.0.15 electron-builder-squirrel-windows: 26.0.15 - checksum: 10c0/616072842c01f9f65283c95bf5642106c32bc3c6679672955f57b48bae9c28de10e18f2005d0e6e46cb2cb560dda3869ebf1412d3db50b7872c5f660581ad6db + checksum: 10c0/99dab1abe455f964152e5e37fceb08b389858ac5c8c0147887b73100f3bd9f9ebbf3760432b376983ce732e2c42dd866d27010809a3b658d9281501e0f82f343 languageName: node linkType: hard