@taujs/server 0.5.4 → 0.5.6

package/dist/index.js

@@ -304,7 +304,7 @@ var SSRTAG = {
   ssrHtml: "<!--ssr-html-->"
 };
 var TEMPLATE = {
-  defaultEntryClient: "entry-client",
+  defaultEntryClient: "entry-client.tsx",
   defaultEntryServer: "entry-server",
   defaultHtmlTemplate: "index.html"
 };
@@ -1352,6 +1352,14 @@ function processTemplate(template) {
 var rebuildTemplate = (parts, headContent, bodyContent) => {
   return `${parts.beforeHead}${headContent}${parts.afterHead}${parts.beforeBody}${bodyContent}${parts.afterBody}`;
 };
+var addNonceToInlineScripts = (html, nonce) => {
+  if (!nonce) return html;
+  return html.replace(/<script(?![^>]*\bnonce=)([^>]*)>/g, `<script nonce="${nonce}"$1>`);
+};
+function extractHeadInner(html) {
+  const m = html.match(/<head[^>]*>([\s\S]*?)<\/head>/i);
+  return (m?.[1] ?? "").trim();
+}
 
 // src/utils/AssetManager.ts
 var createMaps = () => ({
@@ -1833,6 +1841,57 @@ function createRequestContext(req, reply, baseLogger) {
   return { traceId, logger, headers };
 }
 
+// src/utils/HandleNotFound.ts
+var handleNotFound = async (req, reply, processedConfigs, maps, opts = {}) => {
+  const { viteDevServer } = opts;
+  const logger = opts.logger ?? createLogger({
+    debug: opts.debug,
+    context: { component: "handle-not-found", url: req.url, method: req.method, traceId: req.id }
+  });
+  try {
+    if (/\.\w+$/.test(req.raw.url ?? "")) {
+      logger.debug?.("ssr", { url: req.raw.url }, "Delegating asset-like request to Fastify notFound handler");
+      return reply.callNotFound();
+    }
+    const defaultConfig = processedConfigs[0];
+    if (!defaultConfig) {
+      logger.error?.({ configCount: processedConfigs.length, url: req.raw.url }, "No default configuration found");
+      throw AppError.internal("No default configuration found", {
+        details: { configCount: processedConfigs.length, url: req.raw.url }
+      });
+    }
+    const { clientRoot } = defaultConfig;
+    const cspNonce = req.cspNonce ?? void 0;
+    const template = ensureNonNull(maps.templates.get(clientRoot), `Template not found for clientRoot: ${clientRoot}`);
+    const cssLink = maps.cssLinks.get(clientRoot);
+    const bootstrapModule = maps.bootstrapModules.get(clientRoot);
+    let processedTemplate = template.replace(SSRTAG.ssrHead, "").replace(SSRTAG.ssrHtml, "");
+    if (isDevelopment && viteDevServer) {
+      processedTemplate = processedTemplate.replace(/<script type="module" src="\/@vite\/client"><\/script>/g, "");
+      processedTemplate = processedTemplate.replace(/<style type="text\/css">[\s\S]*?<\/style>/g, "");
+      const url = req.url ? new URL(req.url, `http://${req.headers.host}`).pathname : "/";
+      processedTemplate = await viteDevServer.transformIndexHtml(url, processedTemplate);
+      if (cspNonce) processedTemplate = processedTemplate.replace(/<script(?![^>]*\bnonce=)([^>]*)>/g, `<script nonce="${cspNonce}"$1>`);
+    } else if (!isDevelopment && cssLink) {
+      processedTemplate = processedTemplate.replace("</head>", `${cssLink}</head>`);
+    }
+    if (bootstrapModule) {
+      const nonceAttr = cspNonce ? ` nonce="${cspNonce}"` : "";
+      processedTemplate = processedTemplate.replace("</body>", `<script${nonceAttr} type="module" src="${bootstrapModule}" defer></script></body>`);
+    }
+    logger.debug?.("ssr", { status: 200 }, "Sending not-found fallback HTML");
+    const result = reply.status(200).type("text/html").send(processedTemplate);
+    return result;
+  } catch (err) {
+    logger.error?.({ error: err, url: req.url, clientRoot: processedConfigs[0]?.clientRoot }, "handleNotFound failed");
+    throw AppError.internal("handleNotFound failed", err, {
+      stage: "handleNotFound",
+      url: req.url,
+      clientRoot: processedConfigs[0]?.clientRoot
+    });
+  }
+};
+
 // src/utils/HandleRender.ts
 var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRegistry, maps, opts = {}) => {
   const { viteDevServer } = opts;
@@ -1849,8 +1908,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
     const rawNonce = req.cspNonce;
     const cspNonce = rawNonce && rawNonce.length > 0 ? rawNonce : void 0;
     if (!matchedRoute) {
-      reply.callNotFound();
-      return;
+      return reply.callNotFound();
     }
     const { route, params } = matchedRoute;
     const { attr, appId } = route;
@@ -1877,6 +1935,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
     const manifest = maps.manifests.get(clientRoot);
     const preloadLink = maps.preloadLinks.get(clientRoot);
     const ssrManifest = maps.ssrManifests.get(clientRoot);
+    let devHead = "";
     let renderModule;
     if (isDevelopment && viteDevServer) {
       try {
@@ -1889,7 +1948,16 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
         const styles = await collectStyle(viteDevServer, [entryServerPath]);
         const styleNonce = cspNonce ? ` nonce="${cspNonce}"` : "";
         template = template?.replace("</head>", `<style type="text/css"${styleNonce}>${styles}</style></head>`);
-        template = await viteDevServer.transformIndexHtml(url, template);
+        const isStreaming = attr?.render === RENDERTYPE.streaming;
+        if (isStreaming) {
+          const stub = "<!doctype html><html><head></head><body></body></html>";
+          const transformed = await viteDevServer.transformIndexHtml(url, stub);
+          devHead = extractHeadInner(transformed);
+          if (cspNonce) devHead = devHead.replace(/<script(?![^>]*\bnonce=)([^>]*)>/g, `<script nonce="${cspNonce}"$1>`);
+        } else {
+          template = await viteDevServer.transformIndexHtml(url, template);
+          if (cspNonce) template = addNonceToInlineScripts(template, cspNonce);
+        }
       } catch (error) {
         throw AppError.internal("Failed to load dev assets", { cause: error, details: { clientRoot, entryServer, url } });
       }
@@ -2031,7 +2099,9 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
         writable,
         {
           onHead: (headContent) => {
-            let aggregateHeadContent = headContent;
+            let aggregateHeadContent = "";
+            if (devHead) aggregateHeadContent += devHead;
+            aggregateHeadContent += headContent;
             if (ssrManifest && preloadLink) aggregateHeadContent += preloadLink;
             if (manifest && cssLink) aggregateHeadContent += cssLink;
             reply.raw.write(`${templateParts.beforeHead}${aggregateHeadContent}${templateParts.afterHead}${templateParts.beforeBody}`);
@@ -2106,86 +2176,6 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
   }
 };
 
-// src/utils/HandleNotFound.ts
-var handleNotFound = async (req, reply, processedConfigs, maps, opts = {}) => {
-  const logger = opts.logger ?? createLogger({
-    debug: opts.debug,
-    context: { component: "handle-not-found", url: req.url, method: req.method, traceId: req.id }
-  });
-  try {
-    if (/\.\w+$/.test(req.raw.url ?? "")) {
-      logger.debug?.("ssr", { url: req.raw.url }, "Delegating asset-like request to Fastify notFound handler");
-      return reply.callNotFound();
-    }
-    const defaultConfig = processedConfigs[0];
-    if (!defaultConfig) {
-      logger.error?.({ configCount: processedConfigs.length, url: req.raw.url }, "No default configuration found");
-      throw AppError.internal("No default configuration found", {
-        details: { configCount: processedConfigs.length, url: req.raw.url }
-      });
-    }
-    const { clientRoot } = defaultConfig;
-    const cspNonce = req.cspNonce ?? void 0;
-    const template = ensureNonNull(maps.templates.get(clientRoot), `Template not found for clientRoot: ${clientRoot}`);
-    const cssLink = maps.cssLinks.get(clientRoot);
-    const bootstrapModule = maps.bootstrapModules.get(clientRoot);
-    logger.debug?.(
-      "ssr",
-      {
-        clientRoot,
-        hasCssLink: !!cssLink,
-        hasBootstrapModule: !!bootstrapModule,
-        isDevelopment,
-        hasCspNonce: !!cspNonce
-      },
-      "Preparing not-found fallback HTML"
-    );
-    let processedTemplate = template.replace(SSRTAG.ssrHead, "").replace(SSRTAG.ssrHtml, "");
-    if (!isDevelopment && cssLink) {
-      processedTemplate = processedTemplate.replace("</head>", `${cssLink}</head>`);
-    }
-    if (bootstrapModule) {
-      const nonceAttr = cspNonce ? ` nonce="${cspNonce}"` : "";
-      processedTemplate = processedTemplate.replace("</body>", `<script${nonceAttr} type="module" src="${bootstrapModule}" defer></script></body>`);
-    }
-    logger.debug?.("ssr", { status: 200 }, "Sending not-found fallback HTML");
-    return reply.status(200).type("text/html").send(processedTemplate);
-  } catch (err) {
-    logger.error?.({ error: err, url: req.url, clientRoot: processedConfigs[0]?.clientRoot }, "handleNotFound failed");
-    throw AppError.internal("handleNotFound failed", err, {
-      stage: "handleNotFound",
-      url: req.url,
-      clientRoot: processedConfigs[0]?.clientRoot
-    });
-  }
-};
-
-// src/core/routes/ResolveRouteData.ts
-async function resolveRouteDataCore(url, opts) {
-  const match2 = matchRoute(url, opts.routeMatchers);
-  if (!match2) {
-    throw AppError.notFound("route_not_found", { details: { url } });
-  }
-  const { route, params } = match2;
-  if (!route.attr?.data) {
-    throw AppError.notFound("no_data_handler", {
-      details: { url, path: route.path, appId: route.appId }
-    });
-  }
-  const ctx = opts.getCtx();
-  return fetchInitialData(route.attr, params, opts.serviceRegistry, ctx);
-}
-
-// src/utils/ResolveRouteData.ts
-async function resolveRouteData(url, opts) {
-  const { req, reply, routeMatchers, serviceRegistry, logger } = opts;
-  return resolveRouteDataCore(url, {
-    routeMatchers,
-    serviceRegistry,
-    getCtx: () => createRequestContext(req, reply, logger)
-  });
-}
-
 // src/utils/StaticAssets.ts
 function normaliseStaticAssets(reg) {
   if (!reg) return [];
@@ -2295,23 +2285,6 @@ var SSRServer = fp3(
       viteDevServer = await setupDevServer(app, clientRoot, alias, opts.debug, opts.devNet, plugins);
     }
     app.addHook("onRequest", createAuthHook(routeMatchers, logger));
-    app.get("/__taujs/route", async (req, reply) => {
-      const query = req.query;
-      const url = typeof query.url === "string" ? query.url : "";
-      if (!url) {
-        throw AppError.badRequest("url query param required", {
-          details: { query }
-        });
-      }
-      const data = await resolveRouteData(url, {
-        req,
-        reply,
-        routeMatchers,
-        serviceRegistry,
-        logger
-      });
-      return reply.status(200).send({ data });
-    });
     app.get("/*", async (req, reply) => {
       await handleRender(req, reply, routeMatchers, processedConfigs, serviceRegistry, maps, {
         debug: opts.debug,
@@ -2331,7 +2304,8 @@ var SSRServer = fp3(
         },
         {
           debug: opts.debug,
-          logger
+          logger,
+          viteDevServer
         }
       );
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",
@@ -48,7 +48,7 @@
     "fastify": "^5.6.1",
     "fastify-plugin": "^5.1.0",
     "path-to-regexp": "^8.1.0",
-    "vite": "^7.1.11"
+    "vite": "^7.3.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.15.4",
@@ -66,7 +66,7 @@
   "peerDependencies": {
     "fastify": "^5.6.1",
     "typescript": "^5.5.4",
-    "vite": "^7.1.11"
+    "vite": "^7.3.1"
   },
   "scripts": {
     "build": "tsup",