Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-09-30 23:21:52 +08:00
parent 988a6b6c23
commit 029c461e3e
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 24 additions and 18 deletions

View file

@ -7,17 +7,17 @@
## NPM dependencies ## NPM dependencies
Install pnpm: `npm install -g pnpm@10.15.1` Install pnpm: `npm install -g pnpm@10.17.1`
<details> <details>
<summary>For China mainland</summary> <summary>For China mainland</summary>
Set the Electron mirror environment variable and install Electron: Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.4.0 -D` * macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.6.0 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@37.4.0 -D` * `pnpm install electron@37.6.0 -D`
NPM mirror: NPM mirror:
@ -27,7 +27,7 @@ NPM mirror:
Enter the app folder and execute: Enter the app folder and execute:
* `pnpm install electron@37.4.0 -D` * `pnpm install electron@37.6.0 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

View file

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

View file

@ -4,7 +4,7 @@
"description": "Refactor your thinking", "description": "Refactor your thinking",
"homepage": "https://b3log.org/siyuan", "homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js", "main": "./electron/main.js",
"packageManager": "pnpm@10.15.1", "packageManager": "pnpm@10.17.1",
"scripts": { "scripts": {
"lint": "eslint . --fix --cache", "lint": "eslint . --fix --cache",
"dev": "webpack --mode development", "dev": "webpack --mode development",
@ -57,7 +57,7 @@
"clean-webpack-plugin": "^4.0.0", "clean-webpack-plugin": "^4.0.0",
"css-loader": "^7.1.2", "css-loader": "^7.1.2",
"dayjs": "^1.11.5", "dayjs": "^1.11.5",
"electron": "37.4.0", "electron": "37.6.0",
"electron-builder": "26.0.12", "electron-builder": "26.0.12",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"esbuild-loader": "^3.0.1", "esbuild-loader": "^3.0.1",

22
app/pnpm-lock.yaml generated
View file

@ -10,7 +10,7 @@ importers:
dependencies: dependencies:
'@electron/remote': '@electron/remote':
specifier: ^2.1.3 specifier: ^2.1.3
version: 2.1.3(electron@37.4.0) version: 2.1.3(electron@37.6.0)
devDependencies: devDependencies:
'@eslint/eslintrc': '@eslint/eslintrc':
specifier: ^3.3.1 specifier: ^3.3.1
@ -40,8 +40,8 @@ importers:
specifier: ^1.11.5 specifier: ^1.11.5
version: 1.11.18 version: 1.11.18
electron: electron:
specifier: 37.4.0 specifier: 37.6.0
version: 37.4.0 version: 37.6.0
electron-builder: electron-builder:
specifier: 26.0.12 specifier: 26.0.12
version: 26.0.12(electron-builder-squirrel-windows@26.0.12) version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@ -446,36 +446,42 @@ packages:
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
libc: [glibc]
'@parcel/watcher-linux-arm-musl@2.5.1': '@parcel/watcher-linux-arm-musl@2.5.1':
resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==} resolution: {integrity: sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [arm] cpu: [arm]
os: [linux] os: [linux]
libc: [musl]
'@parcel/watcher-linux-arm64-glibc@2.5.1': '@parcel/watcher-linux-arm64-glibc@2.5.1':
resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==} resolution: {integrity: sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@parcel/watcher-linux-arm64-musl@2.5.1': '@parcel/watcher-linux-arm64-musl@2.5.1':
resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==} resolution: {integrity: sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@parcel/watcher-linux-x64-glibc@2.5.1': '@parcel/watcher-linux-x64-glibc@2.5.1':
resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==} resolution: {integrity: sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@parcel/watcher-linux-x64-musl@2.5.1': '@parcel/watcher-linux-x64-musl@2.5.1':
resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==} resolution: {integrity: sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==}
engines: {node: '>= 10.0.0'} engines: {node: '>= 10.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@parcel/watcher-win32-arm64@2.5.1': '@parcel/watcher-win32-arm64@2.5.1':
resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==} resolution: {integrity: sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==}
@ -1192,8 +1198,8 @@ packages:
resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
engines: {node: '>=8.0.0'} engines: {node: '>=8.0.0'}
electron@37.4.0: electron@37.6.0:
resolution: {integrity: sha512-HhsSdWowE5ODOeWNc/323Ug2C52mq/TqNBG+4uMeOA3G2dMXNc/nfyi0RYu1rJEgiaJLEjtHveeZZaYRYFsFCQ==} resolution: {integrity: sha512-8AANcn6irYQ7cTAJRY7r0CovWckcGCHUniQecyGhw/jJ25vWwitVhF97skF+EyDztiEI6YBoF0G6tx1s37bO3g==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
@ -2862,9 +2868,9 @@ snapshots:
- bluebird - bluebird
- supports-color - supports-color
'@electron/remote@2.1.3(electron@37.4.0)': '@electron/remote@2.1.3(electron@37.6.0)':
dependencies: dependencies:
electron: 37.4.0 electron: 37.6.0
'@electron/universal@2.0.1': '@electron/universal@2.0.1':
dependencies: dependencies:
@ -4007,7 +4013,7 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
electron@37.4.0: electron@37.6.0:
dependencies: dependencies:
'@electron/get': 2.0.3 '@electron/get': 2.0.3
'@types/node': 22.18.1 '@types/node': 22.18.1