Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-11 09:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

♻️ Upgrade to Electron v39.3.0 https://github.com/siyuan-note/siyuan/issues/16915

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2026-01-26 16:37:43 +08:00
parent a6c866fe0e
commit 7da12c04cf
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 34 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/CONTRIBUTING.md vendored
View file

@ -7,17 +7,17 @@
## NPM dependencies
Install pnpm: `npm install -g pnpm@10.28.0`
Install pnpm: `npm install -g pnpm@10.28.1`
<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@39.2.7 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.3.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@39.2.7 -D`
* `pnpm install electron@39.3.0 -D`
NPM mirror:
@ -27,7 +27,7 @@ NPM mirror:
Enter the app folder and execute:
* `pnpm install electron@39.2.7 -D`
* `pnpm install electron@39.3.0 -D`
* `pnpm run dev`
* `pnpm run start`

8
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -7,17 +7,17 @@
## NPM 依赖
安装 pnpm：`npm install -g pnpm@10.28.0`
安装 pnpm：`npm install -g pnpm@10.28.1`
<details>
<summary>适用于中国大陆</summary>
设置 Electron 镜像环境变量并安装 Electron：
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.2.7 -D`
* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.3.0 -D`
* Windows：
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@39.2.7 -D`
* `pnpm install electron@39.3.0 -D`
NPM 镜像：
@ -27,7 +27,7 @@ NPM 镜像：
进入 app 文件夹执行：
* `pnpm install electron@39.2.7 -D`
* `pnpm install electron@39.3.0 -D`
* `pnpm run dev`
* `pnpm run start`

6
app/package.json
View file

@ -4,7 +4,7 @@
"description": "Refactor your thinking",
"homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js",
"packageManager": "pnpm@10.28.0",
"packageManager": "pnpm@10.28.1",
"scripts": {
"lint": "eslint . --fix --cache",
"dev": "webpack --mode development",
@ -57,13 +57,13 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^7.1.2",
"dayjs": "^1.11.5",
"electron": "39.2.7",
"electron": "39.3.0",
"electron-builder": "26.0.12",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",
"eslint": "^9.15.0",
"filesize": "^11.0.13",
"file-loader": "^6.2.0",
"filesize": "^11.0.13",
"globals": "^15.12.0",
"html-loader": "^2.1.2",
"html-webpack-plugin": "^5.5.0",

57
app/pnpm-lock.yaml generated
View file

@ -10,7 +10,7 @@ importers:
dependencies:
'@electron/remote':
specifier: ^2.1.3
version: 2.1.3(electron@39.2.7)
version: 2.1.3(electron@39.3.0)
devDependencies:
'@eslint/eslintrc':
specifier: ^3.3.1
@ -40,8 +40,8 @@ importers:
specifier: ^1.11.5
version: 1.11.18
electron:
specifier: 39.2.7
version: 39.2.7
specifier: 39.3.0
version: 39.3.0
electron-builder:
specifier: 26.0.12
version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@ -1210,8 +1210,8 @@ packages:
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
engines: {node: '>=8.0.0'}
electron@39.2.7:
resolution: {integrity: sha512-KU0uFS6LSTh4aOIC3miolcbizOFP7N1M46VTYVfqIgFiuA2ilfNaOHLDS9tCMvwwHRowAsvqBrh9NgMXcTOHCQ==}
electron@39.3.0:
resolution: {integrity: sha512-ZA2Cmu5Vs8zeuZBr71XWZ5vgm7lRDB9N50oV6ee7YocITyxRxx/apWFKY48Sxyn0gzVlX+6YQc3CS1PtYIkGUg==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -1434,10 +1434,6 @@ packages:
resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
engines: {node: '>=12'}
fs-extra@11.3.1:
resolution: {integrity: sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==}
engines: {node: '>=14.14'}
fs-extra@11.3.2:
resolution: {integrity: sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==}
engines: {node: '>=14.14'}
@ -2851,7 +2847,7 @@ snapshots:
'@electron/notarize@2.5.0':
dependencies:
debug: 4.4.1
debug: 4.4.3
fs-extra: 9.1.0
promise-retry: 2.0.1
transitivePeerDependencies:
@ -2860,7 +2856,7 @@ snapshots:
'@electron/osx-sign@1.3.1':
dependencies:
compare-version: 0.1.2
debug: 4.4.1
debug: 4.4.3
fs-extra: 10.1.0
isbinaryfile: 4.0.10
minimist: 1.2.8
@ -2873,7 +2869,7 @@ snapshots:
'@electron/node-gyp': https://codeload.github.com/electron/node-gyp/tar.gz/06b29aafb7708acef8b3669835c8a7857ebc92d2
'@malept/cross-spawn-promise': 2.0.0
chalk: 4.1.2
debug: 4.4.1
debug: 4.4.3
detect-libc: 2.0.4
fs-extra: 10.1.0
got: 11.8.6
@ -2888,17 +2884,17 @@ snapshots:
- bluebird
- supports-color
'@electron/remote@2.1.3(electron@39.2.7)':
'@electron/remote@2.1.3(electron@39.3.0)':
dependencies:
electron: 39.2.7
electron: 39.3.0
'@electron/universal@2.0.1':
dependencies:
'@electron/asar': 3.2.18
'@malept/cross-spawn-promise': 2.0.0
debug: 4.4.1
debug: 4.4.3
dir-compare: 4.2.0
fs-extra: 11.3.1
fs-extra: 11.3.2
minimatch: 9.0.5
plist: 3.1.0
transitivePeerDependencies:
@ -2994,7 +2990,7 @@ snapshots:
'@eslint/config-array@0.21.0':
dependencies:
'@eslint/object-schema': 2.1.6
debug: 4.4.1
debug: 4.4.3
minimatch: 3.1.2
transitivePeerDependencies:
- supports-color
@ -3081,7 +3077,7 @@ snapshots:
'@malept/flatpak-bundler@0.4.0':
dependencies:
debug: 4.4.1
debug: 4.4.3
fs-extra: 9.1.0
lodash: 4.17.21
tmp-promise: 3.0.3
@ -3291,7 +3287,7 @@ snapshots:
dependencies:
'@typescript-eslint/tsconfig-utils': 8.42.0(typescript@4.9.5)
'@typescript-eslint/types': 8.42.0
debug: 4.4.1
debug: 4.4.3
typescript: 4.9.5
transitivePeerDependencies:
- supports-color
@ -3310,7 +3306,7 @@ snapshots:
'@typescript-eslint/types': 8.42.0
'@typescript-eslint/typescript-estree': 8.42.0(typescript@4.9.5)
'@typescript-eslint/utils': 8.42.0(eslint@9.35.0(jiti@1.21.7))(typescript@4.9.5)
debug: 4.4.1
debug: 4.4.3
eslint: 9.35.0(jiti@1.21.7)
ts-api-utils: 2.1.0(typescript@4.9.5)
typescript: 4.9.5
@ -3325,7 +3321,7 @@ snapshots:
'@typescript-eslint/tsconfig-utils': 8.42.0(typescript@4.9.5)
'@typescript-eslint/types': 8.42.0
'@typescript-eslint/visitor-keys': 8.42.0
debug: 4.4.1
debug: 4.4.3
fast-glob: 3.3.3
is-glob: 4.0.3
minimatch: 9.0.5
@ -3535,7 +3531,7 @@ snapshots:
builder-util-runtime: 9.3.1
chromium-pickle-js: 0.2.0
config-file-ts: 0.2.8-rc1
debug: 4.4.1
debug: 4.4.3
dmg-builder: 26.0.12(electron-builder-squirrel-windows@26.0.12)
dotenv: 16.6.1
dotenv-expand: 11.0.7
@ -3632,7 +3628,7 @@ snapshots:
builder-util-runtime@9.3.1:
dependencies:
debug: 4.4.1
debug: 4.4.3
sax: 1.4.1
transitivePeerDependencies:
- supports-color
@ -3645,7 +3641,7 @@ snapshots:
builder-util-runtime: 9.3.1
chalk: 4.1.2
cross-spawn: 7.0.6
debug: 4.4.1
debug: 4.4.3
fs-extra: 10.1.0
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.6
@ -4037,7 +4033,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
electron@39.2.7:
electron@39.3.0:
dependencies:
'@electron/get': 2.0.3
'@types/node': 22.18.1
@ -4307,18 +4303,11 @@ snapshots:
jsonfile: 6.2.0
universalify: 2.0.1
fs-extra@11.3.1:
dependencies:
graceful-fs: 4.2.11
jsonfile: 6.2.0
universalify: 2.0.1
fs-extra@11.3.2:
dependencies:
graceful-fs: 4.2.11
jsonfile: 6.2.0
universalify: 2.0.1
optional: true
fs-extra@7.0.1:
dependencies:
@ -4544,7 +4533,7 @@ snapshots:
http-proxy-agent@7.0.2:
dependencies:
agent-base: 7.1.4
debug: 4.4.1
debug: 4.4.3
transitivePeerDependencies:
- supports-color
@ -4563,7 +4552,7 @@ snapshots:
https-proxy-agent@7.0.6:
dependencies:
agent-base: 7.1.4
debug: 4.4.1
debug: 4.4.3
transitivePeerDependencies:
- supports-color