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/9301

Browse source
This commit is contained in:
Daniel 2023-09-28 09:24:45 +08:00
parent 92467f2d73
commit d51b336183
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

@ -16,10 +16,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.8.1 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.2.3 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@25.8.1 -D`
* `pnpm install electron@26.2.3 -D`
NPM mirror:
@ -30,7 +30,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@25.8.1 -D`
* `pnpm install electron@26.2.3 -D`
* `pnpm run dev`
* `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -18,11 +18,11 @@
* macOS/Linux:
```
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@25.8.1 -D
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@26.2.3 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@25.8.1 -D`
* `pnpm install electron@26.2.3 -D`
NPM 镜像：
@ -32,7 +32,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@25.8.1 -D`
* `pnpm install electron@26.2.3 -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@8.2.0",
"packageManager": "pnpm@8.8.0",
"scripts": {
"lint": "eslint . --fix --cache",
"dev": "webpack --mode development",
@ -53,7 +53,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1",
"dayjs": "^1.11.5",
"electron": "25.8.1",
"electron": "26.2.3",
"electron-builder": "^24.6.3",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",
@ -74,6 +74,6 @@
"webpack-cli": "^4.10.0"
},
"dependencies": {
"@electron/remote": "^2.0.9"
"@electron/remote": "^2.0.11"
}
}

18
app/pnpm-lock.yaml generated
View file

@ -6,8 +6,8 @@ settings:
dependencies:
'@electron/remote':
specifier: ^2.0.9
version: 2.0.9(electron@25.8.1)
specifier: ^2.0.11
version: 2.0.11(electron@26.2.3)
devDependencies:
'@types/node':
@ -32,8 +32,8 @@ devDependencies:
specifier: ^1.11.5
version: 1.11.5
electron:
specifier: 25.8.1
version: 25.8.1
specifier: 26.2.3
version: 26.2.3
electron-builder:
specifier: ^24.6.3
version: 24.6.3
@ -160,12 +160,12 @@ packages:
- supports-color
dev: true
/@electron/remote@2.0.9(electron@25.8.1):
resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==}
/@electron/remote@2.0.11(electron@26.2.3):
resolution: {integrity: sha512-PYEs7W3GrQNuhgiMHjFEvL5MbAL6C7m1AwSAHGqC+xc33IdP7rcGtJSdTP2eg1ssyB3oI00KwTsiSlsQbAoXpA==}
peerDependencies:
electron: '>= 13.0.0'
dependencies:
electron: 25.8.1
electron: 26.2.3
dev: false
/@electron/universal@1.3.4:
@ -1669,8 +1669,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true
/electron@25.8.1:
resolution: {integrity: sha512-GtcP1nMrROZfFg0+mhyj1hamrHvukfF6of2B/pcWxmWkd5FVY1NJib0tlhiorFZRzQN5Z+APLPr7aMolt7i2AQ==}
/electron@26.2.3:
resolution: {integrity: sha512-osdKf9mbhrqE81ITdvQ7TjVOayXfcAlWm8A6EtBt/eFSh7a/FijebGVkgs0S7qWQdhO0KaNZDb1Gx00sWuDQdw==}
engines: {node: '>= 12.20.55'}
hasBin: true
requiresBuild: true