Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-10 17:24:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
Download patch file Download diff file Expand all files Collapse all files

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

14
app/pnpm-lock.yaml generated
View file

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