From d661dceb8f7d018acef4ae3ac006c7a3c56205f9 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 4 Apr 2024 10:06:31 +0800 Subject: [PATCH 1/2] :art: Improve upgrade download URLs --- kernel/model/updater.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 0c26a62b8..0fed81ee6 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -131,16 +131,19 @@ func getUpdatePkg() (downloadPkgURLs []string, checksum string, err error) { } pkg := "siyuan-" + ver + "-" + suffix - b3logURL := "https://release.liuyun.io/siyuan/" + pkg + b3logURL := "https://release.b3log.org/siyuan/" + pkg + liuyunURL := "https://release.liuyun.io/siyuan/" + pkg githubURL := "https://github.com/siyuan-note/siyuan/releases/download/v" + ver + "/" + pkg ghproxyURL := "https://mirror.ghproxy.com/" + githubURL if util.IsChinaCloud() { downloadPkgURLs = append(downloadPkgURLs, b3logURL) + downloadPkgURLs = append(downloadPkgURLs, liuyunURL) downloadPkgURLs = append(downloadPkgURLs, ghproxyURL) downloadPkgURLs = append(downloadPkgURLs, githubURL) } else { downloadPkgURLs = append(downloadPkgURLs, githubURL) downloadPkgURLs = append(downloadPkgURLs, b3logURL) + downloadPkgURLs = append(downloadPkgURLs, liuyunURL) } checksums := result["checksums"].(map[string]interface{}) From 7bdfcee9986e64b6f80f8039c8856a35cbbf46e3 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 4 Apr 2024 10:07:01 +0800 Subject: [PATCH 2/2] :recycle: Upgrade to Electron v28.2.10 Fix https://github.com/siyuan-note/siyuan/issues/10869 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fd521540b..ad2d6fd87 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.2.4 -D` + * `pnpm install electron@28.2.10 -D` NPM mirror: @@ -30,7 +30,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@28.2.4 -D` +* `pnpm install electron@28.2.10 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index ff343fae2..5b0596ef2 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -18,11 +18,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.4 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.2.4 -D` + * `pnpm install electron@28.2.10 -D` NPM 镜像： @@ -32,7 +32,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@28.2.4 -D` +* `pnpm install electron@28.2.10 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index b8e2c83b1..225039838 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "28.2.4", + "electron": "28.2.10", "electron-builder": "^24.13.3", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index f57988e59..31f4bfead 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -7,7 +7,7 @@ settings: dependencies: '@electron/remote': specifier: ^2.1.2 - version: 2.1.2(electron@28.2.4) + version: 2.1.2(electron@28.2.10) devDependencies: '@types/node': @@ -32,8 +32,8 @@ devDependencies: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 28.2.4 - version: 28.2.4 + specifier: 28.2.10 + version: 28.2.10 electron-builder: specifier: ^24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3) @@ -161,12 +161,12 @@ packages: - supports-color dev: true - /@electron/remote@2.1.2(electron@28.2.4): + /@electron/remote@2.1.2(electron@28.2.10): resolution: {integrity: sha512-EPwNx+nhdrTBxyCqXt/pftoQg/ybtWDW3DUWHafejvnB1ZGGfMpv6e15D8KeempocjXe78T7WreyGGb3mlZxdA==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 28.2.4 + electron: 28.2.10 dev: false /@electron/universal@1.5.1: @@ -1763,8 +1763,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron@28.2.4: - resolution: {integrity: sha512-XrSsqKCmpGwz1pqzmdLhdGonYvatDXor60rBd+TfURMQQRSxyTaSwrds9kV0aab9YRpeYUH6NJDAOwBhQYDDkA==} + /electron@28.2.10: + resolution: {integrity: sha512-0rGBJNogcl2FIRxGRUv9zuMaBP78nSBJW+Bd1U7OGeg8IEkSIbHOhfn71XoGxgbOUSCEXjjyftq4mtAAVbUsZQ==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true