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

♻️ Upgrade Electron Fix https://github.com/siyuan-note/siyuan/issues/8897

Browse source
This commit is contained in:
Daniel 2023-08-03 10:22:15 +08:00
parent b4a816dbe3
commit b955f3c653
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
4 changed files with 18 additions and 18 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`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.3.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.4.0 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@25.3.1 -D`
* `pnpm install electron@25.4.0 -D`
NPM mirror:
@ -28,7 +28,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@25.3.1 -D`
* `pnpm install electron@25.4.0 -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://cnpmjs.org/mirrors/electron/ pnpm install electron@25.3.1 -D
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.4.0 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@25.3.1 -D`
* `pnpm install electron@25.4.0 -D`
NPM 镜像：
@ -30,7 +30,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@25.3.1 -D`
* `pnpm install electron@25.4.0 -D`
* `pnpm run dev`
* `pnpm run start`

2
app/package.json
View file

@ -53,7 +53,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1",
"dayjs": "^1.11.5",
"electron": "25.3.1",
"electron": "25.4.0",
"electron-builder": "^24.4.0",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",

22
app/pnpm-lock.yaml generated
View file

@ -1,9 +1,13 @@
lockfileVersion: '6.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
dependencies:
'@electron/remote':
specifier: ^2.0.9
version: 2.0.9(electron@25.3.1)
version: 2.0.9(electron@25.4.0)
devDependencies:
'@types/node':
@ -28,8 +32,8 @@ devDependencies:
specifier: ^1.11.5
version: 1.11.5
electron:
specifier: 25.3.1
version: 25.3.1
specifier: 25.4.0
version: 25.4.0
electron-builder:
specifier: ^24.4.0
version: 24.4.0
@ -178,12 +182,12 @@ packages:
- supports-color
dev: true
/@electron/remote@2.0.9(electron@25.3.1):
/@electron/remote@2.0.9(electron@25.4.0):
resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==}
peerDependencies:
electron: '>= 13.0.0'
dependencies:
electron: 25.3.1
electron: 25.4.0
dev: false
/@electron/universal@1.3.4:
@ -1843,8 +1847,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true
/electron@25.3.1:
resolution: {integrity: sha512-t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg==}
/electron@25.4.0:
resolution: {integrity: sha512-VLTRxDhL4UvQbqM7pTNENnJo62cdAPZT92N+B7BZQ5Xfok1wuVPEewIjBot4K7U3EpLUuHn1veeLzho3ihiP+Q==}
engines: {node: '>= 12.20.55'}
hasBin: true
requiresBuild: true
@ -4442,7 +4446,3 @@ packages:
dependencies:
buffer-crc32: 0.2.13
fd-slicer: 1.1.0
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false