diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1c6373a5e..720e3d0fd 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.0.3 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@22.0.3 -D` + * `pnpm install electron@22.1.0 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@22.0.3 -D` +* `pnpm install electron@22.1.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 7fddf5fa5..2de2347c7 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.0.3 -D + ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/ pnpm install electron@22.1.0 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/` - * `pnpm install electron@22.0.3 -D` + * `pnpm install electron@22.1.0 -D` NPM 镜像: @@ -30,7 +30,7 @@ NPM 镜像: 桌面端进入 app 文件夹运行: -* `pnpm install electron@22.0.3 -D` +* `pnpm install electron@22.1.0 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index 0d2d82628..94a846c4d 100644 --- a/app/package.json +++ b/app/package.json @@ -4,7 +4,7 @@ "description": "Build Your Eternal Digital Garden", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", - "packageManager": "pnpm@7.18.1", + "packageManager": "pnpm@7.26.1", "scripts": { "lint": "eslint . --fix --ext .ts", "dev": "webpack --mode development", @@ -58,7 +58,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "22.0.3", + "electron": "22.1.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 e8d330847..aa5e53787 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.0.3 + electron: 22.1.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@22.0.3 + '@electron/remote': 2.0.8_electron@22.1.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.0.3 + electron: 22.1.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.8_electron@22.0.3: + /@electron/remote/2.0.8_electron@22.1.0: resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==} peerDependencies: electron: '>= 13.0.0' dependencies: - electron: 22.0.3 + electron: 22.1.0 dev: false /@electron/universal/1.2.1: @@ -2861,8 +2861,8 @@ packages: resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==} dev: true - /electron/22.0.3: - resolution: {integrity: sha512-eETrJTINTzlXgQrnJSrKiF2Xdt5EHpxZ6Kk+WUjFCE0zUztdVm+hrngUecqhj8TPFlYScTANzPwRwUIjOChl+g==} + /electron/22.1.0: + resolution: {integrity: sha512-wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA==} engines: {node: '>= 12.20.55'} hasBin: true requiresBuild: true