@noego/forge 0.0.23 → 0.0.25

package/dist-ssr/server.js

@@ -426,7 +426,16 @@ class ManifestBuilder {
   }
 }
 async function requires_server(route, loader) {
-  return await layout_requires_server(route, loader) || await view_requires_server(route, loader);
+  const has_middleware = route.middleware && route.middleware.length > 0;
+  const has_loaders = await layout_requires_server(route, loader) || await view_requires_server(route, loader);
+  const requires_server2 = has_middleware || has_loaders;
+  console.log("[MANIFEST]", route.path, {
+    has_middleware,
+    middleware: route.middleware,
+    has_loaders,
+    requires_server: requires_server2
+  });
+  return requires_server2;
 }
 async function layout_requires_server(route, loader) {
   const layout = route.layout;
@@ -657,16 +666,21 @@ class ComponentManager {
         continue;
       }
       try {
+        console.log(`[ComponentManager] Trying loader path: ${loaderFilePath}`);
         const module = await import(pathToFileURL(loaderFilePath).href);
         const loader = module == null ? void 0 : module.default;
+        console.log(`[ComponentManager] Imported loader module: default=${typeof loader}`);
         if (typeof loader === "function") {
+          console.log(`[ComponentManager] Loaded loader function from: ${loaderFilePath}`);
           return loader;
         }
       } catch (error) {
-        if ((error == null ? void 0 : error.code) === "MODULE_NOT_FOUND" || (error == null ? void 0 : error.code) === "ERR_MODULE_NOT_FOUND") {
+        const code = (error == null ? void 0 : error.code) || (error == null ? void 0 : error.name) || "UNKNOWN_ERROR";
+        if (code === "MODULE_NOT_FOUND" || code === "ERR_MODULE_NOT_FOUND") {
+          console.warn(`[ComponentManager] Loader not found at ${loaderFilePath} (${ext}): ${(error == null ? void 0 : error.message) || code}`);
           continue;
         }
-        console.error(`[ComponentManager] Failed to load loader for ${componentPath} (${ext}):`, error);
+        console.error(`[ComponentManager] Failed to load loader for ${componentPath} (${ext}) at ${loaderFilePath}:`, error);
       }
     }
     return null;
@@ -1000,8 +1014,18 @@ class ExpressServerAdapter extends ServerAdapter {
       body: req.body,
       context
     };
+    console.log("[SERVER] Handling request", req.url, {
+      middleware: route.middleware,
+      accept: req.headers.accept,
+      route_path: route.path,
+      server_api_call
+    });
     try {
       await this.middleware_adapter.handleMiddleware(req, res, route.middleware || []);
+      console.log("[SERVER] Middleware complete", {
+        headersSent: res.headersSent,
+        statusCode: res.statusCode
+      });
     } catch (e) {
       console.log("Error in middleware", e);
       res.status(500).send(`
@@ -1012,6 +1036,10 @@ ${e.stack}</pre>
             `);
       return;
     }
+    if (res.headersSent) {
+      console.log("[SERVER] Headers already sent by middleware, returning early");
+      return;
+    }
     let server_data = await this.api_adapter.getApiData(route, request_data);
     if (server_api_call) {
       res.header("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate").header("Pragma", "no-cache").header("Expires", "0").type("application/json").send(server_data);
@@ -1060,7 +1088,27 @@ ${e.stack}</pre>
       });
       const body_render = renderedHtml;
       console.log("[SSR DEBUG] render result - body length:", (body_render == null ? void 0 : body_render.length) || 0);
-      const clientComponentDir = this.isProd ? "assets" : this.componentDir;
+      const deriveClientBase = (dir) => {
+        try {
+          const norm = String(dir || "").replace(/\\/g, "/");
+          const marker = "/ssr/";
+          const idx = norm.indexOf(marker);
+          if (idx >= 0) {
+            const suffix = norm.slice(idx + marker.length).replace(/^\/+/, "");
+            return suffix ? `/assets/${suffix}` : "/assets";
+          }
+          for (const hint of ["/components", "/pages"]) {
+            const hIdx = norm.indexOf(hint);
+            if (hIdx >= 0) {
+              const suffix = norm.slice(hIdx + 1).replace(/^\/+/, "");
+              return suffix ? `/assets/${suffix}` : "/assets";
+            }
+          }
+        } catch {
+        }
+        return "/assets";
+      };
+      const clientComponentDir = this.isProd ? deriveClientBase(this.componentDir || "") : this.componentDir || "/assets";
       const head_routing = `
             <script type='text/javascript'>
             window.__ROUTING__ = ${JSON.stringify(this.clientRoutes)}
@@ -1068,6 +1116,7 @@ ${e.stack}</pre>
 
             <script type='text/javascript'>
             window.__MANIFEST__ = ${JSON.stringify(manifest)}
+            console.log('[MANIFEST INJECTED]', window.__MANIFEST__);
             <\/script>
 
             <script type='text/javascript'>
@@ -1200,8 +1249,6 @@ async function createServer(app, options) {
   let componentLoader;
   let vite;
   console.log(`Serving components from ${COMPONENT_DIR}`);
-  const rendererFullPath = typeof full_options.renderer === "string" && full_options.renderer !== "default" ? ensureFullPath(root, full_options.renderer) : ensureFullPath(root, "index.html");
-  path.dirname(rendererFullPath);
   const resolveAssetRoot = (entry) => {
     if (typeof entry === "function") {
       return entry;