From 54ec61fd0d73bb63e528564755509251f14dd9db Mon Sep 17 00:00:00 2001 From: beyondkmp Date: Sun, 4 May 2025 18:33:27 +0800 Subject: [PATCH] chore(dependencies): update electron-updater to version 6.6.4 and remove patches (#5650) chore(dependencies): update electron-updater to version 6.6.4 and remove obsolete patch --- ...lectron-updater-npm-6.6.3-9269dbaf84.patch | 51 ------------------- package.json | 2 +- yarn.lock | 26 ++-------- 3 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 .yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch diff --git a/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch b/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch deleted file mode 100644 index dbf2390408..0000000000 --- a/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/out/MacUpdater.js b/out/MacUpdater.js -index 8f18dc5416c91835ded4e47f2358fba680c129ac..a3fb43c2450dc3484bf099b5ea79a362a3b372cc 100644 ---- a/out/MacUpdater.js -+++ b/out/MacUpdater.js -@@ -74,7 +74,7 @@ class MacUpdater extends AppUpdater_1.AppUpdater { - else { - files = files.filter(file => !isArm64(file)); - } -- const zipFileInfo = (0, Provider_1.findFile)(files, "zip", ["pkg", "dmg"]); -+ const zipFileInfo = (0, Provider_1.findFile)(files, "zip", ["pkg", "dmg"], false /*has been filtered by myself*/); - if (zipFileInfo == null) { - throw (0, builder_util_runtime_1.newError)(`ZIP file not provided: ${(0, builder_util_runtime_1.safeStringifyJson)(files)}`, "ERR_UPDATER_ZIP_FILE_NOT_FOUND"); - } -diff --git a/out/providers/Provider.js b/out/providers/Provider.js -index 9829dff7e95aa9baa0bfdf29f52e6f761c9b7243..6ecaade9e294c87c03bb42e77ff5463f2782cb3c 100644 ---- a/out/providers/Provider.js -+++ b/out/providers/Provider.js -@@ -61,11 +61,18 @@ class Provider { - } - } - exports.Provider = Provider; --function findFile(files, extension, not) { -+function findFile(files, extension, not, filterByArch = true) { - if (files.length === 0) { - throw (0, builder_util_runtime_1.newError)("No files provided", "ERR_UPDATER_NO_FILES_PROVIDED"); - } -- const result = files.find(it => it.url.pathname.toLowerCase().endsWith(`.${extension.toLowerCase()}`)); -+ const result = files -+ .filter(file => { -+ if (!filterByArch) { -+ return true; -+ } -+ return (process.arch == "arm64") === (file.url.pathname.includes("arm64") || file.info.url.includes("arm64")); -+ }) -+ .find(it => it.url.pathname.toLowerCase().endsWith(`.${extension.toLowerCase()}`)); - if (result != null) { - return result; - } -diff --git a/out/differentialDownloader/multipleRangeDownloader.js b/out/differentialDownloader/multipleRangeDownloader.js -index bf7d3a2982c62b94054fed4ef60455b20b26d622..3a924eddc946ec446654a112a33be4e2cea311d2 100644 ---- a/out/differentialDownloader/multipleRangeDownloader.js -+++ b/out/differentialDownloader/multipleRangeDownloader.js -@@ -75,7 +75,7 @@ function doExecuteTasks(differentialDownloader, options, out, resolve, reject) { - return; - } - const contentType = (0, builder_util_runtime_1.safeGetHeader)(response, "content-type"); -- const m = /^multipart\/.+?(?:; boundary=(?:(?:"(.+)")|(?:([^\s]+))))$/i.exec(contentType); -+ const m = /^multipart\/.+?\s*;\s*boundary=(?:"([^"]+)"|([^\s";]+))\s*$/i.exec(contentType); - if (m == null) { - reject(new Error(`Content-Type "multipart/byteranges" is expected, but got "${contentType}"`)); - return; diff --git a/package.json b/package.json index e12267d8f2..bb5ab319bc 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "docx": "^9.0.2", "electron-log": "^5.1.5", "electron-store": "^8.2.0", - "electron-updater": "patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch", + "electron-updater": "6.6.4", "electron-window-state": "^5.0.3", "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch", "extract-zip": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index 0e84f2eeb7..7ee145ea3f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4391,7 +4391,7 @@ __metadata: electron-icon-builder: "npm:^2.0.1" electron-log: "npm:^5.1.5" electron-store: "npm:^8.2.0" - electron-updater: "patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch" + electron-updater: "npm:6.6.4" electron-vite: "npm:^2.3.0" electron-window-state: "npm:^5.0.3" emittery: "npm:^1.0.3" @@ -7060,9 +7060,9 @@ __metadata: languageName: node linkType: hard -"electron-updater@npm:6.6.3": - version: 6.6.3 - resolution: "electron-updater@npm:6.6.3" +"electron-updater@npm:6.6.4": + version: 6.6.4 + resolution: "electron-updater@npm:6.6.4" dependencies: builder-util-runtime: "npm:9.3.2" fs-extra: "npm:^10.1.0" @@ -7072,23 +7072,7 @@ __metadata: lodash.isequal: "npm:^4.5.0" semver: "npm:^7.6.3" tiny-typed-emitter: "npm:^2.1.0" - checksum: 10c0/fb924eb0fb8d692b703f49196400422faf4c25416abe22c9b3aad0a48890929fa3dde4c8671a74cd71b4a4ef93937f3d9f78ea3c2891a5c6d7938355bc699863 - languageName: node - linkType: hard - -"electron-updater@patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch": - version: 6.6.3 - resolution: "electron-updater@patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch::version=6.6.3&hash=4f329d" - dependencies: - builder-util-runtime: "npm:9.3.2" - fs-extra: "npm:^10.1.0" - js-yaml: "npm:^4.1.0" - lazy-val: "npm:^1.0.5" - lodash.escaperegexp: "npm:^4.1.2" - lodash.isequal: "npm:^4.5.0" - semver: "npm:^7.6.3" - tiny-typed-emitter: "npm:^2.1.0" - checksum: 10c0/31ca459c2589243e4553531927d9d7c5a99e2395683278b3d4639ebef39963f9fdd0bcf8dda42efecec4d5899dd4e3431473b4b95e72a5813132a1b19fea04e2 + checksum: 10c0/92ed7b39be1cf9cfe7be56e1054c44a405421ef7faeec365f8c19a6614428ec1e5116ba1f0fb731691d346e00cf16a555804e41feee2b9ac1a10759219de4406 languageName: node linkType: hard