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 2024-06-19 11:01:11 +08:00
commit 1543523159
7 changed files with 32 additions and 20 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@9.1.1`
Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D`
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D`
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.3.3 -D`
* `pnpm install electron@31.0.1 -D`
NPM mirror:
@ -28,7 +28,7 @@ NPM mirror:
On the desktop, go to the app folder to run:
* `pnpm install electron@28.3.3 -D`
* `pnpm install electron@31.0.1 -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://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D
```
* Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@28.3.3 -D`
* `pnpm install electron@31.0.1 -D`
NPM 镜像：
@ -30,7 +30,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行：
* `pnpm install electron@28.3.3 -D`
* `pnpm install electron@31.0.1 -D`
* `pnpm run dev`
* `pnpm run start`

2
app/package.json
View file

@ -55,7 +55,7 @@
"clean-webpack-plugin": "^4.0.0",
"css-loader": "^6.7.1",
"dayjs": "^1.11.5",
"electron": "28.3.3",
"electron": "31.0.1",
"electron-builder": "24.9.1",
"encoding": "^0.1.13",
"esbuild-loader": "^3.0.1",

30
app/pnpm-lock.yaml generated
View file

@ -10,7 +10,7 @@ importers:
dependencies:
'@electron/remote':
specifier: ^2.1.2
version: 2.1.2(electron@28.3.3)
version: 2.1.2(electron@31.0.1)
devDependencies:
'@types/node':
specifier: ^18.13.0
@ -34,8 +34,8 @@ importers:
specifier: ^1.11.5
version: 1.11.5
electron:
specifier: 28.3.3
version: 28.3.3
specifier: 31.0.1
version: 31.0.1
electron-builder:
specifier: 24.9.1
version: 24.9.1
@ -372,6 +372,9 @@ packages:
'@types/node@18.13.0':
resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==}
'@types/node@20.14.5':
resolution: {integrity: sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==}
'@types/plist@3.0.2':
resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==}
@ -922,8 +925,8 @@ packages:
electron-to-chromium@1.4.186:
resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
electron@28.3.3:
resolution: {integrity: sha512-ObKMLSPNhomtCOBAxFS8P2DW/4umkh72ouZUlUKzXGtYuPzgr1SYhskhFWgzAsPtUzhL2CzyV2sfbHcEW4CXqw==}
electron@31.0.1:
resolution: {integrity: sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g==}
engines: {node: '>= 12.20.55'}
hasBin: true
@ -2056,6 +2059,9 @@ packages:
engines: {node: '>=4.2.0'}
hasBin: true
undici-types@5.26.5:
resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==}
universalify@0.1.2:
resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
engines: {node: '>= 4.0.0'}
@ -2243,9 +2249,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
'@electron/remote@2.1.2(electron@28.3.3)':
'@electron/remote@2.1.2(electron@31.0.1)':
dependencies:
electron: 28.3.3
electron: 31.0.1
'@electron/universal@1.4.1':
dependencies:
@ -2454,6 +2460,10 @@ snapshots:
'@types/node@18.13.0': {}
'@types/node@20.14.5':
dependencies:
undici-types: 5.26.5
'@types/plist@3.0.2':
dependencies:
'@types/node': 18.13.0
@ -3132,10 +3142,10 @@ snapshots:
electron-to-chromium@1.4.186: {}
electron@28.3.3:
electron@31.0.1:
dependencies:
'@electron/get': 2.0.2
'@types/node': 18.13.0
'@types/node': 20.14.5
extract-zip: 2.0.1
transitivePeerDependencies:
- supports-color
@ -4277,6 +4287,8 @@ snapshots:
typescript@4.7.4: {}
undici-types@5.26.5: {}
universalify@0.1.2: {}
universalify@2.0.0: {}

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02
github.com/88250/lute v1.7.7-0.20240617153515-2c97ec351fd0
github.com/88250/lute v1.7.7-0.20240619024849-354a2563fc1a
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4

4
kernel/go.sum
View file

@ -12,8 +12,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02 h1:3e5+yobj655pTeKOYMbJrnc1mE51ZkbXIxquTYZuYCY=
github.com/88250/gulu v1.2.3-0.20240612035750-c9cf5f7a4d02/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
github.com/88250/lute v1.7.7-0.20240617153515-2c97ec351fd0 h1:Ou/swWA0r3fn3HZ+OeOAwMPqvapBcxyjqFT6tucbrOs=
github.com/88250/lute v1.7.7-0.20240617153515-2c97ec351fd0/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/lute v1.7.7-0.20240619024849-354a2563fc1a h1:eNO8BKZP8gGQBIgnpb741GuqDf2xchnYcNuUumfDmYY=
github.com/88250/lute v1.7.7-0.20240619024849-354a2563fc1a/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=