From a1bfd9570311eef98a1164bd94a155e307f35d7d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 20 Nov 2022 00:02:43 +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/6584?= 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 84a6e48db..6069e148a 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@21.2.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.3.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.2.3 -D` + * `pnpm install electron@21.3.0 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@21.2.3 -D` +* `pnpm install electron@21.3.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index d0530fdf1..f33fba5a1 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -14,10 +14,10 @@ 设置 Electron 镜像环境变量并安装 Electron： -* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.2.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.3.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.2.3 -D` + * `pnpm install electron@21.3.0 -D` NPM 镜像： @@ -27,7 +27,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@21.2.3 -D` +* `pnpm install electron@21.3.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index efd467caf..21b3baa30 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": "21.2.3", + "electron": "21.3.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 a148374b7..719239048 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: 21.2.3 + electron: 21.3.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.8_electron@21.2.3 + '@electron/remote': 2.0.8_electron@21.3.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: 21.2.3 + electron: 21.3.0 electron-builder: 23.3.3 encoding: 0.1.13 eslint: 8.19.0 @@ -1274,12 +1274,12 @@ packages: transitivePeerDependencies: - supports-color - /@electron/remote/2.0.8_electron@21.2.3: + /@electron/remote/2.0.8_electron@21.3.0: resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 21.2.3 + electron: 21.3.0 dev: false /@electron/universal/1.2.1: @@ -1906,10 +1906,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 @@ -2193,9 +2193,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 @@ -2816,8 +2816,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron/21.2.3: - resolution: {integrity: sha512-Wyj0ri3P8hnWEvX7+2Q1OtNzJI8Qn4V9J+aeypoXh+wtlX/fjfHxi4vZkos/XRncoIeYCeUZ5nhGjsOIQwSElQ==} + /electron/21.3.0: + resolution: {integrity: sha512-MGRpshN8fBcx4IRuBABIsGDv0tB/MclIFsyFHFFXsBCUc+vIXaE/E6vuWaniGIFSz5WyeuapfTH5IeRb+7yIfw==} engines: {node: '>= 10.17.0'} hasBin: true requiresBuild: true