enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Update electron-builder to v26.11.1 (#33563)

Browse Source 
* Update electron-builder to v26.11.1

* Update patch

* Make tsc happy

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
renovate[bot]
2026-05-27 14:50:12 +01:00
committed by GitHub
parent 3c6233c3a3
commit efeef6cd84
4 changed files with 88 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/hak/tsconfig.json
+2 -1
View File
@@ -8,7 +8,8 @@
"strict": true,
"lib": ["es2022"],
"types": ["node"],
"allowImportingTsExtensions": true
"allowImportingTsExtensions": true,
"skipLibCheck": true
},
"include": ["../scripts/@types/*.d.ts", "./**/*.ts"]
}
apps/desktop/package.json
+3 -3
View File
@@ -83,12 +83,12 @@
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@vitest/coverage-v8": "catalog:",
"app-builder-lib": "26.9.1",
"app-builder-lib": "26.11.1",
"chokidar": "^5.0.0",
"detect-libc": "^2.0.0",
"electron": "42.2.0",
"electron-builder": "26.9.1",
"electron-builder-squirrel-windows": "26.9.1",
"electron-builder": "26.11.1",
"electron-builder-squirrel-windows": "26.11.1",
"electron-devtools-installer": "^4.0.0",
"eslint": "^8.26.0",
"eslint-config-google": "^0.14.0",
patches/app-builder-lib.patch
+11 -5
View File
@@ -1,5 +1,5 @@
diff --git a/out/node-module-collector/moduleManager.js b/out/node-module-collector/moduleManager.js
index f483d9387a3270afc884b8478f19dd2825477a04..a718d92825b4813bc27eb10775a70d8e0731fcf7 100644
index e9d6d16f8950c01417039d65ed1939009d642b7a..9f47c5e18fb34fe60e4f09bf512f9639aa2d90c0 100644
--- a/out/node-module-collector/moduleManager.js
+++ b/out/node-module-collector/moduleManager.js
@@ -5,6 +5,7 @@ const builder_util_1 = require("builder-util");
@@ -10,16 +10,22 @@ index f483d9387a3270afc884b8478f19dd2825477a04..a718d92825b4813bc27eb10775a70d8e
var LogMessageByKey;
(function (LogMessageByKey) {
LogMessageByKey["PKG_DUPLICATE_REF"] = "duplicate dependency references";
@@ -115,8 +116,12 @@ class ModuleManager {
@@ -115,15 +116,15 @@ class ModuleManager {
return { packageDir: path.dirname(direct), packageJson: json };
}
}
- // 2) upward hoisted search, then 3) downward non-hoisted search
- return (await this.upwardSearch(parentDir, pkgName, requiredRange)) || (await this.downwardSearch(parentDir, pkgName, requiredRange)) || null;
+ // 2) upward hoisted search, then 3) downward non-hoisted search, then 4) downward from workspace root
const upward = await this.upwardSearch(parentDir, pkgName, requiredRange);
if (upward) {
return upward;
}
- if (skipDownwardSearch) {
- return null;
- }
- return (await this.downwardSearch(parentDir, pkgName, requiredRange)) || null;
+ const workspaceRoot = await searchModule.getProjectRootPath(parentDir);
+ return (await this.upwardSearch(parentDir, pkgName, requiredRange)) ||
+ (await this.downwardSearch(parentDir, pkgName, requiredRange)) ||
+ return (await this.downwardSearch(parentDir, pkgName, requiredRange)) ||
+ (await this.downwardSearch(workspaceRoot, pkgName, requiredRange)) ||
+ null;
}
pnpm-lock.yaml
Generated
+72 -47
View File
@@ -89,7 +89,7 @@ patchedDependencies:
hash: 7bdf6150f2905bc2f055a6bcaa7b9d78fa7ffde82e800bcc454ac7b0096bd65e
path: patches/@vector-im__matrix-wysiwyg.patch
app-builder-lib:
hash: 2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6
hash: 61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f
path: patches/app-builder-lib.patch
await-lock:
hash: b767a571946a4f8710ac54b1a7bec8a7c1570f9b85d75922392fae20d0578964
@@ -257,8 +257,8 @@ importers:
specifier: 'catalog:'
version: 4.1.7(@vitest/browser@4.1.7)(vitest@4.1.7)
app-builder-lib:
specifier: 26.9.1
version: 26.9.1(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.9.1)(electron-builder-squirrel-windows@26.9.1)
specifier: 26.11.1
version: 26.11.1(patch_hash=61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f)(dmg-builder@26.11.1)(electron-builder-squirrel-windows@26.11.1)
chokidar:
specifier: ^5.0.0
version: 5.0.0
@@ -269,11 +269,11 @@ importers:
specifier: 42.2.0
version: 42.2.0
electron-builder:
specifier: 26.9.1
version: 26.9.1(electron-builder-squirrel-windows@26.9.1)
specifier: 26.11.1
version: 26.11.1(electron-builder-squirrel-windows@26.11.1)
electron-builder-squirrel-windows:
specifier: 26.9.1
version: 26.9.1(dmg-builder@26.9.1)
specifier: 26.11.1
version: 26.11.1(dmg-builder@26.11.1)
electron-devtools-installer:
specifier: ^4.0.0
version: 4.0.0
@@ -6468,12 +6468,12 @@ packages:
app-builder-bin@5.0.0-alpha.12:
resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==}
app-builder-lib@26.9.1:
resolution: {integrity: sha512-/b9NA7fUablchSKEeGfUrwkJL9JI4xEMZWlbNn1YLV0WUtkkOQNz0LBo8tUIK0GSD+KVo+Kxzlv71459PRIqOA==}
app-builder-lib@26.11.1:
resolution: {integrity: sha512-KCZm58CifmTGbzw9PZOyDEecwjY3jY9cQ4uBRIDxZYhaJqqsz0RQFkryoV+EPhjVlkPql7Jsg6SNUkz837Bkhw==}
engines: {node: '>=14.0.0'}
peerDependencies:
dmg-builder: 26.9.1
electron-builder-squirrel-windows: 26.9.1
dmg-builder: 26.11.1
electron-builder-squirrel-windows: 26.11.1
applescript@1.0.0:
resolution: {integrity: sha512-yvtNHdWvtbYEiIazXAdp/NY+BBb65/DAseqlNiJQjOx9DynuzOYDbVLBJvuc0ve0VL9x6B3OHF6eH52y9hCBtQ==}
@@ -6817,6 +6817,9 @@ packages:
resolution: {integrity: sha512-BdnPWo2OpYhlvuP2fRzJBdioMCkm7Zp0HCf8NJgF5Mbyqy7VQ/CnTiVWMMyq4EZCBHwj0Kq6098gW2/3RsZsrA==}
engines: {node: '>=12'}
bluebird@3.7.2:
resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
blurhash@2.0.5:
resolution: {integrity: sha512-cRygWd7kGBQO3VEhPiTgq4Wc43ctsM+o46urrmPOiuAe+07fzlSB9OJVdpgDL0jPqXUVQ9ht7aq7kxOeJHRK+w==}
@@ -6917,12 +6920,13 @@ packages:
resolution: {integrity: sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==}
engines: {node: '>=10.0.0'}
builder-util-runtime@9.6.0:
resolution: {integrity: sha512-k9V5I18PXLepLZ8jVmPzsH+gVCVZ+9aMVLyCZ0ZLOkT2KSyiBblDCCN8WxDbjOpfLGNHZqqJPBmW0HYeqxlgkQ==}
builder-util-runtime@9.6.1:
resolution: {integrity: sha512-gnk+lN50T7TIRp4bHTVydSnWsNkYAxGiDDbed3U26Z82s1lr8em4E4fLs/EPfIEZIbfi4Zfo5NsdA9gHWbPmXg==}
engines: {node: '>=12.0.0'}
builder-util@26.9.0:
resolution: {integrity: sha512-+eocmbdisnyb40B9nAp/KREfYLXvGagxV50KZv/Zh4aflsr1fdY9Qxs6QG1Jtx1vH5d5NQ3hIcemUi4RSlFK/Q==}
builder-util@26.11.1:
resolution: {integrity: sha512-oWRbAjgN9RdVCLvNVN9ltZwaUkrH/FrH8wdggAwpz426PTdcbGEARp7J1HXad/QijURPxYL+BKykThaRjluPIQ==}
engines: {node: '>=14.0.0'}
builtin-modules@3.3.0:
resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
@@ -7845,8 +7849,8 @@ packages:
dir-compare@4.2.0:
resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
dmg-builder@26.9.1:
resolution: {integrity: sha512-9o6jEwYrDJBXZzWBz7gOMVFM8S7ra7t5bYwEoqx5ZWLUS/4z6cboXqHOly/AJ9jkVKqT+Z3BdXkvBuJvotHiYw==}
dmg-builder@26.11.1:
resolution: {integrity: sha512-uFE7wiNn/GJ/MCtHz9ZIYj8w+27WTKush6PX6a1rt7RWJ5Ua4WgK6PAgErSBQXk0Q8UM4YMTXUBNFhN1gR+1qw==}
dmg-license@1.0.11:
resolution: {integrity: sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q==}
@@ -7967,6 +7971,9 @@ packages:
resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
engines: {node: '>= 0.4'}
duplexer2@0.1.4:
resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
earcut@3.0.2:
resolution: {integrity: sha512-X7hshQbLyMJ/3RPhyObLARM2sNxxmRALLKx1+NVFFnQ9gKzmCrxm9+uLIAdBcvc8FNLpctqlQ2V6AE92Ol9UDQ==}
@@ -7986,19 +7993,19 @@ packages:
engines: {node: '>=0.12.18'}
hasBin: true
electron-builder-squirrel-windows@26.9.1:
resolution: {integrity: sha512-mz3b6Fj1yQ7NGffz5hhHUZ4Y8vJhluSjjYi+UjqCdF3AKbIsFoi85xdUFc0aJ4c7dh05h7hHKqeiGkKb5BEalQ==}
electron-builder-squirrel-windows@26.11.1:
resolution: {integrity: sha512-qWplLUSGhcjKClb1G8c9TOI5abYZGsIP7YlA6jSBLPFdSvN+teV30jFZsNgM1KYeMD6liqNZaRjySJ/zSq+X8A==}
electron-builder@26.9.1:
resolution: {integrity: sha512-BJMGeX4zUf/p2aMv8+GuLJFo4NaUo+8OTNTAW7DtQb6GGHmp6Y9gd6L+sRfDaI8IfYyBqEu3euvwC/DHrlGTPg==}
electron-builder@26.11.1:
resolution: {integrity: sha512-CMG8PQAnUBWIx9THpwWysrHfJQs9Q1E1VDayK+ZkNqvih+ao8mywMP5v2ohLkzlg1ZeVyvkQP6oICJGzyeCAUQ==}
engines: {node: '>=14.0.0'}
hasBin: true
electron-devtools-installer@4.0.0:
resolution: {integrity: sha512-9Tntu/jtfSn0n6N/ZI6IdvRqXpDyLQiDuuIbsBI+dL+1Ef7C8J2JwByw58P3TJiNeuqyV3ZkphpNWuZK5iSY2w==}
electron-publish@26.9.0:
resolution: {integrity: sha512-gsy+U7JfDuD1lPOrCXeECDQoUsWjFah3s1Fv3pqKnjdJuKYDDvGdvC74kLHVG6nl5G0uQ7YN0eftCQ4rUmhvVw==}
electron-publish@26.11.1:
resolution: {integrity: sha512-aMugkYS7QZtS/PjbyOSh0MlymxoWppj7+lEcqmsO1jM6igedcgAdFtmWms3g/DdMPpCZDVKxzkC4a3UK6HGlmA==}
electron-store@11.0.2:
resolution: {integrity: sha512-4VkNRdN+BImL2KcCi41WvAYbh6zLX5AUTi4so68yPqiItjbgTjqpEnGAqasgnG+lB6GuAyUltKwVopp6Uv+gwQ==}
@@ -10109,7 +10116,7 @@ packages:
resolution: {integrity: sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==}
matrix-js-sdk@https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ec54b54a8964e87832421a8e1faf60ede9364798:
resolution: {gitHosted: true, integrity: sha512-M8FIPM5lhZcvUKBwovJ2R+gMt5OgQ+VU4XJl0Pft6i5rK12birfBUXDDhSdoMDxajAmZXyeD1VtzbPODWGuBoQ==, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ec54b54a8964e87832421a8e1faf60ede9364798}
resolution: {gitHosted: true, tarball: https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ec54b54a8964e87832421a8e1faf60ede9364798}
version: 41.6.0
engines: {node: '>=22.0.0'}
@@ -13043,6 +13050,9 @@ packages:
unzip-crx-3@0.2.0:
resolution: {integrity: sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==}
unzipper@0.12.3:
resolution: {integrity: sha512-PZ8hTS+AqcGxsaQntl3IRBw65QrBI6lxzqDEL7IAo/XCEqRTKGfOX56Vea5TH9SZczRVxuzk1re04z/YjuYCJA==}
update-browserslist-db@1.2.3:
resolution: {integrity: sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==}
hasBin: true
@@ -19406,7 +19416,7 @@ snapshots:
app-builder-bin@5.0.0-alpha.12: {}
app-builder-lib@26.9.1(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.9.1)(electron-builder-squirrel-windows@26.9.1):
app-builder-lib@26.11.1(patch_hash=61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f)(dmg-builder@26.11.1)(electron-builder-squirrel-windows@26.11.1):
dependencies:
'@develar/schema-utils': 2.6.5
'@electron/asar': 3.4.1
@@ -19419,17 +19429,17 @@ snapshots:
'@malept/flatpak-bundler': 0.4.0
'@types/fs-extra': 9.0.13
async-exit-hook: 2.0.1
builder-util: 26.9.0
builder-util-runtime: 9.6.0
builder-util: 26.11.1
builder-util-runtime: 9.6.1
chromium-pickle-js: 0.2.0
ci-info: 4.3.1
debug: 4.4.3
dmg-builder: 26.9.1(electron-builder-squirrel-windows@26.9.1)
dmg-builder: 26.11.1(electron-builder-squirrel-windows@26.11.1)
dotenv: 16.6.1
dotenv-expand: 11.0.7
ejs: 3.1.10
electron-builder-squirrel-windows: 26.9.1(dmg-builder@26.9.1)
electron-publish: 26.9.0
electron-builder-squirrel-windows: 26.11.1(dmg-builder@26.11.1)
electron-publish: 26.11.1
fs-extra: 10.1.0
hosted-git-info: 4.1.0
isbinaryfile: 5.0.7
@@ -19445,6 +19455,7 @@ snapshots:
tar: 7.5.15
temp-file: 3.4.0
tiny-async-pool: 1.3.0
unzipper: 0.12.3
which: 5.0.0
transitivePeerDependencies:
- supports-color
@@ -19871,6 +19882,8 @@ snapshots:
seedrandom: 3.0.5
xxhashjs: 0.2.2
bluebird@3.7.2: {}
blurhash@2.0.5: {}
bn.js@4.12.3: {}
@@ -20022,19 +20035,19 @@ snapshots:
buildcheck@0.0.7:
optional: true
builder-util-runtime@9.6.0:
builder-util-runtime@9.6.1:
dependencies:
debug: 4.4.3
sax: 1.6.0
transitivePeerDependencies:
- supports-color
builder-util@26.9.0:
builder-util@26.11.1:
dependencies:
7zip-bin: 5.2.0
'@types/debug': 4.1.13
app-builder-bin: 5.0.0-alpha.12
builder-util-runtime: 9.6.0
builder-util-runtime: 9.6.1
chalk: 4.1.2
cross-spawn: 7.0.6
debug: 4.4.3
@@ -21013,10 +21026,10 @@ snapshots:
minimatch: 3.1.5
p-limit: 3.1.0
dmg-builder@26.9.1(electron-builder-squirrel-windows@26.9.1):
dmg-builder@26.11.1(electron-builder-squirrel-windows@26.11.1):
dependencies:
app-builder-lib: 26.9.1(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.9.1)(electron-builder-squirrel-windows@26.9.1)
builder-util: 26.9.0
app-builder-lib: 26.11.1(patch_hash=61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f)(dmg-builder@26.11.1)(electron-builder-squirrel-windows@26.11.1)
builder-util: 26.11.1
fs-extra: 10.1.0
iconv-lite: 0.6.3
js-yaml: 4.1.1
@@ -21175,6 +21188,10 @@ snapshots:
es-errors: 1.3.0
gopd: 1.2.0
duplexer2@0.1.4:
dependencies:
readable-stream: 2.3.8
earcut@3.0.2: {}
eastasianwidth@0.2.0: {}
@@ -21187,23 +21204,23 @@ snapshots:
ejs@5.0.1: {}
electron-builder-squirrel-windows@26.9.1(dmg-builder@26.9.1):
electron-builder-squirrel-windows@26.11.1(dmg-builder@26.11.1):
dependencies:
app-builder-lib: 26.9.1(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.9.1)(electron-builder-squirrel-windows@26.9.1)
builder-util: 26.9.0
app-builder-lib: 26.11.1(patch_hash=61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f)(dmg-builder@26.11.1)(electron-builder-squirrel-windows@26.11.1)
builder-util: 26.11.1
electron-winstaller: 5.4.0
transitivePeerDependencies:
- dmg-builder
- supports-color
electron-builder@26.9.1(electron-builder-squirrel-windows@26.9.1):
electron-builder@26.11.1(electron-builder-squirrel-windows@26.11.1):
dependencies:
app-builder-lib: 26.9.1(patch_hash=2dfb3fcdfe573cca6c248cecf63ddea5c8fa0276859695fba6c9664d0ff285d6)(dmg-builder@26.9.1)(electron-builder-squirrel-windows@26.9.1)
builder-util: 26.9.0
builder-util-runtime: 9.6.0
app-builder-lib: 26.11.1(patch_hash=61c04213ed5259e902efe4df6d87517e2daaa2597f168028f5b3dc3df8ff0c8f)(dmg-builder@26.11.1)(electron-builder-squirrel-windows@26.11.1)
builder-util: 26.11.1
builder-util-runtime: 9.6.1
chalk: 4.1.2
ci-info: 4.4.0
dmg-builder: 26.9.1(electron-builder-squirrel-windows@26.9.1)
dmg-builder: 26.11.1(electron-builder-squirrel-windows@26.11.1)
fs-extra: 10.1.0
lazy-val: 1.0.5
simple-update-notifier: 2.0.0
@@ -21216,11 +21233,11 @@ snapshots:
dependencies:
unzip-crx-3: 0.2.0
electron-publish@26.9.0:
electron-publish@26.11.1:
dependencies:
'@types/fs-extra': 9.0.13
builder-util: 26.9.0
builder-util-runtime: 9.6.0
builder-util: 26.11.1
builder-util-runtime: 9.6.1
chalk: 4.1.2
form-data: 4.0.5
fs-extra: 10.1.0
@@ -27425,6 +27442,14 @@ snapshots:
mkdirp: 0.5.6
yaku: 0.16.7
unzipper@0.12.3:
dependencies:
bluebird: 3.7.2
duplexer2: 0.1.4
fs-extra: 11.3.5
graceful-fs: 4.2.11
node-int64: 0.4.0
update-browserslist-db@1.2.3(browserslist@4.28.2):
dependencies:
browserslist: 4.28.2