From 186258c1b02469d9cdafd9d98f4251dd6e9cb446 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 10 Mar 2025 10:32:42 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v34.3.1 https://github.com/siyuan-note/siyuan/issues/14322 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 84cb09739..2e2762e7d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.12.1` 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: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v33.4.2 -D` + * `pnpm install electron@v34.3.1 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: 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 start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index e07c33bab..7792df8db 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -16,11 +16,11 @@ * 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: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v33.4.2 -D` + * `pnpm install electron@v34.3.1 -D` NPM 镜像: @@ -30,7 +30,7 @@ NPM 镜像: 桌面端进入 app 文件夹运行: -* `pnpm install electron@v33.4.2 -D` +* `pnpm install electron@v34.3.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 9f8655301..67ff63135 100644 --- a/app/package.json +++ b/app/package.json @@ -56,7 +56,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "33.4.2", + "electron": "34.3.1", "electron-builder": "26.0.9", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 238e1c953..73fe0a6b7 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: ^2.1.2 - version: 2.1.2(electron@33.4.2) + version: 2.1.2(electron@34.3.1) devDependencies: '@types/node': specifier: ^18.13.0 @@ -34,8 +34,8 @@ importers: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 33.4.2 - version: 33.4.2 + specifier: 34.3.1 + version: 34.3.1 electron-builder: specifier: 26.0.9 version: 26.0.9(electron-builder-squirrel-windows@25.0.5) @@ -1155,8 +1155,8 @@ packages: electron-to-chromium@1.5.39: resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==} - electron@33.4.2: - resolution: {integrity: sha512-kBoY1jlOCgQQJsVhaO4rYjKXL4FAsh6v42IzV5devYFFeMnciAPl02klrK5gD0VT8A2MeE4nulH32uYafca/VQ==} + electron@34.3.1: + resolution: {integrity: sha512-Vsgxc4FDGg7hjduKyvTP5qfNDxZHTliZIiWD1HlR5hHXx3BFjyVv3db/uEH1GaCU0KKyeNsBXRwS4WAOMaSH5g==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2871,9 +2871,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.2(electron@33.4.2)': + '@electron/remote@2.1.2(electron@34.3.1)': dependencies: - electron: 33.4.2 + electron: 34.3.1 '@electron/universal@2.0.1': dependencies: @@ -4051,7 +4051,7 @@ snapshots: electron-to-chromium@1.5.39: {} - electron@33.4.2: + electron@34.3.1: dependencies: '@electron/get': 2.0.2 '@types/node': 20.14.5