@taujs/server 0.5.5 → 0.5.7

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"
 };
@@ -1249,7 +1249,7 @@ import { pathToFileURL } from "url";
 
 // src/utils/Templates.ts
 var CSS_LANGS_RE = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
-async function collectStyle(server, entries) {
+var collectStyle = async (server, entries) => {
   const urls = await collectStyleUrls(server, entries);
   const codes = await Promise.all(
     urls.map(async (url) => {
@@ -1258,7 +1258,7 @@ async function collectStyle(server, entries) {
     })
   );
   return codes.flat().filter(Boolean).join("\n\n");
-}
+};
 async function collectStyleUrls(server, entries) {
   const visited = /* @__PURE__ */ new Set();
   async function traverse(url) {
@@ -1273,7 +1273,7 @@ async function collectStyleUrls(server, entries) {
   await Promise.all(entries.map((url) => traverse(url)));
   return [...visited].filter((url) => url.match(CSS_LANGS_RE));
 }
-function renderPreloadLinks(ssrManifest, basePath = "") {
+var renderPreloadLinks = (ssrManifest, basePath = "") => {
   const seen = /* @__PURE__ */ new Set();
   let links = "";
   for (const moduleId in ssrManifest) {
@@ -1288,8 +1288,8 @@ function renderPreloadLinks(ssrManifest, basePath = "") {
     }
   }
   return links;
-}
-function renderPreloadLink(file) {
+};
+var renderPreloadLink = (file) => {
   const fileType = file.match(/\.(js|css|woff2?|gif|jpe?g|png|svg)$/)?.[1];
   switch (fileType) {
     case "js":
@@ -1309,8 +1309,8 @@ function renderPreloadLink(file) {
     default:
       return "";
   }
-}
-function getCssLinks(manifest, basePath = "") {
+};
+var getCssLinks = (manifest, basePath = "") => {
   const seen = /* @__PURE__ */ new Set();
   const styles = [];
   for (const key in manifest) {
@@ -1325,7 +1325,7 @@ function getCssLinks(manifest, basePath = "") {
     }
   }
   return styles.join("\n");
-}
+};
 var overrideCSSHMRConsoleError = () => {
   const originalConsoleError = console.error;
   console.error = function(message, ...optionalParams) {
@@ -1337,7 +1337,7 @@ var ensureNonNull = (value, errorMessage) => {
   if (value === void 0 || value === null) throw new Error(errorMessage);
   return value;
 };
-function processTemplate(template) {
+var processTemplate = (template) => {
   const [headSplit, bodySplit] = template.split(SSRTAG.ssrHead);
   if (typeof bodySplit === "undefined") throw new Error(`Template is missing ${SSRTAG.ssrHead} marker.`);
   const [beforeBody, afterBody] = bodySplit.split(SSRTAG.ssrHtml);
@@ -1348,10 +1348,33 @@ function processTemplate(template) {
     beforeBody: beforeBody.replace(/\s*$/, ""),
     afterBody: afterBody.replace(/^\s*/, "")
   };
-}
+};
 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>`);
+};
+var stripDevClientAndStyles = (template) => {
+  return template.replace(/<script type="module" src="\/@vite\/client"><\/script>/g, "").replace(/<style type="text\/css">[\s\S]*?<\/style>/g, "");
+};
+var applyViteTransform = async (template, url, viteDevServer) => {
+  return viteDevServer.transformIndexHtml(url, template);
+};
+var injectBootstrapModule = (template, bootstrapModule, nonce) => {
+  if (!bootstrapModule) return template;
+  const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
+  return template.replace("</body>", `<script${nonceAttr} type="module" src="${bootstrapModule}" defer></script></body>`);
+};
+var injectCssLink = (template, cssLink) => {
+  if (!cssLink) return template;
+  return template.replace("</head>", `${cssLink}</head>`);
+};
+var extractHeadInner = (html) => {
+  const m = html.match(/<head[^>]*>([\s\S]*?)<\/head>/i);
+  return (m?.[1] ?? "").trim();
+};
 
 // src/utils/AssetManager.ts
 var createMaps = () => ({
@@ -1833,6 +1856,53 @@ 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 = stripDevClientAndStyles(processedTemplate);
+      const url = req.url ? new URL(req.url, `http://${req.headers.host}`).pathname : "/";
+      processedTemplate = await applyViteTransform(processedTemplate, url, viteDevServer);
+      if (cspNonce) processedTemplate = addNonceToInlineScripts(processedTemplate, cspNonce);
+    } else if (!isDevelopment && cssLink) {
+      processedTemplate = injectCssLink(processedTemplate, cssLink);
+    }
+    processedTemplate = injectBootstrapModule(processedTemplate, bootstrapModule, cspNonce);
+    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 +1919,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,11 +1946,11 @@ 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 {
-        template = template.replace(/<script type="module" src="\/@vite\/client"><\/script>/g, "");
-        template = template.replace(/<style type="text\/css">[\s\S]*?<\/style>/g, "");
+        template = stripDevClientAndStyles(template);
         const entryServerFile = resolveEntryFile(clientRoot, entryServer);
         const entryServerPath = path5.join(clientRoot, entryServerFile);
         const executedModule = await viteDevServer.ssrLoadModule(entryServerPath);
@@ -1889,7 +1958,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 = addNonceToInlineScripts(devHead, cspNonce);
+        } else {
+          template = await applyViteTransform(template, url, viteDevServer);
+          if (cspNonce) template = addNonceToInlineScripts(template, cspNonce);
+        }
       } catch (error) {
         throw AppError.internal("Failed to load dev assets", { cause: error, details: { clientRoot, entryServer, url } });
       }
@@ -2031,7 +2109,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,60 +2186,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/utils/StaticAssets.ts
 function normaliseStaticAssets(reg) {
   if (!reg) return [];
@@ -2288,7 +2314,8 @@ var SSRServer = fp3(
         },
         {
           debug: opts.debug,
-          logger
+          logger,
+          viteDevServer
         }
       );
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.5.5",
+  "version": "0.5.7",
   "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",