@blinkk/root 3.0.4 → 3.0.6

package/dist/{chunk-URG2INLL.js → chunk-3EFECH2D.js}

@@ -1,10 +1,9 @@
 import {
   RouteTrie,
-  htmlMinify,
-  htmlPretty,
   isValidTagName,
-  parseTagNames
-} from "./chunk-6P3B7ZXL.js";
+  parseTagNames,
+  transformHtml
+} from "./chunk-7HK6F5RQ.js";
 import {
   headersMiddleware,
   rootProjectMiddleware,
@@ -267,7 +266,7 @@ var BuildAssetMap = class _BuildAssetMap {
     }
     return result;
   }
-  static fromViteManifest(rootConfig, clientManifest, elementsGraph) {
+  static fromViteManifest(rootConfig, clientManifest, elementsGraph, podRoutes = []) {
     const assetMap = new _BuildAssetMap(rootConfig);
     const elementFiles = /* @__PURE__ */ new Set();
     Object.values(elementsGraph.sourceFiles).forEach((elementSource) => {
@@ -294,6 +293,30 @@ var BuildAssetMap = class _BuildAssetMap {
       };
       assetMap.add(new BuildAsset(assetMap, assetData));
     });
+    podRoutes.forEach((podRoute) => {
+      if (assetMap.srcToAsset.has(podRoute.src)) {
+        return;
+      }
+      const relPath = path2.relative(rootConfig.rootDir, podRoute.filePath).replace(/\\/g, "/");
+      const realPath = realPathRelativeTo(rootConfig.rootDir, relPath).replace(
+        /\\/g,
+        "/"
+      );
+      const candidateKeys = [relPath, realPath];
+      for (const key of candidateKeys) {
+        const asset = assetMap.srcToAsset.get(key);
+        if (asset) {
+          assetMap.add(
+            new BuildAsset(assetMap, {
+              ...asset.toJson(),
+              src: podRoute.src,
+              assetUrl: ""
+            })
+          );
+          break;
+        }
+      }
+    });
     return assetMap;
   }
   static fromRootManifest(rootConfig, rootManifest) {
@@ -634,10 +657,17 @@ async function build(rootProjectDir, options) {
       clientManifest[manifestKey] = asset;
     }
   });
+  const podRoutes = pods.flatMap(
+    (pod) => pod.routeFiles.map((route) => ({
+      src: `pod/${pod.name}/${route.relPath}`,
+      filePath: route.filePath
+    }))
+  );
   const assetMap = BuildAssetMap.fromViteManifest(
     rootConfig,
     clientManifest,
-    elementGraph
+    elementGraph,
+    podRoutes
   );
   const rootManifest = assetMap.toJson();
   await writeFile(
@@ -753,7 +783,7 @@ async function build(rootProjectDir, options) {
             const outFilePath2 = urlPath.slice(1);
             const outPath2 = path3.join(buildDir, outFilePath2);
             await makeDir(path3.dirname(outPath2));
-            await writeFile(outPath2, body);
+            await writeFile(outPath2, normalizeLineEndings(body));
             printFileOutput(fileSize(outPath2), "dist/html/", outFilePath2);
             return;
           }
@@ -785,13 +815,8 @@ async function build(rootProjectDir, options) {
               });
             }
           }
-          let html = data.html || "";
-          if (rootConfig.prettyHtml) {
-            html = await htmlPretty(html, rootConfig.prettyHtmlOptions);
-          } else if (rootConfig.minifyHtml) {
-            html = await htmlMinify(html, rootConfig.minifyHtmlOptions);
-          }
-          await writeFile(outPath, html);
+          const html = await transformHtml(data.html || "", rootConfig);
+          await writeFile(outPath, normalizeLineEndings(html));
           printFileOutput(fileSize(outPath), "dist/html/", outFilePath);
         } catch (e) {
           logBuildError(
@@ -892,6 +917,9 @@ function formatParams(params) {
     return `  ${key}: ${value}`;
   }).join("\n");
 }
+function normalizeLineEndings(str) {
+  return str.replace(/\r\n?/g, "\n");
+}
 
 // src/cli/codegen.ts
 import { promises as fs3 } from "node:fs";
@@ -2441,7 +2469,8 @@ function printPushResult(result, rootDir, manifestFilePath) {
   console.log();
 }
 async function ensureRootGitignored(rootDir) {
-  const gitignore = path10.join(rootDir, ".gitignore");
+  const gitRoot = await gitToplevel(rootDir) ?? rootDir;
+  const gitignore = path10.join(gitRoot, ".gitignore");
   let content = "";
   try {
     content = await fs8.promises.readFile(gitignore, "utf8");
@@ -2464,6 +2493,27 @@ async function warnIfEnvNotIgnored(rootDir) {
     );
   }
 }
+function gitToplevel(rootDir) {
+  return new Promise((resolve) => {
+    try {
+      const child = spawn3("git", ["rev-parse", "--show-toplevel"], {
+        cwd: rootDir
+      });
+      let stdout = "";
+      child.stdout.setEncoding("utf8");
+      child.stdout.on("data", (chunk) => {
+        stdout += chunk;
+      });
+      child.on("error", () => resolve(void 0));
+      child.on("close", (code) => {
+        const toplevel = stdout.trim();
+        resolve(code === 0 && toplevel ? toplevel : void 0);
+      });
+    } catch {
+      resolve(void 0);
+    }
+  });
+}
 function isPathGitIgnored(rootDir, relPath) {
   return new Promise((resolve) => {
     try {
@@ -3529,4 +3579,4 @@ export {
   createProdServer,
   CliRunner
 };
-//# sourceMappingURL=chunk-URG2INLL.js.map
+//# sourceMappingURL=chunk-3EFECH2D.js.map