diff --git a/patches/app-builder-lib.patch b/patches/app-builder-lib.patch index 8b473ed9e6..2fcef800f6 100644 --- a/patches/app-builder-lib.patch +++ b/patches/app-builder-lib.patch @@ -1,3 +1,36 @@ +diff --git a/out/asar/asarUtil.js b/out/asar/asarUtil.js +index bea8a3b1b2ab56d99ea3679eb88aaf0b4b646803..622e362315642a7144021bbb885e571e9e948e07 100644 +--- a/out/asar/asarUtil.js ++++ b/out/asar/asarUtil.js +@@ -149,15 +149,24 @@ class AsarPackager { + if (a === b) { + return 0; + } ++ // SIGNAL CHANGE START + // Place addons last because their signature changes per build +- const isAAddon = a.endsWith(".node"); +- const isBAddon = b.endsWith(".node"); +- if (isAAddon && !isBAddon) { ++ function isFickle(name) { ++ return name.endsWith(".node") || ++ name.endsWith(path.sep + "local-production.json") || ++ name.endsWith(path.sep + "preload.bundle.js") || ++ name.endsWith(path.sep + "preload.bundle.cache") || ++ name.endsWith(path.sep + "package.json"); ++ } ++ const isAFickle = isFickle(a); ++ const isBFickle = isFickle(b); ++ if (isAFickle && !isBFickle) { + return 1; + } +- if (isBAddon && !isAAddon) { ++ if (isBFickle && !isAFickle) { + return -1; + } ++ // SIGNAL CHANGE END + // Otherwise order by name + return a < b ? -1 : 1; + }); diff --git a/out/targets/FpmTarget.js b/out/targets/FpmTarget.js index 47e6f48fcbed88b6ac07cff15c888c1b8b59721f..76dd6cc7265054222f2d70c76aa8456d550f29d1 100644 --- a/out/targets/FpmTarget.js @@ -42,7 +75,7 @@ index 6cf860bd2847bae35ca8885cb680dd6c8c516e39..a3cb08a6dc7970ab2b32c731f41ea6e4 + +# SIGNAL CHANGES END diff --git a/templates/linux/after-remove.tpl b/templates/linux/after-remove.tpl -index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..676e76bae609cd3309be87a4606346f75945e900 100644 +index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..b5011d1b8cdb741ba6453f942a3c0660b66d41a0 100644 --- a/templates/linux/after-remove.tpl +++ b/templates/linux/after-remove.tpl @@ -13,3 +13,12 @@ APPARMOR_PROFILE_DEST='/etc/apparmor.d/${executable}' @@ -58,6 +91,7 @@ index 19b3decabe18a816f9ed5440fa9124ebfd6e3907..676e76bae609cd3309be87a4606346f7 +fi + +# SIGNAL CHANGES END +\ No newline at end of file diff --git a/templates/nsis/include/installer.nsh b/templates/nsis/include/installer.nsh index 34e91dfe82fdbb2e929820f2e8deb771b7f7893c..73bfffc6c227a018cbbeb690d6d7b882ed142fc8 100644 --- a/templates/nsis/include/installer.nsh diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f3387efbff..14dcd34ed0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -29,7 +29,7 @@ patchedDependencies: hash: e8a96f71e52bf903c9f1eadba4740489a0beb48da33db52354adca484fe1f495 path: patches/@vitest+expect+2.0.5.patch app-builder-lib: - hash: a1775a435732fdbd3b69305053bea4776c854378984940cbd2a541d692902664 + hash: bcbaa020b1d47a2b1e6ba770e561454819f95f13e01361cc3b2a25560a607fd5 path: patches/app-builder-lib.patch casual@1.6.2: hash: b88b5052437cbdc1882137778b76ca5037f71b2a030ae9ef39dc97f51670d599 @@ -15663,7 +15663,7 @@ snapshots: app-builder-bin@5.0.0-alpha.12: {} - app-builder-lib@26.0.14(patch_hash=a1775a435732fdbd3b69305053bea4776c854378984940cbd2a541d692902664)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14): + app-builder-lib@26.0.14(patch_hash=bcbaa020b1d47a2b1e6ba770e561454819f95f13e01361cc3b2a25560a607fd5)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14): dependencies: '@develar/schema-utils': 2.6.5 '@electron/asar': 3.4.1 @@ -16882,7 +16882,7 @@ snapshots: dmg-builder@26.0.14(patch_hash=cb72ed47fa8d45513a36db33fcb41cb75c30cada4737da067bf3fa1f063725f2)(electron-builder-squirrel-windows@26.0.14): dependencies: - app-builder-lib: 26.0.14(patch_hash=a1775a435732fdbd3b69305053bea4776c854378984940cbd2a541d692902664)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) + app-builder-lib: 26.0.14(patch_hash=bcbaa020b1d47a2b1e6ba770e561454819f95f13e01361cc3b2a25560a607fd5)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) builder-util: 26.0.13 builder-util-runtime: 9.3.2 fs-extra: 10.1.0 @@ -17028,7 +17028,7 @@ snapshots: electron-builder-squirrel-windows@26.0.14(dmg-builder@26.0.14): dependencies: - app-builder-lib: 26.0.14(patch_hash=a1775a435732fdbd3b69305053bea4776c854378984940cbd2a541d692902664)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) + app-builder-lib: 26.0.14(patch_hash=bcbaa020b1d47a2b1e6ba770e561454819f95f13e01361cc3b2a25560a607fd5)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) builder-util: 26.0.13 electron-winstaller: 5.4.0 transitivePeerDependencies: @@ -17038,7 +17038,7 @@ snapshots: electron-builder@26.0.14(electron-builder-squirrel-windows@26.0.14): dependencies: - app-builder-lib: 26.0.14(patch_hash=a1775a435732fdbd3b69305053bea4776c854378984940cbd2a541d692902664)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) + app-builder-lib: 26.0.14(patch_hash=bcbaa020b1d47a2b1e6ba770e561454819f95f13e01361cc3b2a25560a607fd5)(dmg-builder@26.0.14)(electron-builder-squirrel-windows@26.0.14) builder-util: 26.0.13 builder-util-runtime: 9.3.2 chalk: 4.1.2