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

.github/CONTRIBUTING.md

@@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.2.10 -D`
+    * `pnpm install electron@30.0.1 -D`
 
 NPM mirror:
 
@@ -30,7 +30,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@28.2.10 -D`
+* `pnpm install electron@30.0.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -18,11 +18,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.2.10 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.2.10 -D`
+    * `pnpm install electron@30.0.1 -D`
 
 NPM 镜像：
 
@@ -32,7 +32,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@28.2.10 -D`
+* `pnpm install electron@30.0.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20200915214115-42b8zma.sy

@@ -1213,7 +1213,7 @@
 							"Children": [
 								{
 									"Type": "NodeText",
-									"Data": "退出思源后下在文件系统上修改该文件（请注意 JSON 格式的正确性）"
+									"Data": "退出思源后在文件系统上修改该文件（请注意 JSON 格式的正确性）"
 								}
 							]
 						}

app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226123038-4umgpxy.sy

@@ -1195,7 +1195,7 @@
 							"Children": [
 								{
 									"Type": "NodeText",
-									"Data": "退出思源後下在文件系統上修改該文件（請注意 JSON 格式的正確性）"
+									"Data": "退出思源後在文件系統上修改該文件（請注意 JSON 格式的正確性）"
 								}
 							]
 						}

app/package.json

@@ -4,7 +4,7 @@
   "description": "Refactor your thinking",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",
-  "packageManager": "pnpm@9.0.2",
+  "packageManager": "pnpm@9.0.6",
   "scripts": {
     "lint": "eslint . --fix --cache",
     "dev": "webpack --mode development",
@@ -53,7 +53,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.5",
-    "electron": "28.2.10",
+    "electron": "30.0.1",
     "electron-builder": "^24.13.3",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",