From c86991e70a1d03568fbef084e661a9f15fdb4a5b Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 29 Apr 2024 18:28:27 +0800 Subject: [PATCH] :recycle: Upgrade to Electron v28.3.1 https://github.com/siyuan-note/siyuan/issues/11180 --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 30 +++++++++--------------------- 4 files changed, 16 insertions(+), 28 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cca8daf72..aa3bc6af1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@30.0.1 -D` + * `pnpm install electron@28.3.1 -D` NPM mirror: @@ -30,7 +30,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@30.0.1 -D` +* `pnpm install electron@28.3.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index f6759fae8..3d917c822 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -18,11 +18,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@30.0.1 -D` + * `pnpm install electron@28.3.1 -D` NPM 镜像： @@ -32,7 +32,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@30.0.1 -D` +* `pnpm install electron@28.3.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index fdf84ce8c..55c2e38db 100644 --- a/app/package.json +++ b/app/package.json @@ -53,7 +53,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "30.0.1", + "electron": "28.3.1", "electron-builder": "^24.13.3", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index c90645145..38037f8b9 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@30.0.1) + version: 2.1.2(electron@28.3.1) devDependencies: '@types/node': specifier: ^18.13.0 @@ -34,8 +34,8 @@ importers: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 30.0.1 - version: 30.0.1 + specifier: 28.3.1 + version: 28.3.1 electron-builder: specifier: ^24.13.3 version: 24.13.3(electron-builder-squirrel-windows@24.13.3(dmg-builder@24.13.3)) @@ -372,9 +372,6 @@ packages: '@types/node@18.13.0': resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} - '@types/node@20.12.7': - resolution: {integrity: sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==} - '@types/plist@3.0.2': resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==} @@ -959,8 +956,8 @@ packages: electron-to-chromium@1.4.186: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} - electron@30.0.1: - resolution: {integrity: sha512-iwxkI/n2wBd29NH7TH0ZY8aWGzCoKpzJz+D10u7aGSJi1TV6d4MSM3rWyKvT/UkAHkTKOEgYfUyCa2vWQm8L0g==} + electron@28.3.1: + resolution: {integrity: sha512-aF9fONuhVDJlctJS7YOw76ynxVAQdfIWmlhRMKits24tDcdSL0eMHUS0wWYiRfGWbQnUKB6V49Rf17o32f4/fg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2144,9 +2141,6 @@ 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'} @@ -2338,9 +2332,9 @@ snapshots: transitivePeerDependencies: - supports-color - '@electron/remote@2.1.2(electron@30.0.1)': + '@electron/remote@2.1.2(electron@28.3.1)': dependencies: - electron: 30.0.1 + electron: 28.3.1 '@electron/universal@1.5.1': dependencies: @@ -2549,10 +2543,6 @@ snapshots: '@types/node@18.13.0': {} - '@types/node@20.12.7': - dependencies: - undici-types: 5.26.5 - '@types/plist@3.0.2': dependencies: '@types/node': 18.13.0 @@ -3298,10 +3288,10 @@ snapshots: electron-to-chromium@1.4.186: {} - electron@30.0.1: + electron@28.3.1: dependencies: '@electron/get': 2.0.2 - '@types/node': 20.12.7 + '@types/node': 18.13.0 extract-zip: 2.0.1 transitivePeerDependencies: - supports-color @@ -4500,8 +4490,6 @@ snapshots: typescript@4.7.4: {} - undici-types@5.26.5: {} - universalify@0.1.2: {} universalify@2.0.0: {}