@noego/forge 0.0.22 → 0.0.24

package/dist-ssr/server.js

@@ -146,7 +146,46 @@ class BaseHTMLRender {
   }
   async renderHTML(data) {
     const template = Handlebars.compile(await this.getTemplate());
-    return template(data);
+    let html = template(data);
+    const configJson = process.env.NOEGO_CONFIGURATION;
+    if (configJson) {
+      const configScript = `<script>window.__CONFIGURATION__ = ${configJson};<\/script>`;
+      if (html.includes("</head>")) {
+        html = html.replace("</head>", `${configScript}
+</head>`);
+      } else if (html.includes("<body")) {
+        html = html.replace(/(<body[^>]*>)/, `$1
+${configScript}`);
+      } else {
+        html = configScript + "\n" + html;
+      }
+    }
+    html = html.replace(
+      /<script\s+type=["']module["']\s+src=["']([^"']+)["'][^>]*><\/script>/gi,
+      (match, src) => {
+        return `<script type="module">
+import initApp from '${src}';
+function initializeApp() {
+  if (typeof initApp === 'function' && typeof window !== 'undefined' && window.__CONFIGURATION__) {
+    const result = initApp();
+    if (result instanceof Promise) {
+      result.catch(err => console.error('Failed to initialize app:', err));
+    }
+  } else {
+    console.warn('App initialization skipped: initApp or window.__CONFIGURATION__ not available');
+  }
+}
+// Wait for DOM to be ready
+if (document.readyState === 'loading') {
+  document.addEventListener('DOMContentLoaded', initializeApp);
+} else {
+  // DOM already loaded
+  initializeApp();
+}
+<\/script>`;
+      }
+    );
+    return html;
   }
 }
 class DefaultHTMLRender extends BaseHTMLRender {
@@ -160,7 +199,46 @@ class LiveHTMLRender {
   }
   async renderHTML(data) {
     const template = Handlebars.compile(await this.getTemplate());
-    return template(data);
+    let html = template(data);
+    const configJson = process.env.NOEGO_CONFIGURATION;
+    if (configJson) {
+      const configScript = `<script>window.__CONFIGURATION__ = ${configJson};<\/script>`;
+      if (html.includes("</head>")) {
+        html = html.replace("</head>", `${configScript}
+</head>`);
+      } else if (html.includes("<body")) {
+        html = html.replace(/(<body[^>]*>)/, `$1
+${configScript}`);
+      } else {
+        html = configScript + "\n" + html;
+      }
+    }
+    html = html.replace(
+      /<script\s+type=["']module["']\s+src=["']([^"']+)["'][^>]*><\/script>/gi,
+      (match, src) => {
+        return `<script type="module">
+import initApp from '${src}';
+function initializeApp() {
+  if (typeof initApp === 'function' && typeof window !== 'undefined' && window.__CONFIGURATION__) {
+    const result = initApp();
+    if (result instanceof Promise) {
+      result.catch(err => console.error('Failed to initialize app:', err));
+    }
+  } else {
+    console.warn('App initialization skipped: initApp or window.__CONFIGURATION__ not available');
+  }
+}
+// Wait for DOM to be ready
+if (document.readyState === 'loading') {
+  document.addEventListener('DOMContentLoaded', initializeApp);
+} else {
+  // DOM already loaded
+  initializeApp();
+}
+<\/script>`;
+      }
+    );
+    return html;
   }
   async getTemplate() {
     const file_content = await fs$1.readFile(this.html_path, "utf8");
@@ -348,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;
@@ -922,8 +1009,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(`
@@ -934,6 +1031,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);
@@ -990,6 +1091,7 @@ ${e.stack}</pre>
 
             <script type='text/javascript'>
             window.__MANIFEST__ = ${JSON.stringify(manifest)}
+            console.log('[MANIFEST INJECTED]', window.__MANIFEST__);
             <\/script>
 
             <script type='text/javascript'>