From 91096274c7455e8e8bf0ed8a56932edcd73ab586 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Sun, 26 Feb 2023 09:03:12 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20=E5=8D=87=E7=BA=A7=20Electron=20htt?= =?UTF-8?q?ps://github.com/siyuan-note/siyuan/issues/7488?= 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 | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 50b2d5801..e568b9174 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.4.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.2 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.4.1 -D` + * `pnpm install electron@21.4.2 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@21.4.1 -D` +* `pnpm install electron@21.4.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index f740eaa9a..38f1b18e8 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@21.4.1 -D + ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@21.4.2 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@21.4.1 -D` + * `pnpm install electron@21.4.2 -D` NPM 镜像: @@ -30,7 +30,7 @@ NPM 镜像: 桌面端进入 app 文件夹运行: -* `pnpm install electron@21.4.1 -D` +* `pnpm install electron@21.4.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 8678da088..a313c536e 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.4.1", + "electron": "21.4.2", "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 79fca9655..995cd38f6 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.4.1 + electron: 21.4.2 electron-builder: ^23.3.3 electron-fetch: ^1.7.4 encoding: ^0.1.13 @@ -38,7 +38,7 @@ specifiers: webpack-cli: ^4.10.0 dependencies: - '@electron/remote': 2.0.9_electron@21.4.1 + '@electron/remote': 2.0.9_electron@21.4.2 electron-fetch: 1.7.4 devDependencies: @@ -55,7 +55,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.4.1 + electron: 21.4.2 electron-builder: 23.3.3 encoding: 0.1.13 eslint: 8.19.0 @@ -1272,12 +1272,12 @@ packages: transitivePeerDependencies: - supports-color - /@electron/remote/2.0.9_electron@21.4.1: + /@electron/remote/2.0.9_electron@21.4.2: resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 21.4.1 + electron: 21.4.2 dev: false /@electron/universal/1.2.1: @@ -2814,8 +2814,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron/21.4.1: - resolution: {integrity: sha512-uhFf3vpE6th6X2E1NSIy1+dWVeS9gb7W8EWd/cn5MacEiv4aVY3gtypaglTaVhYPfnJfcD+v3Ql6gGvx4Efh6A==} + /electron/21.4.2: + resolution: {integrity: sha512-AM2MbPUB7el/9O1UXL3xYA8pTDOPDxiT0HrLuXKkX8Oe0yCvjozNRzEac27gIUd1V/hg0BBvQuYjaRU1Rcxhyg==} engines: {node: '>= 10.17.0'} hasBin: true requiresBuild: true