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

.github/CONTRIBUTING.md

@@ -7,17 +7,17 @@
 
 ## NPM dependencies
 
-Install pnpm: `npm install -g pnpm@10.18.3`
+Install pnpm: `npm install -g pnpm@10.19.0`
 
 <details>
 <summary>For China mainland</summary>
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.0 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.1 -D`
 * Windows:
   * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-  * `pnpm install electron@37.7.0 -D`
+  * `pnpm install electron@37.7.1 -D`
 
 NPM mirror:
 
@@ -27,7 +27,7 @@ NPM mirror:
 
 Enter the app folder and execute:
 
-* `pnpm install electron@37.7.0 -D`
+* `pnpm install electron@37.7.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -7,17 +7,17 @@
 
 ## NPM 依赖
 
-安装 pnpm：`npm install -g pnpm@10.18.3`
+安装 pnpm：`npm install -g pnpm@10.19.0`
 
 <details>
 <summary>适用于中国大陆</summary>
 
 设置 Electron 镜像环境变量并安装 Electron：
 
-* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.0 -D`
+* macOS/Linux：`ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@37.7.1 -D`
 * Windows：
   * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-  * `pnpm install electron@37.7.0 -D`
+  * `pnpm install electron@37.7.1 -D`
 
 NPM 镜像：
 
@@ -27,7 +27,7 @@ NPM 镜像：
 
 进入 app 文件夹执行：
 
-* `pnpm install electron@37.7.0 -D`
+* `pnpm install electron@37.7.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

app/package.json

@@ -4,7 +4,7 @@
   "description": "Refactor your thinking",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",
-  "packageManager": "pnpm@10.18.3",
+  "packageManager": "pnpm@10.19.0",
   "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": "37.7.0",
+    "electron": "37.7.1",
     "electron-builder": "26.0.12",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",

app/pnpm-lock.yaml

@@ -10,7 +10,7 @@ importers:
     dependencies:
       '@electron/remote':
         specifier: ^2.1.3
-        version: 2.1.3(electron@37.7.0)
+        version: 2.1.3(electron@37.7.1)
     devDependencies:
       '@eslint/eslintrc':
         specifier: ^3.3.1
@@ -40,8 +40,8 @@ importers:
         specifier: ^1.11.5
         version: 1.11.18
       electron:
-        specifier: 37.7.0
-        version: 37.7.0
+        specifier: 37.7.1
+        version: 37.7.1
       electron-builder:
         specifier: 26.0.12
         version: 26.0.12(electron-builder-squirrel-windows@26.0.12)
@@ -1198,8 +1198,8 @@ packages:
     resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
     engines: {node: '>=8.0.0'}
 
-  electron@37.7.0:
-    resolution: {integrity: sha512-LBzvfrS0aalynOsnC11AD7zeoU8eOois090mzLpQM3K8yZ2N04i2ZW9qmHOTFLrXlKvrwRc7EbyQf1u8XHMl6Q==}
+  electron@37.7.1:
+    resolution: {integrity: sha512-2EmIqWv4T8BtgFQosB3/0Fezs09X3l0wXhIzes/cNt/GI+UDljbQr3NiF2J9WnqP0aFSbUEfztGUQMiX+qDvsw==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -2868,9 +2868,9 @@ snapshots:
       - bluebird
       - supports-color
 
-  '@electron/remote@2.1.3(electron@37.7.0)':
+  '@electron/remote@2.1.3(electron@37.7.1)':
     dependencies:
-      electron: 37.7.0
+      electron: 37.7.1
 
   '@electron/universal@2.0.1':
     dependencies:
@@ -4013,7 +4013,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@37.7.0:
+  electron@37.7.1:
     dependencies:
       '@electron/get': 2.0.3
       '@types/node': 22.18.1

kernel/model/repository.go

@@ -1586,6 +1586,19 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult,
 			if parts := strings.Split(file.Path, "/"); 3 < len(parts) {
 				if pluginName := parts[3]; "petals.json" != pluginName {
 					upsertPluginSet.Add(pluginName)
+				} else {
+					// 修改了 petals.json 则重新加载所有插件
+					// The plugin switch status is not synchronized https://github.com/siyuan-note/siyuan/issues/16155
+					entries, err := os.ReadDir(filepath.Join(util.DataDir, "storage", "petal"))
+					if nil != err {
+						logging.LogErrorf("read petals dir failed: %s", err)
+					} else {
+						for _, entry := range entries {
+							if entry.IsDir() {
+								upsertPluginSet.Add(entry.Name())
+							}
+						}
+					}
 				}
 			}
 		}