zen-gitsync 2.10.11 → 2.10.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/config.js +11 -6
- package/src/ui/public/assets/index-B8PRi6z_.css +1 -0
- package/src/ui/public/assets/index-CPAAliuZ.js +108 -0
- package/src/ui/public/assets/{vendor-p8JQYEm4.js → vendor-BpNfZzQX.js} +1 -1
- package/src/ui/public/index.html +3 -3
- package/src/ui/server/routes/config.js +7 -1
- package/src/ui/public/assets/index-C_nH-jcX.css +0 -1
- package/src/ui/public/assets/index-Dj-uIL6v.js +0 -107
package/package.json
CHANGED
package/src/config.js
CHANGED
|
@@ -53,12 +53,11 @@ function getCurrentProjectKey() {
|
|
|
53
53
|
|
|
54
54
|
// 从磁盘读取原始配置对象
|
|
55
55
|
async function readRawConfigFile() {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
} catch (_) {
|
|
60
|
-
return null;
|
|
56
|
+
const state = await safeLoadRaw();
|
|
57
|
+
if (!state.ok) {
|
|
58
|
+
throw state.error;
|
|
61
59
|
}
|
|
60
|
+
return state.obj;
|
|
62
61
|
}
|
|
63
62
|
|
|
64
63
|
// 将原始配置对象写回磁盘
|
|
@@ -98,7 +97,13 @@ async function safeLoadRaw() {
|
|
|
98
97
|
// 异步读取配置文件
|
|
99
98
|
async function loadConfig() {
|
|
100
99
|
const key = getCurrentProjectKey();
|
|
101
|
-
|
|
100
|
+
let raw = null;
|
|
101
|
+
try {
|
|
102
|
+
raw = await readRawConfigFile();
|
|
103
|
+
} catch (err) {
|
|
104
|
+
const msg = err?.message ? String(err.message) : String(err);
|
|
105
|
+
throw new Error(`系统配置文件JSON格式错误，请修复后重试。\n文件: ${configPath}\n原因: ${msg}`);
|
|
106
|
+
}
|
|
102
107
|
// 兼容旧版（全局扁平结构）
|
|
103
108
|
if (raw && !raw.projects) {
|
|
104
109
|
return { ...defaultConfig, ...raw };
|