From 418e16dc5ce09182f262d2bea9be49c1b8ebda2d Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 30 Mar 2026 21:14:04 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v40.8.5 https://github.com/siyuan-note/siyuan/issues/17255 Signed-off-by: Daniel <845765@qq.com> --- .github/CONTRIBUTING.md | 8 ++++---- .github/CONTRIBUTING_zh_CN.md | 8 ++++---- app/package.json | 4 ++-- app/pnpm-lock.yaml | 20 ++++++++++---------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2ff13fd19..20efb2d74 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,17 +7,17 @@ ## NPM dependencies -Install pnpm: `npm install -g pnpm@10.32.1` +Install pnpm: `npm install -g pnpm@10.33.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@40.8.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.8.5 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@40.8.3 -D` + * `pnpm install electron@40.8.5 -D` NPM mirror: @@ -27,7 +27,7 @@ NPM mirror: Enter the app folder and execute: -* `pnpm install electron@40.8.3 -D` +* `pnpm install electron@40.8.5 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index e4b189f80..49f51bb7d 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -7,17 +7,17 @@ ## NPM 依赖 -安装 pnpm：`npm install -g pnpm@10.32.1` +安装 pnpm：`npm install -g pnpm@10.33.0`
适用于中国大陆 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.8.3 -D` +* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@40.8.5 -D` * Windows： * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@40.8.3 -D` + * `pnpm install electron@40.8.5 -D` NPM 镜像： @@ -27,7 +27,7 @@ NPM 镜像： 进入 app 文件夹执行： -* `pnpm install electron@40.8.3 -D` +* `pnpm install electron@40.8.5 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 31d3d25b0..c262f911d 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.32.1", + "packageManager": "pnpm@10.33.0", "scripts": { "lint": "eslint . --fix --cache", "dev": "webpack --mode development", @@ -57,7 +57,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^7.1.2", "dayjs": "^1.11.5", - "electron": "40.8.3", + "electron": "40.8.5", "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 9422e384a..0ba418416 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: ^2.1.3 - version: 2.1.3(electron@40.8.3) + version: 2.1.3(electron@40.8.5) devDependencies: '@eslint/eslintrc': specifier: ^3.3.1 @@ -40,8 +40,8 @@ importers: specifier: ^1.11.5 version: 1.11.19 electron: - specifier: 40.8.3 - version: 40.8.3 + specifier: 40.8.5 + version: 40.8.5 electron-builder: specifier: 26.0.12 version: 26.0.12(electron-builder-squirrel-windows@26.0.12) @@ -1185,8 +1185,8 @@ packages: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} engines: {node: '>=8.0.0'} - electron@40.8.3: - resolution: {integrity: sha512-MH6LK4xM6VVmmtz0nRE0Fe8l2jTKSYTvH1t0ZfbNLw3o6dlBCVTRqQha6uL8ZQVoMy74JyLguGwK7dU7rCKIhw==} + electron@40.8.5: + resolution: {integrity: sha512-pgTY/VPQKaiU4sTjfU96iyxCXrFm4htVPCMRT4b7q9ijNTRgtLmLvcmzp2G4e7xDrq9p7OLHSmu1rBKFf6Y1/A==} engines: {node: '>= 12.20.55'} hasBin: true @@ -1475,7 +1475,7 @@ packages: glob@8.1.0: resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} engines: {node: '>=12'} - deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me + deprecated: Glob versions prior to v9 are no longer supported global-agent@3.0.0: resolution: {integrity: sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==} @@ -2831,9 +2831,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.3(electron@40.8.3)': + '@electron/remote@2.1.3(electron@40.8.5)': dependencies: - electron: 40.8.3 + electron: 40.8.5 '@electron/universal@2.0.1': dependencies: @@ -3960,7 +3960,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@40.8.3: + electron@40.8.5: dependencies: '@electron/get': 2.0.3 '@types/node': 24.12.0 @@ -4757,7 +4757,7 @@ snapshots: minipass-flush@1.0.7: dependencies: - minipass: 7.1.3 + minipass: 3.3.6 minipass-pipeline@1.2.4: dependencies: