diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 614fd4990..b39663433 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -7,17 +7,17 @@ ## NPM dependencies -Install pnpm: `npm install -g pnpm@10.28.1` +Install pnpm: `npm install -g pnpm@10.28.2`
For China mainland Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.3.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.5.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@39.3.0 -D` + * `pnpm install electron@39.5.1 -D` NPM mirror: @@ -27,7 +27,7 @@ NPM mirror: Enter the app folder and execute: -* `pnpm install electron@39.3.0 -D` +* `pnpm install electron@39.5.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 1fac6fac0..33b905db5 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -7,17 +7,17 @@ ## NPM 依赖 -安装 pnpm:`npm install -g pnpm@10.28.1` +安装 pnpm:`npm install -g pnpm@10.28.2`
适用于中国大陆 设置 Electron 镜像环境变量并安装 Electron: -* macOS/Linux:`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.3.0 -D` +* macOS/Linux:`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@39.5.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@39.3.0 -D` + * `pnpm install electron@39.5.1 -D` NPM 镜像: @@ -27,7 +27,7 @@ NPM 镜像: 进入 app 文件夹执行: -* `pnpm install electron@39.3.0 -D` +* `pnpm install electron@39.5.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index bc57e226c..3d1ed641c 100644 --- a/app/package.json +++ b/app/package.json @@ -4,7 +4,7 @@ "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", - "packageManager": "pnpm@10.28.1", + "packageManager": "pnpm@10.28.2", "scripts": { "lint": "eslint . --fix --cache", "dev": "webpack --mode development", @@ -57,7 +57,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^7.1.2", "dayjs": "^1.11.5", - "electron": "39.3.0", + "electron": "39.5.1", "electron-builder": "26.0.12", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 9e77aaff1..1aeec2509 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: ^2.1.3 - version: 2.1.3(electron@39.3.0) + version: 2.1.3(electron@39.5.1) devDependencies: '@eslint/eslintrc': specifier: ^3.3.1 @@ -40,8 +40,8 @@ importers: specifier: ^1.11.5 version: 1.11.18 electron: - specifier: 39.3.0 - version: 39.3.0 + specifier: 39.5.1 + version: 39.5.1 electron-builder: specifier: 26.0.12 version: 26.0.12(electron-builder-squirrel-windows@26.0.12) @@ -1210,8 +1210,8 @@ packages: resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==} engines: {node: '>=8.0.0'} - electron@39.3.0: - resolution: {integrity: sha512-ZA2Cmu5Vs8zeuZBr71XWZ5vgm7lRDB9N50oV6ee7YocITyxRxx/apWFKY48Sxyn0gzVlX+6YQc3CS1PtYIkGUg==} + electron@39.5.1: + resolution: {integrity: sha512-6s/sBQar+bbW59XSqohZj04MPic+kdVUAWjLbfQB/uLOeNw9jWX5FHaTxpHK29Xp3mKOHef7wErsjwMyCuWltg==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2884,9 +2884,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.3(electron@39.3.0)': + '@electron/remote@2.1.3(electron@39.5.1)': dependencies: - electron: 39.3.0 + electron: 39.5.1 '@electron/universal@2.0.1': dependencies: @@ -4033,7 +4033,7 @@ snapshots: transitivePeerDependencies: - supports-color - electron@39.3.0: + electron@39.5.1: dependencies: '@electron/get': 2.0.3 '@types/node': 22.18.1