Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-30 13:28:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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

Browse source
This commit is contained in:
Vanessa 2023-05-07 22:01:00 +08:00
commit 1b2a6b8d69
6 changed files with 14 additions and 30 deletions
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@21.4.2 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.4 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@21.4.2 -D`
* `pnpm install electron@21.4.4 -D`
NPM mirror:
@ -28,7 +28,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@21.4.2 -D`
* `pnpm install electron@21.4.4 -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@21.4.2 -D
ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.4 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
* `pnpm install electron@21.4.2 -D`
* `pnpm install electron@21.4.4 -D`
NPM 镜像：
@ -30,7 +30,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@21.4.2 -D`
* `pnpm install electron@21.4.4 -D`
* `pnpm run dev`
* `pnpm run start`

8
app/appearance/README.md
View file

@ -1,8 +0,0 @@
# 思源笔记外观 <a title="Hits" target="_blank" href="https://github.com/siyuan-note/appearance"><img src="https://hits.b3log.org/siyuan-note/appearance.svg"></a>
[English](https://github.com/siyuan-note/appearance/blob/master/README_en_US.md)
* emojis：Emoji 表情
* langs：多语言配置
* themes：主题
* icons：图标

8
app/appearance/README_en_US.md
View file

@ -1,8 +0,0 @@
# SiYuan appearance <a title="Hits" target="_blank" href="https://github.com/siyuan-note/appearance"><img src="https://hits.b3log.org/siyuan-note/appearance.svg"></a>
[中文](https://github.com/siyuan-note/appearance/blob/master/README.md)
* emojis: Emoji assets
* langs: Multi-language configuration
* themes: Appearance themes
* icons: Appearance icons

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": "21.4.2",
"electron": "21.4.4",
"electron-builder": "^23.6.0",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",

14
app/pnpm-lock.yaml generated
View file

@ -3,7 +3,7 @@ lockfileVersion: '6.0'
dependencies:
'@electron/remote':
specifier: ^2.0.9
version: 2.0.9(electron@21.4.2)
version: 2.0.9(electron@21.4.4)
electron-fetch:
specifier: ^1.7.4
version: 1.7.4
@ -31,8 +31,8 @@ devDependencies:
specifier: ^1.11.5
version: 1.11.5
electron:
specifier: 21.4.2
version: 21.4.2
specifier: 21.4.4
version: 21.4.4
electron-builder:
specifier: ^23.6.0
version: 23.6.0
@ -121,12 +121,12 @@ packages:
transitivePeerDependencies:
- supports-color
/@electron/remote@2.0.9(electron@21.4.2):
/@electron/remote@2.0.9(electron@21.4.4):
resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==}
peerDependencies:
electron: '>= 13.0.0'
dependencies:
electron: 21.4.2
electron: 21.4.4
dev: false
/@electron/universal@1.2.1:
@ -1675,8 +1675,8 @@ packages:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
dev: true
/electron@21.4.2:
resolution: {integrity: sha512-AM2MbPUB7el/9O1UXL3xYA8pTDOPDxiT0HrLuXKkX8Oe0yCvjozNRzEac27gIUd1V/hg0BBvQuYjaRU1Rcxhyg==}
/electron@21.4.4:
resolution: {integrity: sha512-N5O7y7Gtt7mDgkJLkW49ETiT8M3myZ9tNIEvGTKhpBduX4WdgMj6c3hYeYBD6XW7SvbRkWEQaTl25RNday8Xpw==}
engines: {node: '>= 10.17.0'}
hasBin: true
requiresBuild: true