github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-18 18:10:43 +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 2025-03-10 10:47:43 +08:00
commit eed3e084c5
4 changed files with 15 additions and 15 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.12.1`
Set the Electron mirror environment variable and install Electron: Set the Electron mirror environment variable and install Electron:
* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v33.4.2 -D` * macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.1 -D`
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v33.4.2 -D` * `pnpm install electron@v34.3.1 -D`
NPM mirror: NPM mirror:
@ -28,7 +28,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@v33.4.2 -D` * `pnpm install electron@v34.3.1 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

6
.github/CONTRIBUTING_zh_CN.md vendored
View File

@ -16,11 +16,11 @@
* macOS/Linux: * macOS/Linux:
``` ```
ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v33.4.2 -D ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.1 -D
``` ```
* Windows: * Windows:
* `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
* `pnpm install electron@v33.4.2 -D` * `pnpm install electron@v34.3.1 -D`
NPM 镜像： NPM 镜像：
@ -30,7 +30,7 @@ NPM 镜像：
桌面端进入 app 文件夹运行： 桌面端进入 app 文件夹运行：
* `pnpm install electron@v33.4.2 -D` * `pnpm install electron@v34.3.1 -D`
* `pnpm run dev` * `pnpm run dev`
* `pnpm run start` * `pnpm run start`

2
app/package.json
View File

@ -56,7 +56,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": "33.4.2", "electron": "34.3.1",
"electron-builder": "26.0.9", "electron-builder": "26.0.9",
"encoding": "^0.1.13", "encoding": "^0.1.13",
"esbuild-loader": "^3.0.1", "esbuild-loader": "^3.0.1",

16
app/pnpm-lock.yaml
View File

@ -10,7 +10,7 @@ importers:
dependencies: dependencies:
'@electron/remote': '@electron/remote':
specifier: ^2.1.2 specifier: ^2.1.2
version: 2.1.2(electron@33.4.2) version: 2.1.2(electron@34.3.1)
devDependencies: devDependencies:
'@types/node': '@types/node':
specifier: ^18.13.0 specifier: ^18.13.0
@ -34,8 +34,8 @@ importers:
specifier: ^1.11.5 specifier: ^1.11.5
version: 1.11.5 version: 1.11.5
electron: electron:
specifier: 33.4.2 specifier: 34.3.1
version: 33.4.2 version: 34.3.1
electron-builder: electron-builder:
specifier: 26.0.9 specifier: 26.0.9
version: 26.0.9(electron-builder-squirrel-windows@25.0.5) version: 26.0.9(electron-builder-squirrel-windows@25.0.5)
@ -1155,8 +1155,8 @@ packages:
electron-to-chromium@1.5.39: electron-to-chromium@1.5.39:
resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==} resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==}
electron@33.4.2: electron@34.3.1:
resolution: {integrity: sha512-kBoY1jlOCgQQJsVhaO4rYjKXL4FAsh6v42IzV5devYFFeMnciAPl02klrK5gD0VT8A2MeE4nulH32uYafca/VQ==} resolution: {integrity: sha512-Vsgxc4FDGg7hjduKyvTP5qfNDxZHTliZIiWD1HlR5hHXx3BFjyVv3db/uEH1GaCU0KKyeNsBXRwS4WAOMaSH5g==}
engines: {node: '>= 12.20.55'} engines: {node: '>= 12.20.55'}
hasBin: true hasBin: true
@ -2871,9 +2871,9 @@ snapshots:
- bluebird - bluebird
- supports-color - supports-color
'@electron/remote@2.1.2(electron@33.4.2)': '@electron/remote@2.1.2(electron@34.3.1)':
dependencies: dependencies:
electron: 33.4.2 electron: 34.3.1
'@electron/universal@2.0.1': '@electron/universal@2.0.1':
dependencies: dependencies:
@ -4051,7 +4051,7 @@ snapshots:
electron-to-chromium@1.5.39: {} electron-to-chromium@1.5.39: {}
electron@33.4.2: electron@34.3.1:
dependencies: dependencies:
'@electron/get': 2.0.2 '@electron/get': 2.0.2
'@types/node': 20.14.5 '@types/node': 20.14.5