vite-plugin-kiru 0.29.6 → 0.29.8

package/README.md

@@ -48,7 +48,7 @@ kiru({
   app: {
     baseUrl: "/", // Base URL for the app
     dir: "src/pages", // Directory containing pages
-    document: "document.tsx", // Document component file
+    document: "document.{tsx,jsx}", // Document component file
     page: "index.{tsx,jsx}", // Page component pattern
     layout: "layout.{tsx,jsx}", // Layout component pattern
   },

package/dist/index.d.ts

@@ -23,7 +23,7 @@ export interface SSGOptions {
   dir?: string
   /**
    * The name of the document component
-   * @default "document.tsx"
+   * @default "document.{tsx,jsx}"
    */
   document?: string
   /**
@@ -100,7 +100,7 @@ export interface KiruPluginOptions {
    * ```ts
    * ssg: {
    *   dir: "./src/app",
-   *   document: "document.tsx",
+   *   document: "document.{tsx,jsx}",
    *   page: "index.{tsx,jsx}",
    *   layout: "layout.{tsx,jsx}",
    *   transition: true

package/dist/index.js

@@ -1716,7 +1716,7 @@ var require_magic_string_cjs = __commonJS({
 });
 
 // src/index.ts
-import path7 from "node:path";
+import path6 from "node:path";
 
 // src/codegen/shared.ts
 var import_magic_string = __toESM(require_magic_string_cjs(), 1);
@@ -2171,19 +2171,50 @@ function tEntries(obj) {
 // src/config.ts
 import path2 from "node:path";
 
-// src/virtual-modules.ts
+// src/utils.ts
 import path from "node:path";
-import fs2 from "node:fs";
+function createLogger(state) {
+  return (...data) => {
+    if (!state.loggingEnabled) return;
+    console.log(ANSI.cyan("[vite-plugin-kiru]"), ...data);
+  };
+}
+async function resolveUserDocument(projectRoot, ssgOptions) {
+  const { dir, document } = ssgOptions;
+  const fp = path.resolve(projectRoot, dir, document);
+  const { globSync } = await import("node:fs");
+  const res = globSync(fp);
+  if (res.length) return res[0].replace(/\\/g, "/");
+  throw new Error(`Document not found at ${fp}`);
+}
+var TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".tsx",
+  ".jsx",
+  ".ts",
+  ".js",
+  ".mjs",
+  ".mts",
+  ".md",
+  ".mdx"
+]);
+function shouldTransformFile(id, state) {
+  if (id[0] === "\0" || id.startsWith("vite:") || id.includes("/node_modules/")) {
+    return false;
+  }
+  const filePath = path.resolve(id).replace(/\\/g, "/");
+  const isIncludedByUser = state.includedPaths.some(
+    (p) => filePath.startsWith(p)
+  );
+  const isWithinProject = filePath.startsWith(state.projectRoot);
+  return (isWithinProject || isIncludedByUser) && TRANSFORMABLE_EXTENSIONS.has(path.extname(filePath));
+}
+
+// src/virtual-modules.ts
 var VIRTUAL_ROUTES_ID = "virtual:kiru:routes";
 var VIRTUAL_ENTRY_SERVER_ID = "virtual:kiru:entry-server";
 var VIRTUAL_ENTRY_CLIENT_ID = "virtual:kiru:entry-client";
-function createVirtualModules(projectRoot, ssgOptions) {
-  function resolveUserDocument2() {
-    const { dir, document } = ssgOptions;
-    const fp = path.resolve(projectRoot, dir, document);
-    if (fs2.existsSync(fp)) return fp.replace(/\\/g, "/");
-    throw new Error(`Document not found at ${fp}`);
-  }
+async function createVirtualModules(projectRoot, ssgOptions) {
+  const userDoc = await resolveUserDocument(projectRoot, ssgOptions);
   function createRoutesModule() {
     const { dir, baseUrl, page, layout, transition } = ssgOptions;
     return `
@@ -2201,7 +2232,6 @@ export { dir, baseUrl, pages, layouts, transition }
 `;
   }
   function createEntryServerModule() {
-    const userDoc = resolveUserDocument2();
     return `
 import {
   render as kiruServerRender,
@@ -2224,7 +2254,7 @@ export async function generateStaticPaths() {
     return `
 import { initClient } from "kiru/router/client"
 import { dir, baseUrl, pages, layouts, transition } from "${VIRTUAL_ROUTES_ID}"
-import "${resolveUserDocument2()}"
+import "${userDoc}"
 
 initClient({ dir, baseUrl, pages, layouts, transition })
 `;
@@ -2248,7 +2278,7 @@ var defaultEsBuildOptions = {
 var defaultSSGOptions = {
   baseUrl: "/",
   dir: "src/pages",
-  document: "document.tsx",
+  document: "document.{tsx,jsx}",
   page: "index.{tsx,jsx}",
   layout: "layout.{tsx,jsx}",
   transition: false,
@@ -2257,7 +2287,7 @@ var defaultSSGOptions = {
   }
 };
 function createPluginState(opts = {}) {
-  let fileLinkFormatter = (path8, line) => `vscode://file/${path8}:${line}`;
+  let fileLinkFormatter = (path7, line) => `vscode://file/${path7}:${line}`;
   let dtClientPathname = "/__devtools__";
   if (typeof opts.devtools === "object") {
     dtClientPathname = opts.devtools.dtClientPathname ?? dtClientPathname;
@@ -3257,7 +3287,9 @@ async function handleSSR(server, url, projectRoot, resolveUserDocument2) {
     VIRTUAL_ENTRY_SERVER_ID
   );
   const moduleIds = [];
-  const documentModule = resolveUserDocument2().substring(projectRoot.length);
+  const documentModule = (await resolveUserDocument2()).substring(
+    projectRoot.length
+  );
   moduleIds.push(documentModule);
   const ctx = {
     registerModule: (moduleId) => {
@@ -3309,7 +3341,7 @@ async function handleSSR(server, url, projectRoot, resolveUserDocument2) {
 
 // src/preview-server.ts
 import { resolve } from "node:path";
-import fs3 from "node:fs";
+import fs2 from "node:fs";
 import path4 from "node:path";
 
 // ../../node_modules/.pnpm/mime@4.1.0/node_modules/mime/dist/types/other.js
@@ -4447,12 +4479,12 @@ var Mime = class {
     }
     return this;
   }
-  getType(path8) {
-    if (typeof path8 !== "string")
+  getType(path7) {
+    if (typeof path7 !== "string")
       return null;
-    const last = path8.replace(/^.*[/\\]/s, "").toLowerCase();
+    const last = path7.replace(/^.*[/\\]/s, "").toLowerCase();
     const ext = last.replace(/^.*\./s, "").toLowerCase();
-    const hasPath = last.length < path8.length;
+    const hasPath = last.length < path7.length;
     const hasDot = ext.length < last.length - 1;
     if (!hasDot && hasPath)
       return null;
@@ -4508,11 +4540,11 @@ function createPreviewMiddleware(projectRoot, baseOutDir) {
       }
       if (!path4.extname(filePath) && !url.endsWith("/")) {
         const htmlCandidate = filePath + ".html";
-        if (fs3.existsSync(htmlCandidate)) {
+        if (fs2.existsSync(htmlCandidate)) {
           filePath = htmlCandidate;
         }
       }
-      if (!fs3.existsSync(filePath)) {
+      if (!fs2.existsSync(filePath)) {
         const normalizedUrl = url.replace(/\/$/, "") || "/";
         const urlSegments = normalizedUrl.split("/").filter(Boolean);
         let found404 = false;
@@ -4523,7 +4555,7 @@ function createPreviewMiddleware(projectRoot, baseOutDir) {
             clientOutDir,
             fourOhFourPath + ".html"
           );
-          if (fs3.existsSync(fourOhFourFilePath)) {
+          if (fs2.existsSync(fourOhFourFilePath)) {
             filePath = fourOhFourFilePath;
             found404 = true;
             break;
@@ -4536,7 +4568,7 @@ function createPreviewMiddleware(projectRoot, baseOutDir) {
         }
       }
       const type = src_default.getType(filePath) ?? "application/octet-stream";
-      const content = fs3.readFileSync(filePath);
+      const content = fs2.readFileSync(filePath);
       const is404Page = filePath.includes("/404.html");
       res.statusCode = is404Page ? 404 : 200;
       res.setHeader("Content-Type", type);
@@ -4549,7 +4581,7 @@ function createPreviewMiddleware(projectRoot, baseOutDir) {
 
 // src/ssg.ts
 import path5 from "node:path";
-import fs4, { globSync } from "node:fs";
+import fs3 from "node:fs";
 import { pathToFileURL } from "node:url";
 async function generateStaticSite(state, outputOptions, bundle, log) {
   const { projectRoot, baseOutDir, manifestPath } = state;
@@ -4565,9 +4597,9 @@ async function generateStaticSite(state, outputOptions, bundle, log) {
   const { clientEntry } = await getClientAssets(clientOutDirAbs, manifestPath);
   let manifest = null;
   const clientManifestPath = path5.resolve(clientOutDirAbs, manifestPath);
-  if (fs4.existsSync(clientManifestPath)) {
+  if (fs3.existsSync(clientManifestPath)) {
     try {
-      manifest = JSON.parse(fs4.readFileSync(clientManifestPath, "utf-8"));
+      manifest = JSON.parse(fs3.readFileSync(clientManifestPath, "utf-8"));
     } catch {
     }
   }
@@ -4598,8 +4630,8 @@ async function generateStaticSite(state, outputOptions, bundle, log) {
         );
         const filePath = getOutputPath(clientOutDirAbs, route);
         log(ANSI.cyan("[SSG]"), "write:", ANSI.black(filePath));
-        fs4.mkdirSync(path5.dirname(filePath), { recursive: true });
-        fs4.writeFileSync(filePath, html, "utf-8");
+        fs3.mkdirSync(path5.dirname(filePath), { recursive: true });
+        fs3.writeFileSync(filePath, html, "utf-8");
       })
     );
   }
@@ -4609,8 +4641,8 @@ async function getClientAssets(clientOutDirAbs, manifestPath) {
   let clientEntry = null;
   try {
     const clientManifestPath = path5.resolve(clientOutDirAbs, manifestPath);
-    if (fs4.existsSync(clientManifestPath)) {
-      const manifest = JSON.parse(fs4.readFileSync(clientManifestPath, "utf-8"));
+    if (fs3.existsSync(clientManifestPath)) {
+      const manifest = JSON.parse(fs3.readFileSync(clientManifestPath, "utf-8"));
       const clientEntryKey = "virtual:kiru:entry-client";
       if (manifest[clientEntryKey]?.file) {
         clientEntry = manifest[clientEntryKey].file;
@@ -4623,44 +4655,22 @@ async function getClientAssets(clientOutDirAbs, manifestPath) {
   }
   return { clientEntry };
 }
-function collectCssForModules(manifest, moduleIds, projectRoot, log) {
+function collectCssForModules(manifest, moduleIds, projectRoot) {
   const seen = /* @__PURE__ */ new Set();
   const cssFiles = /* @__PURE__ */ new Set();
-  if (log) {
-    log(
-      ANSI.yellow("[SSG CSS]"),
-      `Collecting CSS for ${moduleIds.length} modules:`
-    );
-    moduleIds.forEach((id) => log(ANSI.yellow("[SSG CSS]"), `  - ${id}`));
-  }
   const collectCss = (key) => {
     if (seen.has(key)) return;
     seen.add(key);
     const it = manifest[key];
     if (!it) {
-      if (log)
-        log(ANSI.yellow("[SSG CSS]"), `  Key not found in manifest: ${key}`);
       return;
     }
-    if (log) {
-      log(ANSI.yellow("[SSG CSS]"), `  Processing manifest key: ${key}`);
-      if (it.css && it.css.length > 0) {
-        log(ANSI.yellow("[SSG CSS]"), `    Found CSS: ${it.css.join(", ")}`);
-      }
-      if (it.imports && it.imports.length > 0) {
-        log(
-          ANSI.yellow("[SSG CSS]"),
-          `    Found imports: ${it.imports.length} imports`
-        );
-      }
-    }
     ;
     (it.css || []).forEach((c) => cssFiles.add(c));
     (it.imports || []).forEach((imp) => collectCss(imp));
   };
   const entryClientKey = "virtual:kiru:entry-client";
   if (manifest[entryClientKey] && !seen.has(entryClientKey)) {
-    if (log) log(ANSI.yellow("[SSG CSS]"), `Including entry client CSS`);
     collectCss(entryClientKey);
   }
   for (const moduleId of moduleIds) {
@@ -4671,27 +4681,16 @@ function collectCssForModules(manifest, moduleIds, projectRoot, log) {
     if (normalizedId.startsWith("/")) {
       normalizedId = normalizedId.substring(1);
     }
-    if (log) {
-      log(ANSI.yellow("[SSG CSS]"), `Looking for module: ${moduleId}`);
-      log(ANSI.yellow("[SSG CSS]"), `  Normalized: ${normalizedId}`);
-    }
-    let found = false;
     if (manifest[normalizedId]) {
-      if (log) log(ANSI.green("[SSG CSS]"), `  \u2713 Found as: ${normalizedId}`);
       collectCss(normalizedId);
-      found = true;
       continue;
     }
     if (manifest["/" + normalizedId]) {
-      if (log) log(ANSI.green("[SSG CSS]"), `  \u2713 Found as: /${normalizedId}`);
       collectCss("/" + normalizedId);
-      found = true;
       continue;
     }
     if (manifest[moduleId]) {
-      if (log) log(ANSI.green("[SSG CSS]"), `  \u2713 Found as: ${moduleId}`);
       collectCss(moduleId);
-      found = true;
       continue;
     }
     for (const key in manifest) {
@@ -4699,43 +4698,25 @@ function collectCssForModules(manifest, moduleIds, projectRoot, log) {
       const moduleBaseName = path5.basename(normalizedId);
       const keyBaseName = path5.basename(keyNormalized);
       if ((keyNormalized.endsWith(normalizedId) || normalizedId.endsWith(keyNormalized)) && moduleBaseName === keyBaseName) {
-        if (log)
-          log(ANSI.green("[SSG CSS]"), `  \u2713 Found by basename match: ${key}`);
         collectCss(key);
-        found = true;
         break;
       }
     }
-    if (!found && log) {
-      log(
-        ANSI.red("[SSG CSS]"),
-        `  \u2717 Module not found in manifest: ${moduleId}`
-      );
-    }
   }
   if (cssFiles.size) {
     const links = Array.from(cssFiles).map((f) => `<link rel="stylesheet" type="text/css" href="/${f}">`).join("");
-    if (log) {
-      log(ANSI.green("[SSG CSS]"), `Collected ${cssFiles.size} CSS file(s):`);
-      Array.from(cssFiles).forEach(
-        (f) => log(ANSI.green("[SSG CSS]"), `  - ${f}`)
-      );
-    }
     return links;
   }
-  if (log) {
-    log(ANSI.yellow("[SSG CSS]"), "No CSS files collected");
-  }
   return "";
 }
 function findClientEntry(dir) {
-  if (!fs4.existsSync(dir)) return null;
-  const top = fs4.readdirSync(dir);
+  if (!fs3.existsSync(dir)) return null;
+  const top = fs3.readdirSync(dir);
   const topJs = top.find((f) => f.endsWith(".js"));
   if (topJs) return topJs;
   const assetsDir = path5.join(dir, "assets");
-  if (fs4.existsSync(assetsDir)) {
-    const assetJs = fs4.readdirSync(assetsDir).find((f) => f.endsWith(".js"));
+  if (fs3.existsSync(assetsDir)) {
+    const assetJs = fs3.readdirSync(assetsDir).find((f) => f.endsWith(".js"));
     return assetJs ? `assets/${assetJs}` : null;
   }
   return null;
@@ -4750,16 +4731,9 @@ async function renderRoute(state, mod, route, srcFilePath, clientEntry, manifest
   );
   const documentModuleId = documentPath.replace(/\\/g, "/");
   moduleIds.push(documentModuleId);
-  if (state.loggingEnabled) {
-    log(ANSI.cyan("[SSG]"), `Rendering route: ${route}`);
-    log(ANSI.cyan("[SSG]"), `  Document module: ${documentModuleId}`);
-  }
   const ctx = {
     registerModule: (moduleId) => {
       moduleIds.push(moduleId);
-      if (state.loggingEnabled) {
-        log(ANSI.cyan("[SSG]"), `  Registered module: ${moduleId}`);
-      }
     },
     registerPreloadedPageProps: (props) => {
       ;
@@ -4768,17 +4742,10 @@ async function renderRoute(state, mod, route, srcFilePath, clientEntry, manifest
   };
   const result = await mod.render(route, ctx);
   let html = result.body;
-  if (state.loggingEnabled) {
-    log(ANSI.cyan("[SSG]"), `  Total modules tracked: ${moduleIds.length}`);
-  }
+  log(ANSI.cyan("[SSG]"), `  Total modules tracked: ${moduleIds.length}`);
   let cssLinks = "";
   if (manifest) {
-    cssLinks = collectCssForModules(
-      manifest,
-      moduleIds,
-      projectRoot,
-      state.loggingEnabled ? log : void 0
-    );
+    cssLinks = collectCssForModules(manifest, moduleIds, projectRoot);
   }
   if (clientEntry) {
     const scriptTag = `<script type="module" src="/${clientEntry}"></script>`;
@@ -4807,7 +4774,7 @@ async function appendStaticPropsToClientModules(state, clientOutDirAbs, log) {
   try {
     log(ANSI.cyan("[SSG]"), "Starting static props collection...");
     const clientManifestPath = path5.resolve(clientOutDirAbs, manifestPath);
-    if (!fs4.existsSync(clientManifestPath)) {
+    if (!fs3.existsSync(clientManifestPath)) {
       log(
         ANSI.yellow("[SSG]"),
         "Client manifest not found, skipping static props"
@@ -4815,11 +4782,12 @@ async function appendStaticPropsToClientModules(state, clientOutDirAbs, log) {
       return;
     }
     log(ANSI.cyan("[SSG]"), "Found client manifest at:", clientManifestPath);
+    const { globSync } = await import("node:fs");
     const srcPages = globSync(`${ssgOptions.dir}/**/${ssgOptions.page}`, {
       cwd: projectRoot
     }).map((s) => s.replace(/\\/g, "/"));
     const manifest = JSON.parse(
-      fs4.readFileSync(clientManifestPath, "utf-8")
+      fs3.readFileSync(clientManifestPath, "utf-8")
     );
     log(
       ANSI.cyan("[SSG]"),
@@ -4844,7 +4812,7 @@ async function appendStaticPropsToClientModules(state, clientOutDirAbs, log) {
         const code = `export const __KIRU_STATIC_PROPS__ = ${JSON.stringify(
           staticProps
         )};`;
-        fs4.appendFileSync(filePath, `
+        fs3.appendFileSync(filePath, `
 ${code}`, "utf-8");
         log(ANSI.cyan("[SSG]"), "Added static props to:", chunk.file);
       })
@@ -4854,43 +4822,6 @@ ${code}`, "utf-8");
   }
 }
 
-// src/utils.ts
-import path6 from "node:path";
-import fs5 from "node:fs";
-function createLogger(state) {
-  return (...data) => {
-    if (!state.loggingEnabled) return;
-    console.log(ANSI.cyan("[vite-plugin-kiru]"), ...data);
-  };
-}
-function resolveUserDocument(projectRoot, ssgOptions) {
-  const { dir, document } = ssgOptions;
-  const fp = path6.resolve(projectRoot, dir, document);
-  if (fs5.existsSync(fp)) return fp.replace(/\\/g, "/");
-  throw new Error(`Document not found at ${fp}`);
-}
-var TRANSFORMABLE_EXTENSIONS = /* @__PURE__ */ new Set([
-  ".tsx",
-  ".jsx",
-  ".ts",
-  ".js",
-  ".mjs",
-  ".mts",
-  ".md",
-  ".mdx"
-]);
-function shouldTransformFile(id, state) {
-  if (id[0] === "\0" || id.startsWith("vite:") || id.includes("/node_modules/")) {
-    return false;
-  }
-  const filePath = path6.resolve(id).replace(/\\/g, "/");
-  const isIncludedByUser = state.includedPaths.some(
-    (p) => filePath.startsWith(p)
-  );
-  const isWithinProject = filePath.startsWith(state.projectRoot);
-  return (isWithinProject || isIncludedByUser) && TRANSFORMABLE_EXTENSIONS.has(path6.extname(filePath));
-}
-
 // src/index.ts
 import { build } from "vite";
 function kiru(opts = {}) {
@@ -4904,12 +4835,12 @@ function kiru(opts = {}) {
       inlineConfig = config;
       return createViteConfig(config, opts);
     },
-    configResolved(config) {
+    async configResolved(config) {
       const initialState = createPluginState(opts);
       state = updatePluginState(initialState, config, opts);
       log = createLogger(state);
       if (state.ssgOptions) {
-        virtualModules = createVirtualModules(
+        virtualModules = await createVirtualModules(
           state.projectRoot,
           state.ssgOptions
         );
@@ -4950,8 +4881,8 @@ function kiru(opts = {}) {
         server.middlewares.use(async (req, res, next) => {
           try {
             const url = req.originalUrl || req.url || "/";
-            const filePath = path7.join(state.baseOutDir, "client", url);
-            const extName = path7.extname(filePath);
+            const filePath = path6.join(state.baseOutDir, "client", url);
+            const extName = path6.extname(filePath);
             if (extName && extName !== ".html") {
               return next();
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-kiru",
-  "version": "0.29.6",
+  "version": "0.29.8",
   "description": "",
   "main": "dist/index.js",
   "type": "module",