From 5d27c0aa1b4198be343f8c7d45dac952b0b203bf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 16:05:40 +0000 Subject: [PATCH] Update electron-builder to v26.6.0 (#2821) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> --- package.json | 6 +- patches/dmg-builder+26.5.0.patch | 29 ------ yarn.lock | 167 ++++++++++++++++--------------- 3 files changed, 89 insertions(+), 113 deletions(-) delete mode 100644 patches/dmg-builder+26.5.0.patch diff --git a/package.json b/package.json index 44e2c3c6be..03d9e59285 100644 --- a/package.json +++ b/package.json @@ -85,12 +85,12 @@ "@types/pacote": "^11.1.1", "@typescript-eslint/eslint-plugin": "^8.0.0", "@typescript-eslint/parser": "^8.0.0", - "app-builder-lib": "26.5.0", + "app-builder-lib": "26.6.0", "chokidar": "^5.0.0", "detect-libc": "^2.0.0", "electron": "40.0.0", - "electron-builder": "26.5.0", - "electron-builder-squirrel-windows": "26.5.0", + "electron-builder": "26.6.0", + "electron-builder-squirrel-windows": "26.6.0", "electron-devtools-installer": "^4.0.0", "eslint": "^8.26.0", "eslint-config-google": "^0.14.0", diff --git a/patches/dmg-builder+26.5.0.patch b/patches/dmg-builder+26.5.0.patch deleted file mode 100644 index bd91dc2342..0000000000 --- a/patches/dmg-builder+26.5.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/node_modules/dmg-builder/out/dmgUtil.js b/node_modules/dmg-builder/out/dmgUtil.js -index acf576a..c306492 100644 ---- a/node_modules/dmg-builder/out/dmgUtil.js -+++ b/node_modules/dmg-builder/out/dmgUtil.js -@@ -99,7 +99,6 @@ async function customizeDmg({ appPath, artifactPath, volumeName, specification, - const settings = { - title: path.basename(volumePath), - icon: await packager.getResource(specification.icon), -- "badge-icon": await packager.getResource(specification.badgeIcon), - "icon-size": specification.iconSize, - "text-size": iconTextSize, - "compression-level": Number(process.env.ELECTRON_BUILDER_COMPRESSION_LEVEL || "9"), -@@ -114,6 +113,16 @@ async function customizeDmg({ appPath, artifactPath, volumeName, specification, - // hide_extension: c.hideExtension, - }))) || [], - }; -+ -+ if (specification.badgeIcon) { -+ let badgeIcon = await packager.getResource(specification.badgeIcon); -+ if (badgeIcon.toLowerCase().endsWith(".icon")) { -+ badgeIcon = await packager.generateIcnsFromIcon(badgeIcon) -+ } -+ settings["badge-icon"] = badgeIcon; -+ delete settings["icon"]; -+ } -+ - if (specification.backgroundColor != null || specification.background == null) { - settings["background-color"] = specification.backgroundColor || "#ffffff"; - const window = specification.window; diff --git a/yarn.lock b/yarn.lock index 4666671e64..b2a37f3da7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -945,6 +945,21 @@ optionalDependencies: global-agent "^3.0.0" +"@electron/get@^3.0.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-3.1.0.tgz#22c5a0bd917ab201badeb77bc4ad18cba54cb4ec" + integrity sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + "@electron/notarize@2.5.0": version "2.5.0" resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.5.0.tgz#d4d25356adfa29df4a76bd64a8bd347237cd251e" @@ -966,13 +981,12 @@ minimist "^1.2.6" plist "^3.0.5" -"@electron/rebuild@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.1.tgz#0620d5bb71a0b8b09a86fb9fa979244e1fcc10bf" - integrity sha512-iMGXb6Ib7H/Q3v+BKZJoETgF9g6KMNZVbsO4b7Dmpgb5qTFqyFTzqW9F3TOSHdybv2vKYKzSS9OiZL+dcJb+1Q== +"@electron/rebuild@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@electron/rebuild/-/rebuild-4.0.3.tgz#f022f7e66874920fd16a4d802b8605885cb549d3" + integrity sha512-u9vpTHRMkOYCs/1FLiSVAFZ7FbjsXK+bQuzviJZa+lG7BHZl1nz52/IcGvwa3sk80/fc3llutBkbCq10Vh8WQA== dependencies: "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" debug "^4.1.1" detect-libc "^2.0.1" got "^11.7.0" @@ -983,7 +997,7 @@ ora "^5.1.0" read-binary-file-arch "^1.0.6" semver "^7.3.5" - tar "^6.0.5" + tar "^7.5.6" yargs "^17.0.1" "@electron/universal@2.0.3": @@ -2454,17 +2468,18 @@ app-builder-bin@5.0.0-alpha.12: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-5.0.0-alpha.12.tgz#2daf82f8badc698e0adcc95ba36af4ff0650dc80" integrity sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w== -app-builder-lib@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.5.0.tgz#a247414e8017f5b0785eba53f6d3b4f14fc0c496" - integrity sha512-iRRiJhM0uFMauDeIuv8ESHZSn+LESbdDEuHi7rKdeETjrvBObecXnWJx1f3vs3KtoGcd3hCk1zURKypyvZOtFQ== +app-builder-lib@26.6.0: + version "26.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-26.6.0.tgz#1884ec93ffa25a4512111a369117bc2ae34666cd" + integrity sha512-P2naoSaGOqJY54cqTceO9lms2M790UM7BA8AlOuaolQhRp/LOshAVc4vzVlYFw4YNPtiuBJqdAhWALuoEKnayQ== dependencies: "@develar/schema-utils" "~2.6.5" "@electron/asar" "3.4.1" "@electron/fuses" "^1.8.0" + "@electron/get" "^3.0.0" "@electron/notarize" "2.5.0" "@electron/osx-sign" "1.3.3" - "@electron/rebuild" "4.0.1" + "@electron/rebuild" "^4.0.3" "@electron/universal" "2.0.3" "@malept/flatpak-bundler" "^0.4.0" "@types/fs-extra" "9.0.13" @@ -2477,7 +2492,7 @@ app-builder-lib@26.5.0: dotenv "^16.4.5" dotenv-expand "^11.0.6" ejs "^3.1.8" - electron-publish "26.4.1" + electron-publish "26.6.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" isbinaryfile "^5.0.0" @@ -2487,9 +2502,10 @@ app-builder-lib@26.5.0: lazy-val "^1.0.5" minimatch "^10.0.3" plist "3.1.0" + proper-lockfile "^4.1.2" resedit "^1.7.0" semver "~7.7.3" - tar "7.5.3" + tar "^7.5.6" temp-file "^3.4.0" tiny-async-pool "1.3.0" which "^5.0.0" @@ -2881,11 +2897,6 @@ chokidar@^5.0.0: dependencies: readdirp "^5.0.0" -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - chownr@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-3.0.0.tgz#9855e64ecd240a9cc4267ce8a4aa5d24a1da15e4" @@ -3249,12 +3260,12 @@ dir-compare@^4.2.0: minimatch "^3.0.5" p-limit "^3.1.0 " -dmg-builder@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.5.0.tgz#e8c287f59f26c99a7760a29959f6fd1e4ce9d5de" - integrity sha512-AyOCzpS1TCxDkSWxAzpfw5l7jBX4C8jKCucmT/6y6/24H5VKSHpjcVJD0W8o5BrFi+skC7Z7+F4aNyHmvn4AAw== +dmg-builder@26.6.0: + version "26.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-26.6.0.tgz#f80124372af2f601a75294eb543eba0582e61fb7" + integrity sha512-IkGlOLfJ3q7y9iaDMnNSArDdPg3Ntx8Ps6aL7yTEIpL6znA+t5L/LRTAGFz1J/12hM/NiNEYg0LoBEheqGdZXw== dependencies: - app-builder-lib "26.5.0" + app-builder-lib "26.6.0" builder-util "26.4.1" fs-extra "^10.1.0" iconv-lite "^0.6.2" @@ -3330,26 +3341,26 @@ ejs@^3.1.8: dependencies: jake "^10.8.5" -electron-builder-squirrel-windows@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.5.0.tgz#64b631c70342b4fec1498ed86623de9eae09a32c" - integrity sha512-pMXUzwHFIz3S6/jtzg4tB6LBqOM4buEChYCz73JGuV/cWoWhB4xTVVfFuXwrsu0uqhZw8zyhbpyWIEPTE76Dcg== +electron-builder-squirrel-windows@26.6.0: + version "26.6.0" + resolved "https://registry.yarnpkg.com/electron-builder-squirrel-windows/-/electron-builder-squirrel-windows-26.6.0.tgz#5f33fa81535b917d6676318b662f014e8f2e4d40" + integrity sha512-uKc/N0qPcygd2YDr52wfj07XOJPMG5KNT1ZTrumtmsykdBGreV1/poDcG5d/0KmoOpmxlkrnNJekM3eDvPzlQQ== dependencies: - app-builder-lib "26.5.0" + app-builder-lib "26.6.0" builder-util "26.4.1" electron-winstaller "5.4.0" -electron-builder@26.5.0: - version "26.5.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.5.0.tgz#9f9ec6954fd80f0d9897ca2f67044ffd4c8dbd96" - integrity sha512-DHvMBUmDscyvI/JvcJ1ZjrPqikzANbnX83MxUX5Daaeu2I8c2SxFM8LyKEepEZr1uomV1sw7yrLtKhKAT82OdA== +electron-builder@26.6.0: + version "26.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-26.6.0.tgz#0847c9a65486f969369576df60bd7be187548095" + integrity sha512-57JzccIwhqVRw83RaTdMLnSjzLL0dRQcp8r8oD7piRNBQh8UcCPaKeFmuJIzJabAAvQhG0+gx3F0pOVEOVXYwQ== dependencies: - app-builder-lib "26.5.0" + app-builder-lib "26.6.0" builder-util "26.4.1" builder-util-runtime "9.5.1" chalk "^4.1.2" ci-info "^4.2.0" - dmg-builder "26.5.0" + dmg-builder "26.6.0" fs-extra "^10.1.0" lazy-val "^1.0.5" simple-update-notifier "2.0.0" @@ -3362,16 +3373,16 @@ electron-devtools-installer@^4.0.0: dependencies: unzip-crx-3 "^0.2.0" -electron-publish@26.4.1: - version "26.4.1" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.4.1.tgz#2a88b9321e8e93a5efe91433a4d08de8c76f749f" - integrity sha512-nByal9K5Ar3BNJUfCSglXltpKUhJqpwivNpKVHnkwxTET9LKl+NxoojpGF1dSXVFcoBKVm+OhsVa28ZsoshEPA== +electron-publish@26.6.0: + version "26.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-26.6.0.tgz#94e8f00c163376ebb6b296544c11b61d3afc027d" + integrity sha512-LsyHMMqbvJ2vsOvuWJ19OezgF2ANdCiHpIucDHNiLhuI+/F3eW98ouzWSRmXXi82ZOPZXC07jnIravY4YYwCLQ== dependencies: "@types/fs-extra" "^9.0.11" builder-util "26.4.1" builder-util-runtime "9.5.1" chalk "^4.1.2" - form-data "^4.0.0" + form-data "^4.0.5" fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" @@ -4040,6 +4051,17 @@ form-data@^4.0.0: hasown "^2.0.2" mime-types "^2.1.12" +form-data@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053" + integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + es-set-tostringtag "^2.1.0" + hasown "^2.0.2" + mime-types "^2.1.12" + formatly@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/formatly/-/formatly-0.3.0.tgz#5bb3b4e692f5a8c74ad8fe26154dd0a74aac6819" @@ -4098,13 +4120,6 @@ fs-extra@^9.0.0, fs-extra@^9.0.1: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - fs-minipass@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-3.0.3.tgz#79a85981c4dc120065e96f62086bf6f9dc26cc54" @@ -5360,24 +5375,11 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" -minipass@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" - integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== - "minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.0.2, minipass@^7.0.3, minipass@^7.0.4, minipass@^7.1.2: version "7.1.2" resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707" integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw== -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - minizlib@^3.0.1, minizlib@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-3.1.0.tgz#6ad76c3a8f10227c9b51d1c9ac8e30b27f5a251c" @@ -5392,11 +5394,6 @@ mkdirp@^0.5.1: dependencies: minimist "^1.2.6" -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - mkdirp@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" @@ -6039,6 +6036,15 @@ promise-retry@^2.0.1: err-code "^2.0.2" retry "^0.12.0" +proper-lockfile@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-4.1.2.tgz#c8b9de2af6b2f1601067f98e01ac66baa223141f" + integrity sha512-TjNPblN4BwAWMXU8s9AEz4JmQxnD1NNL7bNOY/AKUzyamc379FWASUhc/K1pL2noVb+XmZKLL68cjzLsiOAMaA== + dependencies: + graceful-fs "^4.2.4" + retry "^0.12.0" + signal-exit "^3.0.2" + pump@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.2.tgz#836f3edd6bc2ee599256c924ffe0d88573ddcbf8" @@ -6834,7 +6840,18 @@ tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.3.0.tgz#7e3ea6d5ca31ba8e078b560f0d83ce9a14aa8be6" integrity sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg== -tar@7.5.3, tar@^7.4.3, tar@^7.5.2: +tar@^7.0.0: + version "7.5.6" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.6.tgz#2db7a210748a82f0a89cc31527b90d3a24984fb7" + integrity sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA== + dependencies: + "@isaacs/fs-minipass" "^4.0.0" + chownr "^3.0.0" + minipass "^7.1.2" + minizlib "^3.1.0" + yallist "^5.0.0" + +tar@^7.4.3, tar@^7.5.2: version "7.5.3" resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.3.tgz#e1a41236e32446f75e63b720222112c4ffe5b3a1" integrity sha512-ENg5JUHUm2rDD7IvKNFGzyElLXNjachNLp6RaGf4+JOgxXHkqA+gq81ZAMCUmtMtqBsoU62lcp6S27g1LCYGGQ== @@ -6845,22 +6862,10 @@ tar@7.5.3, tar@^7.4.3, tar@^7.5.2: minizlib "^3.1.0" yallist "^5.0.0" -tar@^6.0.5: - version "6.2.1" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a" - integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^5.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -tar@^7.0.0: - version "7.5.6" - resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.6.tgz#2db7a210748a82f0a89cc31527b90d3a24984fb7" - integrity sha512-xqUeu2JAIJpXyvskvU3uvQW8PAmHrtXp2KDuMJwQqW8Sqq0CaZBAQ+dKS3RBXVhU4wC5NjAdKrmh84241gO9cA== +tar@^7.5.6: + version "7.5.7" + resolved "https://registry.yarnpkg.com/tar/-/tar-7.5.7.tgz#adf99774008ba1c89819f15dbd6019c630539405" + integrity sha512-fov56fJiRuThVFXD6o6/Q354S7pnWMJIVlDBYijsTNx6jKSE4pvrDTs6lUnmGvNyfJwFQQwWy3owKz1ucIhveQ== dependencies: "@isaacs/fs-minipass" "^4.0.0" chownr "^3.0.0"