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 2022-08-01 11:30:56 +08:00
commit 125fd486cc
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/CONTRIBUTING.md vendored
View file

@ -11,20 +11,24 @@ Install pnpm: `npm install -g pnpm`
<details>
<summary>For China mainland</summary>
Set the Electron mirror environment variable:
* macOS/Linux: `export ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@19.0.10 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@19.0.10 -D`
NPM mirror:
* Use mirror repository `pnpm --registry https://r.cnpmjs.org/ i`
* Revert to using official repository `pnpm --registry https://registry.npmjs.org i`
</details>
On the desktop, go to the app folder to run:
* `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@19.0.10 -D`
* `pnpm install electron@19.0.10 -D`
* `pnpm run dev`
* `pnpm run start`

9
.github/CONTRIBUTING_zh_CN.md vendored
View file

@ -11,10 +11,13 @@
<details>
<summary>适用于中国大陆</summary>
设置 Electron 镜像环境变量：
* macOS/Linux：`export ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
设置 Electron 镜像环境变量并安装 Electron：
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@19.0.10 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@19.0.10 -D`
NPM 镜像：