mirror of
https://github.com/CherryHQ/cherry-studio.git
synced 2026-01-06 05:09:09 +08:00
fix: update electron-updater to patch to support window arm upgrade (#5337)
This commit is contained in:
parent
ea89a37b1d
commit
a546c265ee
38
.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch
vendored
Normal file
38
.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch
vendored
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@ -81,7 +81,7 @@
|
|||||||
"docx": "^9.0.2",
|
"docx": "^9.0.2",
|
||||||
"electron-log": "^5.1.5",
|
"electron-log": "^5.1.5",
|
||||||
"electron-store": "^8.2.0",
|
"electron-store": "^8.2.0",
|
||||||
"electron-updater": "^6.3.9",
|
"electron-updater": "patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch",
|
||||||
"electron-window-state": "^5.0.3",
|
"electron-window-state": "^5.0.3",
|
||||||
"epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
|
"epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
|
||||||
"extract-zip": "^2.0.1",
|
"extract-zip": "^2.0.1",
|
||||||
|
|||||||
@ -178,8 +178,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
|
|||||||
|
|
||||||
// check for update
|
// check for update
|
||||||
ipcMain.handle(IpcChannel.App_CheckForUpdate, async () => {
|
ipcMain.handle(IpcChannel.App_CheckForUpdate, async () => {
|
||||||
// 在 Windows 上,如果架构是 arm64,则不检查更新
|
if (isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env) {
|
||||||
if (isWin && (arch().includes('arm') || 'PORTABLE_EXECUTABLE_DIR' in process.env)) {
|
|
||||||
return {
|
return {
|
||||||
currentVersion: app.getVersion(),
|
currentVersion: app.getVersion(),
|
||||||
updateInfo: null
|
updateInfo: null
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
import { GithubOutlined } from '@ant-design/icons'
|
import { GithubOutlined } from '@ant-design/icons'
|
||||||
import IndicatorLight from '@renderer/components/IndicatorLight'
|
import IndicatorLight from '@renderer/components/IndicatorLight'
|
||||||
import { HStack } from '@renderer/components/Layout'
|
import { HStack } from '@renderer/components/Layout'
|
||||||
import { isWindows } from '@renderer/config/constant'
|
|
||||||
import { APP_NAME, AppLogo } from '@renderer/config/env'
|
import { APP_NAME, AppLogo } from '@renderer/config/env'
|
||||||
import { useTheme } from '@renderer/context/ThemeProvider'
|
import { useTheme } from '@renderer/context/ThemeProvider'
|
||||||
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
|
import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
|
||||||
@ -34,13 +33,6 @@ const AboutSettings: FC = () => {
|
|||||||
|
|
||||||
const onCheckUpdate = debounce(
|
const onCheckUpdate = debounce(
|
||||||
async () => {
|
async () => {
|
||||||
const { arch } = await window.api.getAppInfo()
|
|
||||||
|
|
||||||
if (isWindows && arch.includes('arm')) {
|
|
||||||
window.open('https://cherry-ai.com/download', '_blank')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (update.checking || update.downloading) {
|
if (update.checking || update.downloading) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
20
yarn.lock
20
yarn.lock
@ -4374,7 +4374,7 @@ __metadata:
|
|||||||
electron-icon-builder: "npm:^2.0.1"
|
electron-icon-builder: "npm:^2.0.1"
|
||||||
electron-log: "npm:^5.1.5"
|
electron-log: "npm:^5.1.5"
|
||||||
electron-store: "npm:^8.2.0"
|
electron-store: "npm:^8.2.0"
|
||||||
electron-updater: "npm:^6.3.9"
|
electron-updater: "patch:electron-updater@npm%3A6.6.3#~/.yarn/patches/electron-updater-npm-6.6.3-9269dbaf84.patch"
|
||||||
electron-vite: "npm:^2.3.0"
|
electron-vite: "npm:^2.3.0"
|
||||||
electron-window-state: "npm:^5.0.3"
|
electron-window-state: "npm:^5.0.3"
|
||||||
emittery: "npm:^1.0.3"
|
emittery: "npm:^1.0.3"
|
||||||
@ -7043,7 +7043,7 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"electron-updater@npm:^6.3.9":
|
"electron-updater@npm:6.6.3":
|
||||||
version: 6.6.3
|
version: 6.6.3
|
||||||
resolution: "electron-updater@npm:6.6.3"
|
resolution: "electron-updater@npm:6.6.3"
|
||||||
dependencies:
|
dependencies:
|
||||||
@ -7059,6 +7059,22 @@ __metadata:
|
|||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
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=4a31aa"
|
||||||
|
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/6c9540bfaca6a9f4f73ce665f104d5954feb237950c59a73497b8e49b61820735276008c483eb5a7216b0b4c2fc4ca1a5474064645e5b52daa76b43661b3ced1
|
||||||
|
languageName: node
|
||||||
|
linkType: hard
|
||||||
|
|
||||||
"electron-vite@npm:^2.3.0":
|
"electron-vite@npm:^2.3.0":
|
||||||
version: 2.3.0
|
version: 2.3.0
|
||||||
resolution: "electron-vite@npm:2.3.0"
|
resolution: "electron-vite@npm:2.3.0"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user