From c5c9634f3445a96370f642c4c8c0268b3a65a704 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 20 Feb 2026 10:25:59 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v39.6.1 https://github.com/siyuan-note/siyuan/issues/17067 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 | 18 +++++++++--------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9868b8dd5..943edb02a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,17 +7,17 @@ ## NPM dependencies -Install pnpm: `npm install -g pnpm@10.29.2` +Install pnpm: `npm install -g pnpm@10.30.1`
For China mainland Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.5.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.6.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@39.5.1 -D` + * `pnpm install electron@39.6.1 -D` NPM mirror: @@ -27,7 +27,7 @@ NPM mirror: Enter the app folder and execute: -* `pnpm install electron@39.5.1 -D` +* `pnpm install electron@39.6.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index c70e5375d..65e866220 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -7,17 +7,17 @@ ## NPM 依赖 -安装 pnpm：`npm install -g pnpm@10.29.2` +安装 pnpm：`npm install -g pnpm@10.30.1`
适用于中国大陆 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.5.1 -D` +* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.6.1 -D` * Windows： * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@39.5.1 -D` + * `pnpm install electron@39.6.1 -D` NPM 镜像： @@ -27,7 +27,7 @@ NPM 镜像： 进入 app 文件夹执行： -* `pnpm install electron@39.5.1 -D` +* `pnpm install electron@39.6.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 81c164671..83353b1d0 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.29.2", + "packageManager": "pnpm@10.30.1", "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": "39.5.1", + "electron": "39.6.1", "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 cf1da5f1e..6b51f3b12 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@39.5.1) + version: 2.1.3(electron@39.6.1) devDependencies: '@eslint/eslintrc': specifier: ^3.3.1 @@ -40,8 +40,8 @@ importers: specifier: ^1.11.5 version: 1.11.18 electron: - specifier: 39.5.1 - version: 39.5.1 + specifier: 39.6.1 + version: 39.6.1 electron-builder: specifier: 26.0.12 version: 26.0.12(electron-builder-squirrel-windows@26.0.12) @@ -1214,8 +1214,8 @@ packages: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} engines: {node: '>=8.0.0'} - electron@39.5.1: - resolution: {integrity: sha512-6s/sBQar+bbW59XSqohZj04MPic+kdVUAWjLbfQB/uLOeNw9jWX5FHaTxpHK29Xp3mKOHef7wErsjwMyCuWltg==} + electron@39.6.1: + resolution: {integrity: sha512-pgmTbWnT3rP+eo3EolO5EdNw5f7/x/0S7vP+eXC8Zyp2sWGjP4+kmo1RyeAYCChwIRWJFKQ2rQVl/ZkqwK6O2Q==} engines: {node: '>= 12.20.55'} hasBin: true @@ -1510,7 +1510,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==} @@ -2910,9 +2910,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.3(electron@39.5.1)': + '@electron/remote@2.1.3(electron@39.6.1)': dependencies: - electron: 39.5.1 + electron: 39.6.1 '@electron/universal@2.0.1': dependencies: @@ -4062,7 +4062,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@39.5.1: + electron@39.6.1: dependencies: '@electron/get': 2.0.3 '@types/node': 22.18.1