@ecopages/core 0.2.0-beta.19 → 0.2.0-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-beta.19",
+  "version": "0.2.0-beta.20",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-beta.19",
+    "@ecopages/file-system": "0.2.0-beta.20",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@oxc-project/runtime": "0.134.0",

package/src/adapters/bun/server-adapter.js

@@ -158,9 +158,6 @@ class BunServerAdapter extends SharedServerAdapter {
   async initialize() {
     installAppRuntimeBuildExecutor(this.appConfig);
     this.staticSiteGenerator = new StaticSiteGenerator({ appConfig: this.appConfig });
-    if (this.options?.watch) {
-      await this.hmrManager.buildRuntime();
-    }
     prepareRuntimePublicDir(this.appConfig);
     const staticBuilderOptions = {
       appConfig: this.appConfig,
@@ -177,6 +174,9 @@ class BunServerAdapter extends SharedServerAdapter {
     if (!this.deferRuntimeAssetSetup) {
       await this.initializeRuntimePlugins({ watch: this.options?.watch });
     }
+    if (this.options?.watch) {
+      await this.hmrManager.ensureRuntimeReady();
+    }
   }
   /**
    * Registers runtime plugins and propagates the final HMR manager into each
@@ -323,14 +323,9 @@ class BunServerAdapter extends SharedServerAdapter {
         }
         if (url.pathname === "/_hmr_runtime.js") {
           await waitForInit();
+          const runtimeReady = await hmrManager.ensureRuntimeReady();
           const runtimePath = hmrManager.getRuntimePath();
-          if (!fileSystem.exists(runtimePath)) {
-            appLogger.warn(
-              `[HMR] Runtime script missing at ${runtimePath}; attempting to rebuild before serving.`
-            );
-            await hmrManager.buildRuntime();
-          }
-          if (fileSystem.exists(runtimePath)) {
+          if (runtimeReady && fileSystem.exists(runtimePath)) {
             return new Response(fileSystem.readFileAsBuffer(runtimePath), {
               headers: { "Content-Type": "application/javascript" }
             });
@@ -519,6 +514,9 @@ class BunServerAdapter extends SharedServerAdapter {
       staticRoutes: this.staticRoutes,
       hmrManager: this.hmrManager
     });
+    if (this.options?.watch) {
+      await this.hmrManager.ensureRuntimeReady();
+    }
     this.fullyInitialized = true;
     if (this.options?.watch) await this.watch();
     if (server && typeof server.reload === "function") {

package/src/adapters/node/server-adapter.js

@@ -278,7 +278,7 @@ class NodeServerAdapter extends SharedServerAdapter {
       this.bridge = devRuntime.bridge;
       this.hmrManager = devRuntime.hmrManager;
       this.hmrManager.setEnabled(true);
-      await this.hmrManager.buildRuntime();
+      await this.hmrManager.ensureRuntimeReady();
       const hmrPreflight = (req, socket, head) => {
         const url = new URL(req.url ?? "/", this.runtimeOrigin);
         if (url.pathname !== "/_hmr") return false;

package/src/adapters/shared/shared-hmr-manager.d.ts

@@ -30,6 +30,7 @@ export declare abstract class SharedHmrManager implements IHmrManager {
     protected readonly browserBundleService: BrowserBundleService;
     protected readonly entrypointDependencyGraph: EntrypointDependencyGraph;
     protected readonly serverModuleTranspiler: ServerModuleTranspiler;
+    private runtimeBuildPromise;
     constructor({ appConfig, bridge, registrationTimeoutMs }: SharedHmrManagerParams);
     protected abstract createEntrypointDependencyGraph(existingEntrypointDependencyGraph: EntrypointDependencyGraph): EntrypointDependencyGraph;
     protected shouldSkipMissingFileChange(_filePath: string): boolean;
@@ -41,8 +42,21 @@ export declare abstract class SharedHmrManager implements IHmrManager {
     setPlugins(plugins: EcoBuildPlugin[]): void;
     setEnabled(enabled: boolean): void;
     isEnabled(): boolean;
+    isRuntimeReady(): boolean;
+    /**
+     * Builds the browser HMR runtime once and reuses the in-flight build for concurrent callers.
+     */
+    ensureRuntimeReady(): Promise<boolean>;
     buildRuntime(): Promise<void>;
     getRuntimePath(): string;
+    private buildRuntimeInternal;
+    /**
+     * @remarks
+     * Rolldown may emit the runtime bundle under a derived filename when the
+     * entrypoint lives outside the app root. The dev server always serves
+     * `/_hmr_runtime.js` from a stable path under `.eco/assets/_hmr/`.
+     */
+    private syncRuntimeOutput;
     broadcast(event: ClientBridgeEvent): void;
     handleFileChange(filePath: string, options?: HandleFileChangeOptions): Promise<void>;
     getOutputUrl(entrypointPath: string): string | undefined;

package/src/adapters/shared/shared-hmr-manager.js

@@ -51,6 +51,7 @@ class SharedHmrManager {
   browserBundleService;
   entrypointDependencyGraph;
   serverModuleTranspiler;
+  runtimeBuildPromise = null;
   constructor({ appConfig, bridge, registrationTimeoutMs }) {
     this.appConfig = appConfig;
     this.bridge = bridge;
@@ -126,7 +127,33 @@ class SharedHmrManager {
   isEnabled() {
     return this.enabled;
   }
+  isRuntimeReady() {
+    return fileSystem.exists(this.getRuntimePath());
+  }
+  /**
+   * Builds the browser HMR runtime once and reuses the in-flight build for concurrent callers.
+   */
+  async ensureRuntimeReady() {
+    if (this.isRuntimeReady()) {
+      return true;
+    }
+    if (this.runtimeBuildPromise) {
+      return this.runtimeBuildPromise;
+    }
+    this.runtimeBuildPromise = this.buildRuntimeInternal();
+    try {
+      return await this.runtimeBuildPromise;
+    } finally {
+      this.runtimeBuildPromise = null;
+    }
+  }
   async buildRuntime() {
+    await this.ensureRuntimeReady();
+  }
+  getRuntimePath() {
+    return path.join(this.distDir, "_hmr_runtime.js");
+  }
+  async buildRuntimeInternal() {
     const runtimeSource = fileURLToPath(import.meta.resolve("@ecopages/core/hmr/client/hmr-runtime"));
     try {
       const result = await this.browserBundleService.bundle({
@@ -139,13 +166,32 @@ class SharedHmrManager {
       });
       if (!result.success) {
         this.onRuntimeBundleFailure(result.logs);
+        return false;
       }
+      this.syncRuntimeOutput(result);
+      return this.isRuntimeReady();
     } catch (error) {
       this.onRuntimeBundleFailure(error);
+      return false;
     }
   }
-  getRuntimePath() {
-    return path.join(this.distDir, "_hmr_runtime.js");
+  /**
+   * @remarks
+   * Rolldown may emit the runtime bundle under a derived filename when the
+   * entrypoint lives outside the app root. The dev server always serves
+   * `/_hmr_runtime.js` from a stable path under `.eco/assets/_hmr/`.
+   */
+  syncRuntimeOutput(result) {
+    const runtimePath = this.getRuntimePath();
+    if (fileSystem.exists(runtimePath)) {
+      return;
+    }
+    const emittedRuntime = result.outputs.find((output) => output.path.endsWith(".js"));
+    if (!emittedRuntime || emittedRuntime.path === runtimePath) {
+      return;
+    }
+    fileSystem.ensureDir(path.dirname(runtimePath));
+    fileSystem.copyFile(emittedRuntime.path, runtimePath);
   }
   broadcast(event) {
     appLogger.debug(