github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-07 00:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

♻️ 升级 Electron Fix https://github.com/siyuan-note/siyuan/issues/7158

Browse Source
This commit is contained in:
Liang Ding 2023-01-28 10:42:05 +08:00
parent fa718f733c
commit 24baf1ce3a
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
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`
Set the Electron mirror environment variable and install Electron: Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.0.3 -D` * macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@22.0.3 -D` * `pnpm install electron@22.1.0 -D`
NPM mirror: NPM mirror:
@ -28,7 +28,7 @@ NPM mirror:
On the desktop, go to the app folder to run: On the desktop, go to the app folder to run:
* `pnpm install electron@22.0.3 -D` * `pnpm install electron@22.1.0 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View File

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

4
app/package.json
View File

@ -4,7 +4,7 @@
"description": "Build Your Eternal Digital Garden", "description": "Build Your Eternal Digital Garden",
"homepage": "https://b3log.org/siyuan", "homepage": "https://b3log.org/siyuan",
"main": "./electron/main.js", "main": "./electron/main.js",
"packageManager": "pnpm@7.18.1", "packageManager": "pnpm@7.26.1",
"scripts": { "scripts": {
"lint": "eslint . --fix --ext .ts", "lint": "eslint . --fix --ext .ts",
"dev": "webpack --mode development", "dev": "webpack --mode development",
@ -58,7 +58,7 @@
"clean-webpack-plugin": "^4.0.0", "clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1", "css-loader": "^6.7.1",
"dayjs": "^1.11.5", "dayjs": "^1.11.5",
"electron": "22.0.3", "electron": "22.1.0",
"electron-builder": "^23.3.3", "electron-builder": "^23.3.3",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"eslint": "^8.19.0", "eslint": "^8.19.0",

14
app/pnpm-lock.yaml
View File

@ -15,7 +15,7 @@ specifiers:
clean-webpack-plugin: ^4.0.0 clean-webpack-plugin: ^4.0.0
css-loader: ^6.7.1 css-loader: ^6.7.1
dayjs: ^1.11.5 dayjs: ^1.11.5
electron: 22.0.3 electron: 22.1.0
electron-builder: ^23.3.3 electron-builder: ^23.3.3
electron-fetch: ^1.7.4 electron-fetch: ^1.7.4
encoding: ^0.1.13 encoding: ^0.1.13
@ -39,7 +39,7 @@ specifiers:
webpack-cli: ^4.10.0 webpack-cli: ^4.10.0
dependencies: dependencies:
'@electron/remote': 2.0.8_electron@22.0.3 '@electron/remote': 2.0.8_electron@22.1.0
electron-fetch: 1.7.4 electron-fetch: 1.7.4
pnpm: 7.9.3 pnpm: 7.9.3
@ -57,7 +57,7 @@ devDependencies:
clean-webpack-plugin: 4.0.0_webpack@5.73.0 clean-webpack-plugin: 4.0.0_webpack@5.73.0
css-loader: 6.7.1_webpack@5.73.0 css-loader: 6.7.1_webpack@5.73.0
dayjs: 1.11.5 dayjs: 1.11.5
electron: 22.0.3 electron: 22.1.0
electron-builder: 23.3.3 electron-builder: 23.3.3
encoding: 0.1.13 encoding: 0.1.13
eslint: 8.19.0 eslint: 8.19.0
@ -1273,12 +1273,12 @@ packages:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
/@electron/remote/2.0.8_electron@22.0.3: /@electron/remote/2.0.8_electron@22.1.0:
resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==} resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==}
peerDependencies: peerDependencies:
electron: '>= 13.0.0' electron: '>= 13.0.0'
dependencies: dependencies:
electron: 22.0.3 electron: 22.1.0
dev: false dev: false
/@electron/universal/1.2.1: /@electron/universal/1.2.1:
@ -2861,8 +2861,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true dev: true
/electron/22.0.3: /electron/22.1.0:
resolution: {integrity: sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g==} resolution: {integrity: sha512-wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true