Merge remote-tracking branch 'origin/dev' into dev

Author: Vanessa219

.github/CONTRIBUTING.md

@@ -3,31 +3,31 @@
 ## Get the source code
 
 * `git clone [email protected]: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`
 
 <details>
 <summary>For China mainland</summary>
 
 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:
 
 * Use npmmirror China mirror repository `pnpm --registry https://registry.npmmirror.com/ i`
 * Revert to using official repository `pnpm --registry https://registry.npmjs.org i`
 </details>
 
-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`
 

.github/CONTRIBUTING_zh_CN.md

@@ -7,27 +7,27 @@
 
 ## NPM 依赖
 
-安装 pnpm：`npm install -g pnpm@10.8.0`
+安装 pnpm：`npm install -g pnpm@10.11.0`
 
 <details>
 <summary>适用于中国大陆</summary>
 
 设置 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 镜像：
 
 * 使用 npmmirror 中国镜像仓库 `pnpm --registry https://registry.npmmirror.com/ i`
 * 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i`
 </details>
 
-桌面端进入 app 文件夹运行：
+进入 app 文件夹执行：
 
-* `pnpm install electron@v35.3.0-D`
+* `pnpm install electron@v35.4.0 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.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 }} .

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",