0.4.0 convex及界面修改
This commit is contained in:
@@ -85,11 +85,16 @@ async function waitForPort(host, port, timeoutMs = 20_000) {
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const envAllPath = path.join(rootDir, ".env.all");
|
||||
if (!fs.existsSync(envAllPath)) {
|
||||
console.error("[desktop-local] 缺少 .env.all:请在仓库根目录创建全局唯一 env 文件后重试。");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const envMerged = {
|
||||
...process.env,
|
||||
...loadEnvFile(path.join(rootDir, ".env.local")),
|
||||
...loadEnvFile(path.join(rootDir, ".env")),
|
||||
...loadEnvFile(path.join(backendDir, ".env")),
|
||||
// 约定:全局仅使用仓库根目录的 .env.all 作为配置来源(生产优先)。
|
||||
...loadEnvFile(envAllPath),
|
||||
PYTHONUTF8: "1",
|
||||
MNOTE_DATA_DIR: dataDir,
|
||||
};
|
||||
@@ -156,4 +161,3 @@ main().catch((err) => {
|
||||
console.error(err instanceof Error ? err.stack : String(err));
|
||||
process.exit(1);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user