@taujs/server 0.5.6 → 0.5.7

package/dist/index.js

@@ -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,7 +1348,7 @@ 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}`;
 };
@@ -1356,10 +1356,25 @@ var addNonceToInlineScripts = (html, nonce) => {
   if (!nonce) return html;
   return html.replace(/<script(?![^>]*\bnonce=)([^>]*)>/g, `<script nonce="${nonce}"$1>`);
 };
-function extractHeadInner(html) {
+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 = () => ({
@@ -1867,18 +1882,14 @@ var handleNotFound = async (req, reply, processedConfigs, maps, opts = {}) => {
     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, "");
+      processedTemplate = stripDevClientAndStyles(processedTemplate);
       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>`);
+      processedTemplate = await applyViteTransform(processedTemplate, url, viteDevServer);
+      if (cspNonce) processedTemplate = addNonceToInlineScripts(processedTemplate, cspNonce);
     } 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>`);
+      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;
@@ -1939,8 +1950,7 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
     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);
@@ -1953,9 +1963,9 @@ var handleRender = async (req, reply, routeMatchers, processedConfigs, serviceRe
           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>`);
+          if (cspNonce) devHead = addNonceToInlineScripts(devHead, cspNonce);
         } else {
-          template = await viteDevServer.transformIndexHtml(url, template);
+          template = await applyViteTransform(template, url, viteDevServer);
           if (cspNonce) template = addNonceToInlineScripts(template, cspNonce);
         }
       } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taujs/server",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "τjs [ taujs ]",
   "author": "John Smith | Aoede <taujs@aoede.uk.net> (https://www.aoede.uk.net)",
   "license": "MIT",