@lolyjs/core 0.1.0-alpha.8 → 0.2.0-alpha.0

package/dist/cli.js

@@ -1325,24 +1325,69 @@ function createClientConfig(projectRoot, mode) {
 init_globals();
 import path12 from "path";
 import fs11 from "fs";
-function startClientBundler(projectRoot) {
-  const { config, outDir } = createClientConfig(projectRoot, "production");
+function startClientBundler(projectRoot, mode = "development") {
+  const { config, outDir } = createClientConfig(projectRoot, mode);
   copyStaticAssets(projectRoot, outDir);
   const compiler = rspack2(config);
+  let isBuilding = false;
+  let buildResolve = null;
+  let buildPromise = null;
+  let lastBuildTime = Date.now();
+  compiler.hooks.compile.tap("HotReload", () => {
+    isBuilding = true;
+    buildPromise = new Promise((resolve3) => {
+      buildResolve = resolve3;
+    });
+  });
   compiler.watch({}, (err, stats) => {
     if (err) {
       console.error("[framework][client] Rspack error:", err);
+      isBuilding = false;
+      lastBuildTime = Date.now();
+      if (buildResolve) {
+        buildResolve();
+        buildResolve = null;
+        buildPromise = null;
+      }
+      return;
+    }
+    if (!stats) {
+      isBuilding = false;
+      lastBuildTime = Date.now();
       return;
     }
-    if (!stats) return;
     if (stats.hasErrors()) {
       console.error(
         "[framework][client] Build with errors:\n",
         stats.toString("errors-only")
       );
+    } else {
+      console.log("[framework][client] \u2713 Client bundle rebuilt successfully");
+    }
+    isBuilding = false;
+    lastBuildTime = Date.now();
+    if (buildResolve) {
+      buildResolve();
+      buildResolve = null;
+      buildPromise = null;
     }
   });
-  return { outDir };
+  return {
+    outDir,
+    waitForBuild: async () => {
+      if (isBuilding && buildPromise) {
+        await buildPromise;
+        await new Promise((resolve3) => setTimeout(resolve3, 100));
+        return;
+      }
+      const timeSinceLastBuild = Date.now() - lastBuildTime;
+      if (timeSinceLastBuild < 500) {
+        await new Promise((resolve3) => setTimeout(resolve3, 200));
+        return;
+      }
+      return Promise.resolve();
+    }
+  };
 }
 function buildClientBundle(projectRoot) {
   const { config, outDir } = createClientConfig(projectRoot, "production");
@@ -3697,7 +3742,9 @@ import path19 from "path";
 function setupHotReload({
   app,
   appDir,
-  route = "/__fw/hot"
+  route = "/__fw/hot",
+  waitForBuild,
+  onFileChange
 }) {
   const clients = /* @__PURE__ */ new Set();
   app.get(route, (req, res) => {
@@ -3718,9 +3765,25 @@ data: connected
     ignoreInitial: true,
     ignored: ["**/node_modules/**", `**/${BUILD_FOLDER_NAME}/**`, "**/.git/**"]
   });
-  function broadcastReload(reason, filePath) {
+  async function broadcastReload(reason, filePath) {
     const rel = path19.relative(appDir, filePath);
     console.log(`[hot-reload] ${reason}: ${rel}`);
+    if (onFileChange) {
+      try {
+        await onFileChange(filePath);
+      } catch (error) {
+        console.warn("[hot-reload] Error in onFileChange callback:", error);
+      }
+    }
+    if (waitForBuild) {
+      try {
+        console.log("[hot-reload] Waiting for client bundle to finish...");
+        await waitForBuild();
+        console.log("[hot-reload] Client bundle ready, sending reload event");
+      } catch (error) {
+        console.warn("[hot-reload] Error waiting for build:", error);
+      }
+    }
     for (const res of clients) {
       res.write(`event: message
 data: reload:${rel}
@@ -3757,14 +3820,29 @@ function setupServer(app, options) {
       };
     };
     var getRoutes = getRoutes2;
-    setupHotReload({ app, appDir });
+    const { outDir, waitForBuild } = startClientBundler(projectRoot, "development");
+    const onFileChange = async (filePath) => {
+      const rel = path21.relative(appDir, filePath);
+      const isPageFile = filePath.includes("page.tsx") || filePath.includes("page.ts") || filePath.includes("layout.tsx") || filePath.includes("layout.ts") || filePath.includes("_not-found") || filePath.includes("_error");
+      const isTsFile = filePath.endsWith(".ts") || filePath.endsWith(".tsx");
+      if (isTsFile) {
+        clearAppRequireCache(appDir);
+        console.log(`[hot-reload] Cleared require cache for: ${rel}`);
+      }
+      if (isPageFile) {
+        const loader = new FilesystemRouteLoader(appDir);
+        const newRoutes = loader.loadRoutes();
+        writeClientRoutesManifest(newRoutes, projectRoot);
+        console.log("[hot-reload] Client routes manifest reloaded");
+      }
+    };
+    setupHotReload({ app, appDir, waitForBuild, onFileChange });
+    app.use("/static", express.static(outDir));
     const routes = routeLoader.loadRoutes();
     const wssRoutes = routeLoader.loadWssRoutes();
     const notFoundPage = routeLoader.loadNotFoundRoute();
     const errorPage = routeLoader.loadErrorRoute();
     writeClientRoutesManifest(routes, projectRoot);
-    const { outDir } = startClientBundler(projectRoot);
-    app.use("/static", express.static(outDir));
     return {
       routes,
       wssRoutes,
@@ -4327,7 +4405,7 @@ async function handlePageRequest(options) {
     const { errorPage, req, res, routeChunks, theme, projectRoot } = options;
     const reqLogger = getRequestLogger(req);
     if (errorPage) {
-      await renderErrorPageWithStream(errorPage, req, res, error, routeChunks || {}, theme, projectRoot);
+      await renderErrorPageWithStream(errorPage, req, res, error, routeChunks || {}, theme, projectRoot, options.env);
     } else {
       reqLogger.error("Unhandled error in page request", error, {
         urlPath: options.urlPath,
@@ -4355,9 +4433,9 @@ async function handlePageRequestInternal(options) {
     theme,
     projectRoot
   } = options;
-  const clientJsPath = projectRoot ? getClientJsPath(projectRoot) : "/static/client.js";
-  const clientCssPath = projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
-  const assetManifest = projectRoot ? loadAssetManifest(projectRoot) : null;
+  const clientJsPath = env === "dev" ? "/static/client.js" : projectRoot ? getClientJsPath(projectRoot) : "/static/client.js";
+  const clientCssPath = env === "dev" ? "/static/client.css" : projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
+  const assetManifest = env === "prod" && projectRoot ? loadAssetManifest(projectRoot) : null;
   const isDataReq = isDataRequest(req);
   if (env === "prod" && ssgOutDir) {
     if (isDataReq) {
@@ -4413,7 +4491,7 @@ async function handlePageRequestInternal(options) {
           const reqLogger = getRequestLogger(req);
           reqLogger.error("SSR shell error", err, { route: "not-found" });
           if (!res.headersSent && errorPage) {
-            renderErrorPageWithStream(errorPage, req, res, err, routeChunks);
+            renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env);
           } else if (!res.headersSent) {
             res.statusCode = 500;
             res.setHeader("Content-Type", "text/html; charset=utf-8");
@@ -4460,7 +4538,7 @@ async function handlePageRequestInternal(options) {
       return;
     } else {
       if (errorPage) {
-        await renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot);
+        await renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env);
         return;
       } else {
         throw error;
@@ -4522,7 +4600,7 @@ async function handlePageRequestInternal(options) {
       const reqLogger = getRequestLogger(req);
       reqLogger.error("SSR shell error", err, { route: matched?.route?.pattern || "unknown" });
       if (!res.headersSent && errorPage) {
-        renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot);
+        renderErrorPageWithStream(errorPage, req, res, err, routeChunks, theme, projectRoot, env);
       } else if (!res.headersSent) {
         res.statusCode = 500;
         res.setHeader("Content-Type", "text/html; charset=utf-8");
@@ -4540,7 +4618,7 @@ async function handlePageRequestInternal(options) {
     abort();
   });
 }
-async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot) {
+async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks, theme, projectRoot, env = "dev") {
   try {
     const isDataReq = isDataRequest(req);
     const ctx = {
@@ -4569,9 +4647,9 @@ async function renderErrorPageWithStream(errorPage, req, res, error, routeChunks
       return;
     }
     const appTree = buildAppTree(errorPage, { error: String(error) }, initialData.props);
-    const clientJsPath = projectRoot ? getClientJsPath(projectRoot) : "/static/client.js";
-    const clientCssPath = projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
-    const assetManifest = projectRoot ? loadAssetManifest(projectRoot) : null;
+    const clientJsPath = env === "dev" ? "/static/client.js" : projectRoot ? getClientJsPath(projectRoot) : "/static/client.js";
+    const clientCssPath = env === "dev" ? "/static/client.css" : projectRoot ? getClientCssPath(projectRoot) : "/static/client.css";
+    const assetManifest = env === "prod" && projectRoot ? loadAssetManifest(projectRoot) : null;
     const chunkName = routeChunks[ERROR_CHUNK_KEY];
     let chunkHref = null;
     if (chunkName != null) {