Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-09-22 08:30:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Upgrade to Electron v35.4.0 https://github.com/siyuan-note/siyuan/issues/14926

Browse source
This commit is contained in:
Daniel 2025-05-28 19:40:17 +08:00
parent 91b337f896
commit a180698428
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.github/CONTRIBUTING.md vendored
View file

@ -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`
<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:
@ -25,9 +25,9 @@ NPM mirror:
* 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`

10
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -7,17 +7,17 @@
## 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 镜像：
@ -25,9 +25,9 @@ NPM 镜像：
* 恢复使用官方仓库 `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`

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

22
app/pnpm-lock.yaml generated
View file

@ -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