Merge remote-tracking branch 'origin/dev' into dev

.github/CONTRIBUTING.md

@@ -13,7 +13,7 @@ Install pnpm: `npm install -g pnpm`
 <summary>For China mainland</summary>
 Set the Electron mirror environment variable:
 
-* macOS/Linux: ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@19.0.8 -D
+* macOS/Linux: `export ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
 * Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
 
 NPM mirror:
@@ -22,8 +22,9 @@ NPM mirror:
 * Revert to using official repository `pnpm --registry https://registry.npmjs.org i`
 </details>
 
-On the desktop, go to the app folder to compile and run:
+On the desktop, go to the app folder to run:
 
+* `pnpm install electron@19.0.10 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -13,7 +13,7 @@
 <summary>适用于中国大陆</summary>
 设置 Electron 镜像环境变量：
 
-* macOS/Linux：ELECTRON_MIRROR="https://cnpmjs.org/mirrors/electron/" pnpm install electron@19.0.8 -D
+* macOS/Linux：`export ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
 * Windows: `SET ELECTRON_MIRROR=https://cnpmjs.org/mirrors/electron/`
 
 NPM 镜像：
@@ -22,8 +22,9 @@ NPM 镜像：
 * 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i`
 </details>
 
-桌面端进入 app 文件夹编译和运行：
+桌面端进入 app 文件夹运行：
 
+* `pnpm install electron@19.0.10 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

app/package.json

@@ -59,7 +59,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.3",
-    "electron": "19.0.8",
+    "electron": "19.0.10",
     "electron-builder": "^23.3.1",
     "encoding": "^0.1.13",
     "eslint": "^8.19.0",

app/pnpm-lock.yaml

@@ -15,7 +15,7 @@ specifiers:
   clean-webpack-plugin: ^4.0.0
   css-loader: ^6.7.1
   dayjs: ^1.11.3
-  electron: 19.0.8
+  electron: 19.0.10
   electron-builder: ^23.3.1
   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@19.0.8
+  '@electron/remote': 2.0.8_electron@19.0.10
   electron-fetch: 1.7.4
   pnpm: 7.5.1
 
@@ -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.3
-  electron: 19.0.8
+  electron: 19.0.10
   electron-builder: 23.3.1
   encoding: 0.1.13
   eslint: 8.19.0
@@ -1274,12 +1274,12 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@electron/remote/2.0.8_electron@19.0.8:
+  /@electron/remote/2.0.8_electron@19.0.10:
     resolution: {integrity: sha512-P10v3+iFCIvEPeYzTWWGwwHmqWnjoh8RYnbtZAb3RlQefy4guagzIwcWtfftABIfm6JJTNQf4WPSKWZOpLmHXw==}
     peerDependencies:
       electron: '>= 13.0.0'
     dependencies:
-      electron: 19.0.8
+      electron: 19.0.10
     dev: false
 
   /@electron/universal/1.2.1:
@@ -2818,8 +2818,8 @@ packages:
     resolution: {integrity: sha512-YoVeFrGd/7ROjz4R9uPoND1K/hSRC/xADy9639ZmIZeJSaBnKdYx3I6LMPsY7CXLpK7JFgKQVzeZ/dk2br6Eaw==}
     dev: true
 
-  /electron/19.0.8:
-    resolution: {integrity: sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==}
+  /electron/19.0.10:
+    resolution: {integrity: sha512-EiWtPWdD7CzkRkp1cw7t0N9W2qhI5XZOudHX7daOh5wI076nsdV2dtlAf/XyTHhPNoKR5qhTWrSnYL9PY6D1vg==}
     engines: {node: '>= 8.6'}
     hasBin: true
     requiresBuild: true