From 5921ab900de2d121448097e82fc96fcc53f49e11 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Thu, 11 Jul 2024 10:49:03 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v31.2.0 https://github.com/siyuan-note/siyuan/issues/11936 --- .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 c78b7c11d55..724c708b00d 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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@31.1.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.2.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@31.1.0 -D` + * `pnpm install electron@v31.2.0 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@31.1.0 -D` +* `pnpm install electron@v31.2.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index a3d565b39fa..bee53405a1b 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@31.1.0 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v31.2.0 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@31.1.0 -D` + * `pnpm install electron@v31.2.0 -D` NPM 镜像: @@ -30,7 +30,7 @@ NPM 镜像: 桌面端进入 app 文件夹运行: -* `pnpm install electron@31.1.0 -D` +* `pnpm install electron@v31.2.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 3e08a62e27e..788b6d98595 100644 --- a/app/package.json +++ b/app/package.json @@ -55,7 +55,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "31.1.0", + "electron": "31.2.0", "electron-builder": "24.9.1", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index db17a682171..735fb17c6f3 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@31.1.0) + version: 2.1.2(electron@31.2.0) devDependencies: '@types/node': specifier: ^18.13.0 @@ -34,8 +34,8 @@ importers: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 31.1.0 - version: 31.1.0 + specifier: 31.2.0 + version: 31.2.0 electron-builder: specifier: 24.9.1 version: 24.9.1 @@ -925,8 +925,8 @@ packages: electron-to-chromium@1.4.186: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} - electron@31.1.0: - resolution: {integrity: sha512-TBOwqLxSxnx6+pH6GMri7R3JPH2AkuGJHfWZS0p1HsmN+Qr1T9b0IRJnnehSd/3NZAmAre4ft9Ljec7zjyKFJA==} + electron@31.2.0: + resolution: {integrity: sha512-5w+kjOsGiTXytPSErBPNp/3znnuEMKc42RD41MqRoQkiYaR8x/Le2+qWk1cL60UwE/67oeKnOHnnol8xEuldGg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2249,9 +2249,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/remote@2.1.2(electron@31.1.0)': + '@electron/remote@2.1.2(electron@31.2.0)': dependencies: - electron: 31.1.0 + electron: 31.2.0 '@electron/universal@1.4.1': dependencies: @@ -3142,7 +3142,7 @@ snapshots: electron-to-chromium@1.4.186: {} - electron@31.1.0: + electron@31.2.0: dependencies: '@electron/get': 2.0.2 '@types/node': 20.14.5