From 67cdd4467adff9c7077438baf4cfd45d5ae578a5 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Wed, 19 Jun 2024 10:06:12 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v31.0.1 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 | 30 +++++++++++++++++++++--------- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index d54e9a99b..1cfdf3c42 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@28.3.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.3.3 -D` + * `pnpm install electron@31.0.1 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@28.3.3 -D` +* `pnpm install electron@31.0.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 1ac0f215e..b31eec979 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@28.3.3 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.3.3 -D` + * `pnpm install electron@31.0.1 -D` NPM 镜像： @@ -30,7 +30,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@28.3.3 -D` +* `pnpm install electron@31.0.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index a1ad1945c..65760286d 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": "28.3.3", + "electron": "31.0.1", "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 192e616ca..691869c17 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@28.3.3) + version: 2.1.2(electron@31.0.1) devDependencies: '@types/node': specifier: ^18.13.0 @@ -34,8 +34,8 @@ importers: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 28.3.3 - version: 28.3.3 + specifier: 31.0.1 + version: 31.0.1 electron-builder: specifier: 24.9.1 version: 24.9.1 @@ -372,6 +372,9 @@ packages: '@types/node@18.13.0': resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} + '@types/node@20.14.5': + resolution: {integrity: sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==} + '@types/plist@3.0.2': resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} @@ -922,8 +925,8 @@ packages: electron-to-chromium@1.4.186: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} - electron@28.3.3: - resolution: {integrity: sha512-ObKMLSPNhomtCOBAxFS8P2DW/4umkh72ouZUlUKzXGtYuPzgr1SYhskhFWgzAsPtUzhL2CzyV2sfbHcEW4CXqw==} + electron@31.0.1: + resolution: {integrity: sha512-2eBcp4iqLkTsml6mMq+iqrS5u3kJ/2mpOLP7Mj7lo0uNK3OyfNqRS9z1ArsHjBF2/HV250Te/O9nKrwQRTX/+g==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2056,6 +2059,9 @@ packages: engines: {node: '>=4.2.0'} hasBin: true + undici-types@5.26.5: + resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} engines: {node: '>= 4.0.0'} @@ -2243,9 +2249,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/remote@2.1.2(electron@28.3.3)': + '@electron/remote@2.1.2(electron@31.0.1)': dependencies: - electron: 28.3.3 + electron: 31.0.1 '@electron/universal@1.4.1': dependencies: @@ -2454,6 +2460,10 @@ snapshots: '@types/node@18.13.0': {} + '@types/node@20.14.5': + dependencies: + undici-types: 5.26.5 + '@types/plist@3.0.2': dependencies: '@types/node': 18.13.0 @@ -3132,10 +3142,10 @@ snapshots: electron-to-chromium@1.4.186: {} - electron@28.3.3: + electron@31.0.1: dependencies: '@electron/get': 2.0.2 - '@types/node': 18.13.0 + '@types/node': 20.14.5 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -4277,6 +4287,8 @@ snapshots: typescript@4.7.4: {} + undici-types@5.26.5: {} + universalify@0.1.2: {} universalify@2.0.0: {}