From a18069842821a8a843372077b70350906ca832f1 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 28 May 2025 19:40:17 +0800 Subject: [PATCH 1/2] :art: Upgrade to Electron v35.4.0 https://github.com/siyuan-note/siyuan/issues/14926 --- .github/CONTRIBUTING.md | 12 ++++++------ .github/CONTRIBUTING_zh_CN.md | 10 +++++----- app/package.json | 4 ++-- app/pnpm-lock.yaml | 22 ++++++++++++++-------- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 373553a41..f40d4fc49 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -3,21 +3,21 @@ ## Get the source code * `git clone git@github.com:siyuan-note/siyuan.git` -* switch to dev branch `git checkout dev` +* Switch to dev branch `git checkout dev` ## NPM dependencies -Install pnpm: `npm install -g pnpm@10.8.0` +Install pnpm: `npm install -g pnpm@10.11.0`
For China mainland Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.3.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.4.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v35.3.0 -D` + * `pnpm install electron@v35.4.0 -D` NPM mirror: @@ -25,9 +25,9 @@ NPM mirror: * Revert to using official repository `pnpm --registry https://registry.npmjs.org i`
-On the desktop, go to the app folder to run: +Enter the app folder and execute: -* `pnpm install electron@v35.3.0-D` +* `pnpm install electron@v35.4.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index dd6fabf80..b76f11181 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -7,17 +7,17 @@ ## NPM 依赖 -安装 pnpm：`npm install -g pnpm@10.8.0` +安装 pnpm：`npm install -g pnpm@10.11.0`
适用于中国大陆 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.3.0 -D` +* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v35.4.0 -D` * Windows： * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v35.3.0 -D` + * `pnpm install electron@v35.4.0 -D` NPM 镜像： @@ -25,9 +25,9 @@ NPM 镜像： * 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i`
-桌面端进入 app 文件夹运行： +进入 app 文件夹执行： -* `pnpm install electron@v35.3.0-D` +* `pnpm install electron@v35.4.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 94ef6d287..53ddac78e 100644 --- a/app/package.json +++ b/app/package.json @@ -4,7 +4,7 @@ "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", - "packageManager": "pnpm@10.10.0", + "packageManager": "pnpm@10.11.0", "scripts": { "lint": "eslint . --fix --cache", "dev": "webpack --mode development", @@ -58,7 +58,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "35.3.0", + "electron": "35.4.0", "electron-builder": "26.0.12", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 9382c6bda..65f09824f 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: ^2.1.2 - version: 2.1.2(electron@35.2.2) + version: 2.1.2(electron@35.4.0) devDependencies: '@eslint/eslintrc': specifier: ^3.3.1 @@ -40,8 +40,8 @@ importers: specifier: ^1.11.5 version: 1.11.13 electron: - specifier: 35.2.2 - version: 35.2.2 + specifier: 35.4.0 + version: 35.4.0 electron-builder: specifier: 26.0.12 version: 26.0.12(electron-builder-squirrel-windows@26.0.11) @@ -451,36 +451,42 @@ packages: engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm-musl@2.5.1': resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} engines: {node: '>= 10.0.0'} cpu: [arm] os: [linux] + libc: [musl] '@parcel/watcher-linux-arm64-glibc@2.5.1': resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-arm64-musl@2.5.1': resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} engines: {node: '>= 10.0.0'} cpu: [arm64] os: [linux] + libc: [musl] '@parcel/watcher-linux-x64-glibc@2.5.1': resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [glibc] '@parcel/watcher-linux-x64-musl@2.5.1': resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} engines: {node: '>= 10.0.0'} cpu: [x64] os: [linux] + libc: [musl] '@parcel/watcher-win32-arm64@2.5.1': resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==} @@ -1185,8 +1191,8 @@ packages: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} engines: {node: '>=8.0.0'} - electron@35.2.2: - resolution: {integrity: sha512-jZnCOtIgrt28esWP5z/PKndj/vPQ/Zt+cvNRlb/qOGnK/AjW1mASwPMtQ099NlSodf69RR3JrhnZCYbTWeDR4g==} + electron@35.4.0: + resolution: {integrity: sha512-VIPSNcUnic00aaE83w6BW4Dj1kE8A5DU0nVbvwqotN3+gseGunbP4WyHp/kfKXVKQj1S3No3HnYxU5LJmYbAtw==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2852,9 +2858,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.2(electron@35.2.2)': + '@electron/remote@2.1.2(electron@35.4.0)': dependencies: - electron: 35.2.2 + electron: 35.4.0 '@electron/universal@2.0.1': dependencies: @@ -4019,7 +4025,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@35.2.2: + electron@35.4.0: dependencies: '@electron/get': 2.0.3 '@types/node': 22.15.3 From a16ddfeacaac38d5eab2b23089f6a90d031b724e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 28 May 2025 19:48:54 +0800 Subject: [PATCH 2/2] :green_heart: Improve docker image build --- .github/workflows/dockerimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 329ce2100..5ed944ec3 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -76,4 +76,4 @@ jobs: - name: Build the Docker image use package_json version if: ${{ github.event_name == 'push' || github.event.inputs.image_tag == '' }} run: | - docker buildx build --push --platform linux/amd64,linux/arm64 -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:latest -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:v${{ steps.version.outputs.value }} . + docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:latest -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:v${{ steps.version.outputs.value }} .