@open-wxa/wxa-runner-core 0.12.2 → 0.12.3

package/dist/index.mjs

@@ -600,8 +600,8 @@ var AppBuilder = class {
         this.pending = { covers: this.changes, result: result2 };
       }
       const { covers, result } = this.pending;
-      const built = await result;
-      if (covers >= wanted) return built;
+      if (covers >= wanted) return result;
+      await result.catch(() => void 0);
     }
   }
   /**
@@ -1994,6 +1994,8 @@ var DevServer = class {
     this.socketProxy = null;
     this.sockets = null;
     this.watcher = null;
+    /** 上次编译失败时页面上显示着错误，修好后整页刷新才能清掉 */
+    this.lastBuildFailed = false;
     this.address = "";
     this.lanAccess = false;
     /** 运行时生成的临时文件（canvas 导出、拍照等），随服务器进程存在 */
@@ -2037,10 +2039,12 @@ var DevServer = class {
     return Object.values(os3.networkInterfaces()).flat().filter((net2) => net2 && net2.family === "IPv4" && !net2.internal).map((net2) => `http://${net2.address}:${port}`);
   }
   async start() {
+    if (this.options.watch !== false) await this.startWatching();
     try {
       const build2 = await this.builder.build();
       this.logger.log(`[wxa-runner] \u7F16\u8BD1\u5B8C\u6210\uFF1A${build2.pages.length} \u4E2A\u9875\u9762\uFF0C${build2.components.length} \u4E2A\u7EC4\u4EF6\uFF0C${build2.durationMs}ms`);
     } catch (error) {
+      this.lastBuildFailed = true;
       this.logger.error(`[wxa-runner] \u7F16\u8BD1\u5931\u8D25\uFF1A
 ${error.message}`);
     }
@@ -2063,11 +2067,17 @@ ${error.message}`);
       }
     });
     const host = this.options.host || "localhost";
-    const port = await listen(server, this.options.port, host, this.logger);
+    let port;
+    try {
+      port = await listen(server, this.options.port, host, this.logger);
+    } catch (error) {
+      await this.watcher?.close();
+      this.watcher = null;
+      throw error;
+    }
     this.server = server;
     this.lanAccess = LOCAL_HOST_OF_ANY_ADDRESS.has(host);
     this.address = `http://${LOCAL_HOST_OF_ANY_ADDRESS.get(host) ?? host}:${port}`;
-    if (this.options.watch !== false) this.startWatching();
     this.ticketSource?.().then(requireUsableTicket).catch((error) => this.logger.warn(`[wxa-runner] \u5F00\u53D1\u8005\u5DE5\u5177\u7684\u767B\u5F55\u6001\u6682\u4E0D\u53EF\u7528\uFF08--devtools-login\uFF09\uFF1A${error.message}`));
     return this.address;
   }
@@ -2304,31 +2314,32 @@ ${error.message}`);
   get hotEnabled() {
     return this.options.watch !== false;
   }
+  /** 返回初次扫描完成的时刻，此前已存在的文件不会作为改动报告 */
   startWatching() {
-    let lastBuildFailed = false;
     const watched = [this.project.root];
     const outsideRoot = (file) => path6.relative(this.project.root, file).startsWith("..");
     if (this.setupFile && outsideRoot(this.setupFile)) watched.push(this.setupFile);
     const projectConfig = path6.join(this.project.projectPath, "project.config.json");
     if (outsideRoot(projectConfig) && fs6.existsSync(projectConfig)) watched.push(projectConfig);
     this.watcher = watchProject(this.project.root, watched, async ({ files, structural }) => {
-      const reloadOnly = structural || lastBuildFailed;
+      const reloadOnly = structural || this.lastBuildFailed;
       this.builder.invalidate(files);
       const label = files.length > 3 ? `${files.slice(0, 3).join(", ")} \u7B49 ${files.length} \u4E2A\u6587\u4EF6` : files.join(", ");
       try {
         const build2 = await this.builder.build();
-        lastBuildFailed = false;
+        this.lastBuildFailed = false;
         const plan = reloadOnly ? null : planHotUpdate(files, build2);
         this.logger.log(`[wxa-runner] ${label} \u5DF2\u66F4\u65B0\uFF0C\u91CD\u65B0\u7F16\u8BD1 ${build2.durationMs}ms${plan ? "\uFF0C\u70ED\u66F4\u65B0" : ""}`);
         this.broadcast(plan ? { type: "hot", version: build2.version, ...plan } : { type: "reload" });
       } catch (error) {
-        lastBuildFailed = true;
+        this.lastBuildFailed = true;
         const message = error.message;
         this.logger.error(`[wxa-runner] \u7F16\u8BD1\u5931\u8D25\uFF1A
 ${message}`);
         this.broadcast({ type: "error", message });
       }
     });
+    return this.watcher.ready;
   }
   broadcast(message) {
     const data = JSON.stringify(message);