From 0a2cc5d5a3d7fbcd68c4d08701408de566009241 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 21 Jun 2024 19:27:57 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v31.0.2 https://github.com/siyuan-note/siyuan/issues/11654 --- .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 1cfdf3c42..1a56d1407 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.0.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.2 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@31.0.1 -D` + * `pnpm install electron@31.0.2 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@31.0.1 -D` +* `pnpm install electron@31.0.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index b31eec979..5aeb600d0 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.0.1 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.2 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@31.0.1 -D` + * `pnpm install electron@31.0.2 -D` NPM 镜像： @@ -30,7 +30,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@31.0.1 -D` +* `pnpm install electron@31.0.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 65760286d..acdf11dd0 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.0.1", + "electron": "31.0.2", "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 691869c17..54e9bb6c9 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.0.1) + version: 2.1.2(electron@31.0.2) devDependencies: '@types/node': specifier: ^18.13.0 @@ -34,8 +34,8 @@ importers: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 31.0.1 - version: 31.0.1 + specifier: 31.0.2 + version: 31.0.2 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.0.1: - resolution: {integrity: sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g==} + electron@31.0.2: + resolution: {integrity: sha512-55efQ5yfLN+AQHcFC00AXQqtxC3iAGaxX2GQ3EDbFJ0ca9GHNOdSXkcrdBElLleiDrR2hpXNkQxN1bDn0oxe6w==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2249,9 +2249,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/remote@2.1.2(electron@31.0.1)': + '@electron/remote@2.1.2(electron@31.0.2)': dependencies: - electron: 31.0.1 + electron: 31.0.2 '@electron/universal@1.4.1': dependencies: @@ -3142,7 +3142,7 @@ snapshots: electron-to-chromium@1.4.186: {} - electron@31.0.1: + electron@31.0.2: dependencies: '@electron/get': 2.0.2 '@types/node': 20.14.5