0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-10-08 17:50:58 +08:00
commit 0a05713163
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/CONTRIBUTING.md vendored
View file

@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.1.1`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.5.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.1.2 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.1.2 -D`
NPM mirror:
@ -28,7 +28,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.1.2 -D`
* `pnpm run dev`
* `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -16,11 +16,11 @@
* macOS/Linux:
```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v30.5.1 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.1.2 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.1.2 -D`
NPM 镜像：
@ -30,7 +30,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@v30.5.1 -D`
* `pnpm install electron@v32.1.2 -D`
* `pnpm run dev`
* `pnpm run start`

2
app/package.json
View file

@ -55,7 +55,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1",
"dayjs": "^1.11.5",
"electron": "30.5.1",
"electron": "32.1.2",
"electron-builder": "24.13.3",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",

16
app/pnpm-lock.yaml generated
View file

@ -10,7 +10,7 @@ importers:
dependencies:
'@electron/remote':
specifier: ^2.1.2
version: 2.1.2(electron@30.5.1)
version: 2.1.2(electron@32.1.2)
devDependencies:
'@types/node':
specifier: ^18.13.0
@ -34,8 +34,8 @@ importers:
specifier: ^1.11.5
version: 1.11.5
electron:
specifier: 30.5.1
version: 30.5.1
specifier: 32.1.2
version: 32.1.2
electron-builder:
specifier: 24.13.3
version: 24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3))
@ -1106,8 +1106,8 @@ packages:
electron-to-chromium@1.4.186:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
electron@30.5.1:
resolution: {integrity: sha512-AhL7+mZ8Lg14iaNfoYTkXQ2qee8mmsQyllKdqxlpv/zrKgfxz6jNVtcRRbQtLxtF8yzcImWdfTQROpYiPumdbw==}
electron@32.1.2:
resolution: {integrity: sha512-CXe6doFzhmh1U7daOvUzmF6Cj8hssdYWMeEPRnRO6rB9/bbwMlWctcQ7P8NJXhLQ88/vYUJQrJvlJPh8qM0BRQ==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -2776,9 +2776,9 @@ snapshots:
- bluebird
- supports-color
'@electron/remote@2.1.2(electron@30.5.1)':
'@electron/remote@2.1.2(electron@32.1.2)':
dependencies:
electron: 30.5.1
electron: 32.1.2
'@electron/universal@1.5.1':
dependencies:
@ -3943,7 +3943,7 @@ snapshots:
electron-to-chromium@1.4.186: {}
electron@30.5.1:
electron@32.1.2:
dependencies:
'@electron/get': 2.0.2
'@types/node': 20.14.5