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

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

Browse Source
This commit is contained in:
Vanessa 2023-12-01 23:17:45 +08:00
commit 2efded088b
4 changed files with 14 additions and 14 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: Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@27.1.2 -D` * macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@27.1.3 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@27.1.2 -D` * `pnpm install electron@27.1.3 -D`
NPM mirror: NPM mirror:
@ -30,7 +30,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@27.1.2 -D` * `pnpm install electron@27.1.3 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View File

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

2
app/package.json
View File

@ -53,7 +53,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": "27.1.2", "electron": "27.1.3",
"electron-builder": "^24.6.3", "electron-builder": "^24.6.3",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"esbuild-loader": "^3.0.1", "esbuild-loader": "^3.0.1",

14
app/pnpm-lock.yaml
View File

@ -7,7 +7,7 @@ settings:
dependencies: dependencies:
'@electron/remote': '@electron/remote':
specifier: ^2.0.12 specifier: ^2.0.12
version: 2.0.12(electron@27.1.2) version: 2.0.12(electron@27.1.3)
devDependencies: devDependencies:
'@types/node': '@types/node':
@ -32,8 +32,8 @@ devDependencies:
specifier: ^1.11.5 specifier: ^1.11.5
version: 1.11.5 version: 1.11.5
electron: electron:
specifier: 27.1.2 specifier: 27.1.3
version: 27.1.2 version: 27.1.3
electron-builder: electron-builder:
specifier: ^24.6.3 specifier: ^24.6.3
version: 24.6.3 version: 24.6.3
@ -160,12 +160,12 @@ packages:
- supports-color - supports-color
dev: true dev: true
/@electron/remote@2.0.12(electron@27.1.2): /@electron/remote@2.0.12(electron@27.1.3):
resolution: {integrity: sha512-IJN6xLAxptq5MCvXNCU6+pdQyz0DjpPtX6g2TPJftu3Z9pU6BTdnos9ZMN8nK471LkASqiA6C+Hzjv5SS8PAQw==} resolution: {integrity: sha512-IJN6xLAxptq5MCvXNCU6+pdQyz0DjpPtX6g2TPJftu3Z9pU6BTdnos9ZMN8nK471LkASqiA6C+Hzjv5SS8PAQw==}
peerDependencies: peerDependencies:
electron: '>= 13.0.0' electron: '>= 13.0.0'
dependencies: dependencies:
electron: 27.1.2 electron: 27.1.3
dev: false dev: false
/@electron/universal@1.3.4: /@electron/universal@1.3.4:
@ -1669,8 +1669,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true dev: true
/electron@27.1.2: /electron@27.1.3:
resolution: {integrity: sha512-Dy6BUuGLiIJv+zfsXwr78TV2TNppi24rXF4PIIS+OjDblEKdkI9r1iM8JUd3/x3sbGUy5mdLMSPhvmu//IhkgA==} resolution: {integrity: sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
requiresBuild: true requiresBuild: true