@noego/forge 0.0.24 → 0.0.26

package/dist-ssr/server.js

@@ -8,6 +8,7 @@ import deepmerge from "deepmerge";
 import { pathToFileURL } from "url";
 import Handlebars from "handlebars";
 import fs$1 from "fs/promises";
+import { stringify } from "devalue";
 import yaml from "js-yaml";
 import "clone-deep";
 import join from "url-join";
@@ -149,22 +150,29 @@ class BaseHTMLRender {
     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}
+      try {
+        const configData = JSON.parse(configJson);
+        const safeConfigJson = stringify(configData);
+        const configScript = `<script>window.__CONFIGURATION__ = ${safeConfigJson};<\/script>`;
+        if (html.includes("</head>")) {
+          html = html.replace("</head>", `${configScript}
 </head>`);
-      } else if (html.includes("<body")) {
-        html = html.replace(/(<body[^>]*>)/, `$1
+        } else if (html.includes("<body")) {
+          html = html.replace(/(<body[^>]*>)/, `$1
 ${configScript}`);
-      } else {
-        html = configScript + "\n" + html;
+        } else {
+          html = configScript + "\n" + html;
+        }
+      } catch (e) {
+        console.error("Failed to parse NOEGO_CONFIGURATION:", e);
       }
     }
     html = html.replace(
       /<script\s+type=["']module["']\s+src=["']([^"']+)["'][^>]*><\/script>/gi,
-      (match, src) => {
+      (_match, src) => {
+        const safeSrc = src.replace(/'/g, "\\'");
         return `<script type="module">
-import initApp from '${src}';
+import initApp from '${safeSrc}';
 function initializeApp() {
   if (typeof initApp === 'function' && typeof window !== 'undefined' && window.__CONFIGURATION__) {
     const result = initApp();
@@ -202,22 +210,29 @@ class LiveHTMLRender {
     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}
+      try {
+        const configData = JSON.parse(configJson);
+        const safeConfigJson = stringify(configData);
+        const configScript = `<script>window.__CONFIGURATION__ = ${safeConfigJson};<\/script>`;
+        if (html.includes("</head>")) {
+          html = html.replace("</head>", `${configScript}
 </head>`);
-      } else if (html.includes("<body")) {
-        html = html.replace(/(<body[^>]*>)/, `$1
+        } else if (html.includes("<body")) {
+          html = html.replace(/(<body[^>]*>)/, `$1
 ${configScript}`);
-      } else {
-        html = configScript + "\n" + html;
+        } else {
+          html = configScript + "\n" + html;
+        }
+      } catch (e) {
+        console.error("Failed to parse NOEGO_CONFIGURATION:", e);
       }
     }
     html = html.replace(
       /<script\s+type=["']module["']\s+src=["']([^"']+)["'][^>]*><\/script>/gi,
-      (match, src) => {
+      (_match, src) => {
+        const safeSrc = src.replace(/'/g, "\\'");
         return `<script type="module">
-import initApp from '${src}';
+import initApp from '${safeSrc}';
 function initializeApp() {
   if (typeof initApp === 'function' && typeof window !== 'undefined' && window.__CONFIGURATION__) {
     const result = initApp();
@@ -666,16 +681,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;
@@ -1083,23 +1103,43 @@ ${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)}
+            window.__ROUTING__ = ${stringify(this.clientRoutes)}
             <\/script>
 
             <script type='text/javascript'>
-            window.__MANIFEST__ = ${JSON.stringify(manifest)}
+            window.__MANIFEST__ = ${stringify(manifest)}
             console.log('[MANIFEST INJECTED]', window.__MANIFEST__);
             <\/script>
 
             <script type='text/javascript'>
-            window.__INITIAL_DATA__ = ${JSON.stringify(server_data || {}).trim()}
+            window.__INITIAL_DATA__ = ${stringify(server_data || {})}
             <\/script>
 
             <script type='text/javascript'>
-            window.__COMPONENT_DIR__ = ${JSON.stringify(clientComponentDir)}
+            window.__COMPONENT_DIR__ = ${stringify(clientComponentDir)}
             <\/script>
             `;
       console.log("[SSR DEBUG] About to render HTML with APP length:", (body_render == null ? void 0 : body_render.length) || 0);
@@ -1224,8 +1264,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;