diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e53fc9647..8dbc75413 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.12.1` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.0 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.2 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v32.2.0 -D` + * `pnpm install electron@v32.2.2 -D` NPM mirror: @@ -28,7 +28,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@v32.2.0 -D` +* `pnpm install electron@v32.2.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index a471a61e7..b54f9b733 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -16,11 +16,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.0 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v32.2.2 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@v32.2.0 -D` + * `pnpm install electron@v32.2.2 -D` NPM 镜像： @@ -30,7 +30,7 @@ NPM 镜像： 桌面端进入 app 文件夹运行： -* `pnpm install electron@v32.2.0 -D` +* `pnpm install electron@v32.2.2 -D` * `pnpm run dev` * `pnpm run start` diff --git a/app/package.json b/app/package.json index d4c7ece59..b4946cfc7 100644 --- a/app/package.json +++ b/app/package.json @@ -56,7 +56,7 @@ "clean-webpack-plugin": "^4.0.0", "css-loader": "^6.7.1", "dayjs": "^1.11.5", - "electron": "32.2.0", + "electron": "32.2.2", "electron-builder": "24.13.3", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 65588c801..cdc2c9be9 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: dependencies: '@electron/remote': specifier: ^2.1.2 - version: 2.1.2(electron@32.2.0) + version: 2.1.2(electron@32.2.2) devDependencies: '@types/node': specifier: ^18.13.0 @@ -26,37 +26,37 @@ importers: version: 2.19.0 clean-webpack-plugin: specifier: ^4.0.0 - version: 4.0.0(webpack@5.95.0(webpack-cli@4.10.0)) + version: 4.0.0(webpack@5.95.0) css-loader: specifier: ^6.7.1 - version: 6.7.1(webpack@5.95.0(webpack-cli@4.10.0)) + version: 6.7.1(webpack@5.95.0) dayjs: specifier: ^1.11.5 version: 1.11.5 electron: - specifier: 32.2.0 - version: 32.2.0 + specifier: 32.2.2 + version: 32.2.2 electron-builder: specifier: 24.13.3 - version: 24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + version: 24.13.3(electron-builder-squirrel-windows@25.0.5) encoding: specifier: ^0.1.13 version: 0.1.13 esbuild-loader: specifier: ^3.0.1 - version: 3.0.1(webpack@5.95.0(webpack-cli@4.10.0)) + version: 3.0.1(webpack@5.95.0) eslint: specifier: ^8.19.0 version: 8.19.0 file-loader: specifier: ^6.2.0 - version: 6.2.0(webpack@5.95.0(webpack-cli@4.10.0)) + version: 6.2.0(webpack@5.95.0) html-loader: specifier: ^2.1.2 - version: 2.1.2(webpack@5.95.0(webpack-cli@4.10.0)) + version: 2.1.2(webpack@5.95.0) html-webpack-plugin: specifier: ^5.5.0 - version: 5.5.0(webpack@5.95.0(webpack-cli@4.10.0)) + version: 5.5.0(webpack@5.95.0) iconv-lite: specifier: ^0.6.3 version: 0.6.3 @@ -65,7 +65,7 @@ importers: version: 2.3.2 mini-css-extract-plugin: specifier: 2.7.6 - version: 2.7.6(webpack@5.95.0(webpack-cli@4.10.0)) + version: 2.7.6(webpack@5.95.0) path-browserify: specifier: ^1.0.1 version: 1.0.1 @@ -77,7 +77,7 @@ importers: version: 1.53.0 sass-loader: specifier: ^12.6.0 - version: 12.6.0(sass@1.53.0)(webpack@5.95.0(webpack-cli@4.10.0)) + version: 12.6.0(sass@1.53.0)(webpack@5.95.0) typescript: specifier: ^4.7.4 version: 4.7.4 @@ -762,6 +762,7 @@ packages: boolean@3.2.0: resolution: {integrity: sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. brace-expansion@1.1.11: resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==} @@ -1121,8 +1122,8 @@ packages: electron-to-chromium@1.5.39: resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==} - electron@32.2.0: - resolution: {integrity: sha512-Xy82QBQrEiQysoxsv6lnhHAcWNNe6vV6QqH3OPFXhEj/T9oAsBHEhZuuYHINSSsUE7zRSj+J9sNwJYOjisT0Vw==} + electron@32.2.2: + resolution: {integrity: sha512-c7TRE42JcgEmJ4elJyCdKk/2os0UX7YMkRDeXBkxFEoM34iX1/2x+c5T9PgeroKz8FEG7omRU5TvjulqVtXvdw==} engines: {node: '>= 12.20.55'} hasBin: true @@ -2812,9 +2813,9 @@ snapshots: - bluebird - supports-color - '@electron/remote@2.1.2(electron@32.2.0)': + '@electron/remote@2.1.2(electron@32.2.2)': dependencies: - electron: 32.2.0 + electron: 32.2.2 '@electron/universal@1.5.1': dependencies: @@ -3249,17 +3250,17 @@ snapshots: '@webassemblyjs/ast': 1.12.1 '@xtuc/long': 4.2.2 - '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0))(webpack@5.95.0(webpack-cli@4.10.0))': + '@webpack-cli/configtest@1.2.0(webpack-cli@4.10.0)(webpack@5.95.0)': dependencies: webpack: 5.95.0(webpack-cli@4.10.0) webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0) - '@webpack-cli/info@1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0))': + '@webpack-cli/info@1.5.0(webpack-cli@4.10.0)': dependencies: envinfo: 7.8.1 webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0) - '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0))': + '@webpack-cli/serve@1.7.0(webpack-cli@4.10.0)': dependencies: webpack-cli: 4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0) @@ -3346,7 +3347,7 @@ snapshots: app-builder-bin@5.0.0-alpha.7: {} - app-builder-lib@24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + app-builder-lib@24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@25.0.5): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.2.1 @@ -3380,7 +3381,7 @@ snapshots: transitivePeerDependencies: - supports-color - app-builder-lib@25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + app-builder-lib@25.0.5(dmg-builder@24.13.3)(electron-builder-squirrel-windows@25.0.5): dependencies: '@develar/schema-utils': 2.6.5 '@electron/notarize': 2.3.2 @@ -3677,7 +3678,7 @@ snapshots: clean-stack@2.2.0: {} - clean-webpack-plugin@4.0.0(webpack@5.95.0(webpack-cli@4.10.0)): + clean-webpack-plugin@4.0.0(webpack@5.95.0): dependencies: del: 4.1.1 webpack: 5.95.0(webpack-cli@4.10.0) @@ -3779,7 +3780,7 @@ snapshots: shebang-command: 2.0.0 which: 2.0.2 - css-loader@6.7.1(webpack@5.95.0(webpack-cli@4.10.0)): + css-loader@6.7.1(webpack@5.95.0): dependencies: icss-utils: 5.1.0(postcss@8.4.31) postcss: 8.4.31 @@ -3862,7 +3863,7 @@ snapshots: dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@25.0.5) builder-util: 24.13.1 builder-util-runtime: 9.2.4 fs-extra: 10.1.0 @@ -3937,7 +3938,7 @@ snapshots: electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3): dependencies: - app-builder-lib: 25.0.5(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 25.0.5(dmg-builder@24.13.3)(electron-builder-squirrel-windows@25.0.5) archiver: 5.3.2 builder-util: 25.0.3 fs-extra: 10.1.0 @@ -3946,9 +3947,9 @@ snapshots: - dmg-builder - supports-color - electron-builder@24.13.3(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)): + electron-builder@24.13.3(electron-builder-squirrel-windows@25.0.5): dependencies: - app-builder-lib: 24.13.3(dmg-builder@24.13.3(electron-builder-squirrel-windows@25.0.5))(electron-builder-squirrel-windows@25.0.5(dmg-builder@24.13.3)) + app-builder-lib: 24.13.3(dmg-builder@24.13.3)(electron-builder-squirrel-windows@25.0.5) builder-util: 24.13.1 builder-util-runtime: 9.2.4 chalk: 4.1.2 @@ -3989,7 +3990,7 @@ snapshots: electron-to-chromium@1.5.39: {} - electron@32.2.0: + electron@32.2.2: dependencies: '@electron/get': 2.0.2 '@types/node': 20.14.5 @@ -4029,7 +4030,7 @@ snapshots: es6-error@4.1.1: optional: true - esbuild-loader@3.0.1(webpack@5.95.0(webpack-cli@4.10.0)): + esbuild-loader@3.0.1(webpack@5.95.0): dependencies: esbuild: 0.17.10 get-tsconfig: 4.4.0 @@ -4192,7 +4193,7 @@ snapshots: dependencies: flat-cache: 3.0.4 - file-loader@6.2.0(webpack@5.95.0(webpack-cli@4.10.0)): + file-loader@6.2.0(webpack@5.95.0): dependencies: loader-utils: 2.0.4 schema-utils: 3.1.1 @@ -4409,7 +4410,7 @@ snapshots: dependencies: lru-cache: 6.0.0 - html-loader@2.1.2(webpack@5.95.0(webpack-cli@4.10.0)): + html-loader@2.1.2(webpack@5.95.0): dependencies: html-minifier-terser: 5.1.1 parse5: 6.0.1 @@ -4435,7 +4436,7 @@ snapshots: relateurl: 0.2.7 terser: 5.14.1 - html-webpack-plugin@5.5.0(webpack@5.95.0(webpack-cli@4.10.0)): + html-webpack-plugin@5.5.0(webpack@5.95.0): dependencies: '@types/html-minifier-terser': 6.1.0 html-minifier-terser: 6.1.0 @@ -4759,7 +4760,7 @@ snapshots: mimic-response@3.1.0: {} - mini-css-extract-plugin@2.7.6(webpack@5.95.0(webpack-cli@4.10.0)): + mini-css-extract-plugin@2.7.6(webpack@5.95.0): dependencies: schema-utils: 4.2.0 webpack: 5.95.0(webpack-cli@4.10.0) @@ -5212,7 +5213,7 @@ snapshots: dependencies: truncate-utf8-bytes: 1.0.2 - sass-loader@12.6.0(sass@1.53.0)(webpack@5.95.0(webpack-cli@4.10.0)): + sass-loader@12.6.0(sass@1.53.0)(webpack@5.95.0): dependencies: klona: 2.0.5 neo-async: 2.6.2 @@ -5408,7 +5409,7 @@ snapshots: async-exit-hook: 2.0.1 fs-extra: 10.1.0 - terser-webpack-plugin@5.3.10(webpack@5.95.0(webpack-cli@4.10.0)): + terser-webpack-plugin@5.3.10(webpack@5.95.0): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 @@ -5546,9 +5547,9 @@ snapshots: webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0): dependencies: '@discoveryjs/json-ext': 0.5.7 - '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0))(webpack@5.95.0(webpack-cli@4.10.0)) - '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0)) - '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0(webpack-bundle-analyzer@4.5.0)(webpack@5.95.0)) + '@webpack-cli/configtest': 1.2.0(webpack-cli@4.10.0)(webpack@5.95.0) + '@webpack-cli/info': 1.5.0(webpack-cli@4.10.0) + '@webpack-cli/serve': 1.7.0(webpack-cli@4.10.0) colorette: 2.0.19 commander: 7.2.0 cross-spawn: 7.0.3 @@ -5595,7 +5596,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(webpack@5.95.0(webpack-cli@4.10.0)) + terser-webpack-plugin: 5.3.10(webpack@5.95.0) watchpack: 2.4.2 webpack-sources: 3.2.3 optionalDependencies: