From e3c59c741a41f2360361ccbe487c47238cb4fd85 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 8 Feb 2023 10:34:13 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E5=8D=87=E7=BA=A7=20Electron=20Fix?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/7286?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- app/package.json | 2 +- app/pnpm-lock.yaml | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 720e3d0fd..199bd0aac 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@23.0.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@22.1.0 -D` + * `pnpm install electron@23.0.0 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@22.1.0 -D` +* `pnpm install electron@23.0.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 2de2347c7..4642828e8 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -16,11 +16,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D + ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@23.0.0 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@22.1.0 -D` + * `pnpm install electron@23.0.0 -D` NPM 镜像： @@ -30,7 +30,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@22.1.0 -D` +* `pnpm install electron@23.0.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index c904ecdd4..e24221739 100644 --- a/app/package.json +++ b/app/package.json @@ -58,7 +58,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "22.1.0", + "electron": "23.0.0", "electron-builder": "^23.3.3", "encoding": "^0.1.13", "eslint": "^8.19.0", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index c5bdec987..a46cf6e5e 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -15,7 +15,7 @@ specifiers: clean-webpack-plugin: ^4.0.0 css-loader: ^6.7.1 dayjs: ^1.11.5 - electron: 22.1.0 + electron: 23.0.0 electron-builder: ^23.3.3 electron-fetch: ^1.7.4 encoding: ^0.1.13 @@ -39,7 +39,7 @@ specifiers: webpack-cli: ^4.10.0 dependencies: - '@electron/remote': 2.0.9_electron@22.1.0 + '@electron/remote': 2.0.9_electron@23.0.0 electron-fetch: 1.7.4 pnpm: 7.9.3 @@ -57,7 +57,7 @@ devDependencies: clean-webpack-plugin: 4.0.0_webpack@5.73.0 css-loader: 6.7.1_webpack@5.73.0 dayjs: 1.11.5 - electron: 22.1.0 + electron: 23.0.0 electron-builder: 23.3.3 encoding: 0.1.13 eslint: 8.19.0 @@ -1273,12 +1273,12 @@ packages: transitivePeerDependencies: - supports-color - /@electron/remote/2.0.9_electron@22.1.0: + /@electron/remote/2.0.9_electron@23.0.0: resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 22.1.0 + electron: 23.0.0 dev: false /@electron/universal/1.2.1: @@ -1928,10 +1928,10 @@ packages: resolution: {integrity: sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==} engines: {node: '>=14.0.0'} dependencies: + 7zip-bin: 5.1.1 '@develar/schema-utils': 2.6.5 '@electron/universal': 1.2.1 '@malept/flatpak-bundler': 0.4.0 - 7zip-bin: 5.1.1 async-exit-hook: 2.0.1 bluebird-lst: 1.0.9 builder-util: 23.3.3 @@ -2215,9 +2215,9 @@ packages: /builder-util/23.3.3: resolution: {integrity: sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==} dependencies: + 7zip-bin: 5.1.1 '@types/debug': 4.1.7 '@types/fs-extra': 9.0.13 - 7zip-bin: 5.1.1 app-builder-bin: 4.0.0 bluebird-lst: 1.0.9 builder-util-runtime: 9.0.3 @@ -2861,8 +2861,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron/22.1.0: - resolution: {integrity: sha512-wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA==} + /electron/23.0.0: + resolution: {integrity: sha512-S6hVtTAjauMiiWP9sBVR5RpcUC464cNZ06I2EMUjeZBq+KooS6tLmNsfw0zLpAXDp1qosjlBP3v71NTZ3gd9iA==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true