vite-plugin-kiru 0.30.1 → 0.32.0-preview.0

package/dist/server.d.ts

@@ -1,10 +1,8 @@
-import type { Readable } from "node:stream"
-
 export interface SSRHttpResponse {
   html: string
   statusCode: number
   headers: Array<[string, string]>
-  stream: Readable
+  stream: ReadableStream | null
 }
 
 export interface SSRRenderResult {
@@ -13,6 +11,7 @@ export interface SSRRenderResult {
 
 export interface ServerRenderOptions {
   url: string
+  context: Kiru.RequestContext
 }
 
 export declare function renderPage(

package/dist/server.js

@@ -1,9 +1,6 @@
 // src/server.ts
-import path3 from "node:path";
-import fs from "node:fs";
-
-// src/utils.ts
 import path2 from "node:path";
+import fs from "node:fs";
 
 // ../../node_modules/.pnpm/@isaacs+balanced-match@4.0.1/node_modules/@isaacs/balanced-match/dist/esm/index.js
 var balanced = (a, b, str) => {
@@ -1557,7 +1554,7 @@ minimatch.Minimatch = Minimatch;
 minimatch.escape = escape;
 minimatch.unescape = unescape;
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/glob.js
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // ../../node_modules/.pnpm/lru-cache@11.2.2/node_modules/lru-cache/dist/esm/index.js
@@ -4111,12 +4108,12 @@ var PathBase = class {
   /**
    * Get the Path object referenced by the string path, resolved from this Path
    */
-  resolve(path4) {
-    if (!path4) {
+  resolve(path3) {
+    if (!path3) {
       return this;
     }
-    const rootPath = this.getRootString(path4);
-    const dir = path4.substring(rootPath.length);
+    const rootPath = this.getRootString(path3);
+    const dir = path3.substring(rootPath.length);
     const dirParts = dir.split(this.splitSep);
     const result = rootPath ? this.getRoot(rootPath).#resolveParts(dirParts) : this.#resolveParts(dirParts);
     return result;
@@ -4868,8 +4865,8 @@ var PathWin32 = class _PathWin32 extends PathBase {
   /**
    * @internal
    */
-  getRootString(path4) {
-    return win32.parse(path4).root;
+  getRootString(path3) {
+    return win32.parse(path3).root;
   }
   /**
    * @internal
@@ -4915,8 +4912,8 @@ var PathPosix = class _PathPosix extends PathBase {
   /**
    * @internal
    */
-  getRootString(path4) {
-    return path4.startsWith("/") ? "/" : "";
+  getRootString(path3) {
+    return path3.startsWith("/") ? "/" : "";
   }
   /**
    * @internal
@@ -5005,11 +5002,11 @@ var PathScurryBase = class {
   /**
    * Get the depth of a provided path, string, or the cwd
    */
-  depth(path4 = this.cwd) {
-    if (typeof path4 === "string") {
-      path4 = this.cwd.resolve(path4);
+  depth(path3 = this.cwd) {
+    if (typeof path3 === "string") {
+      path3 = this.cwd.resolve(path3);
     }
-    return path4.depth();
+    return path3.depth();
   }
   /**
    * Return the cache of child entries.  Exposed so subclasses can create
@@ -5496,9 +5493,9 @@ var PathScurryBase = class {
     process2();
     return results;
   }
-  chdir(path4 = this.cwd) {
+  chdir(path3 = this.cwd) {
     const oldCwd = this.cwd;
-    this.cwd = typeof path4 === "string" ? this.cwd.resolve(path4) : path4;
+    this.cwd = typeof path3 === "string" ? this.cwd.resolve(path3) : path3;
     this.cwd[setAsCwd](oldCwd);
   }
 };
@@ -5572,7 +5569,7 @@ var PathScurryDarwin = class extends PathScurryPosix {
 var Path = process.platform === "win32" ? PathWin32 : PathPosix;
 var PathScurry = process.platform === "win32" ? PathScurryWin32 : process.platform === "darwin" ? PathScurryDarwin : PathScurryPosix;
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/pattern.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/pattern.js
 var isPatternList = (pl) => pl.length >= 1;
 var isGlobList = (gl) => gl.length >= 1;
 var Pattern = class _Pattern {
@@ -5737,7 +5734,7 @@ var Pattern = class _Pattern {
   }
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/ignore.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/ignore.js
 var defaultPlatform2 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Ignore = class {
   relative;
@@ -5824,7 +5821,7 @@ var Ignore = class {
   }
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/processor.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/processor.js
 var HasWalkedCache = class _HasWalkedCache {
   store;
   constructor(store = /* @__PURE__ */ new Map()) {
@@ -5854,8 +5851,8 @@ var MatchRecord = class {
   }
   // match, absolute, ifdir
   entries() {
-    return [...this.store.entries()].map(([path4, n]) => [
-      path4,
+    return [...this.store.entries()].map(([path3, n]) => [
+      path3,
       !!(n & 2),
       !!(n & 1)
     ]);
@@ -6045,7 +6042,7 @@ var Processor = class _Processor {
   }
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/walker.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/walker.js
 var makeIgnore = (ignore, opts) => typeof ignore === "string" ? new Ignore([ignore], opts) : Array.isArray(ignore) ? new Ignore(ignore, opts) : ignore;
 var GlobUtil = class {
   path;
@@ -6060,9 +6057,9 @@ var GlobUtil = class {
   signal;
   maxDepth;
   includeChildMatches;
-  constructor(patterns, path4, opts) {
+  constructor(patterns, path3, opts) {
     this.patterns = patterns;
-    this.path = path4;
+    this.path = path3;
     this.opts = opts;
     this.#sep = !opts.posix && opts.platform === "win32" ? "\\" : "/";
     this.includeChildMatches = opts.includeChildMatches !== false;
@@ -6081,11 +6078,11 @@ var GlobUtil = class {
       });
     }
   }
-  #ignored(path4) {
-    return this.seen.has(path4) || !!this.#ignore?.ignored?.(path4);
+  #ignored(path3) {
+    return this.seen.has(path3) || !!this.#ignore?.ignored?.(path3);
   }
-  #childrenIgnored(path4) {
-    return !!this.#ignore?.childrenIgnored?.(path4);
+  #childrenIgnored(path3) {
+    return !!this.#ignore?.childrenIgnored?.(path3);
   }
   // backpressure mechanism
   pause() {
@@ -6300,8 +6297,8 @@ var GlobUtil = class {
 };
 var GlobWalker = class extends GlobUtil {
   matches = /* @__PURE__ */ new Set();
-  constructor(patterns, path4, opts) {
-    super(patterns, path4, opts);
+  constructor(patterns, path3, opts) {
+    super(patterns, path3, opts);
   }
   matchEmit(e) {
     this.matches.add(e);
@@ -6338,8 +6335,8 @@ var GlobWalker = class extends GlobUtil {
 };
 var GlobStream = class extends GlobUtil {
   results;
-  constructor(patterns, path4, opts) {
-    super(patterns, path4, opts);
+  constructor(patterns, path3, opts) {
+    super(patterns, path3, opts);
     this.results = new Minipass({
       signal: this.signal,
       objectMode: true
@@ -6372,7 +6369,7 @@ var GlobStream = class extends GlobUtil {
   }
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/glob.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/glob.js
 var defaultPlatform3 = typeof process === "object" && process && typeof process.platform === "string" ? process.platform : "linux";
 var Glob = class {
   absolute;
@@ -6572,7 +6569,7 @@ var Glob = class {
   }
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/has-magic.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/has-magic.js
 var hasMagic = (pattern, options = {}) => {
   if (!Array.isArray(pattern)) {
     pattern = [pattern];
@@ -6584,7 +6581,7 @@ var hasMagic = (pattern, options = {}) => {
   return false;
 };
 
-// ../../node_modules/.pnpm/glob@11.0.3/node_modules/glob/dist/esm/index.js
+// ../../node_modules/.pnpm/glob@12.0.0/node_modules/glob/dist/esm/index.js
 function globStreamSync(pattern, options = {}) {
   return new Glob(pattern, options).streamSync();
 }
@@ -6660,17 +6657,6 @@ function tEntries(obj) {
   return Object.entries(obj);
 }
 
-// src/utils.ts
-function resolveUserDocument(projectRoot, options) {
-  const { dir, document } = options;
-  const fp = path2.resolve(projectRoot, dir, document).replace(/\\/g, "/");
-  const matches = globSync(fp);
-  if (!matches.length) {
-    throw new Error(`Document not found at ${fp}`);
-  }
-  return path2.resolve(projectRoot, matches[0]).replace(/\\/g, "/");
-}
-
 // src/virtual-modules.ts
 var VIRTUAL_ENTRY_CLIENT_ID = "virtual:kiru:entry-client";
 
@@ -6692,15 +6678,14 @@ async function getClientAssets(clientOutDirAbs, manifestPath) {
   let clientEntry = null;
   let manifest = null;
   try {
-    const clientManifestPath = path3.resolve(clientOutDirAbs, manifestPath);
+    const clientManifestPath = path2.resolve(clientOutDirAbs, manifestPath);
     if (fs.existsSync(clientManifestPath)) {
       const parsedManifest = JSON.parse(
         fs.readFileSync(clientManifestPath, "utf-8")
       );
       manifest = parsedManifest;
-      const clientEntryKey = "virtual:kiru:entry-client";
-      if (parsedManifest[clientEntryKey]?.file) {
-        clientEntry = parsedManifest[clientEntryKey].file;
+      if (parsedManifest[VIRTUAL_ENTRY_CLIENT_ID]?.file) {
+        clientEntry = parsedManifest[VIRTUAL_ENTRY_CLIENT_ID].file;
       }
     }
   } catch {
@@ -6723,7 +6708,7 @@ function collectCssForModules(manifest, moduleIds, projectRoot) {
     (it.css || []).forEach((c) => cssFiles.add(c));
     (it.imports || []).forEach((imp) => collectCss(imp));
   };
-  const entryClientKey = "virtual:kiru:entry-client";
+  const entryClientKey = VIRTUAL_ENTRY_CLIENT_ID;
   if (manifestRef[entryClientKey] && !seen.has(entryClientKey)) {
     collectCss(entryClientKey);
   }
@@ -6749,8 +6734,8 @@ function collectCssForModules(manifest, moduleIds, projectRoot) {
     }
     for (const key in manifestRef) {
       const keyNormalized = key.replace(/\\/g, "/");
-      const moduleBaseName = path3.basename(normalizedId);
-      const keyBaseName = path3.basename(keyNormalized);
+      const moduleBaseName = path2.basename(normalizedId);
+      const keyBaseName = path2.basename(keyNormalized);
       if ((keyNormalized.endsWith(normalizedId) || normalizedId.endsWith(keyNormalized)) && moduleBaseName === keyBaseName) {
         collectCss(key);
         break;
@@ -6764,16 +6749,12 @@ function collectCssForModules(manifest, moduleIds, projectRoot) {
   return "";
 }
 async function renderPage(options) {
-  const { render } = await import("virtual:kiru:entry-server");
-  const moduleIds = [];
+  const { render, documentModuleId } = await import("virtual:kiru:entry-server");
+  const moduleIds = [documentModuleId];
   const projectRoot = process.cwd().replace(/\\/g, "/");
-  const documentModule = resolveUserDocument(projectRoot, {
-    dir: "src/pages",
-    document: "document.tsx"
-  }).substring(projectRoot.length);
-  moduleIds.push(documentModule);
   const { httpResponse } = await render(options.url, {
-    registerModule: (moduleId) => {
+    userContext: options.context,
+    registerModule(moduleId) {
       moduleIds.push(moduleId);
     }
   });
@@ -6785,7 +6766,7 @@ async function renderPage(options) {
   const isDevelopment = process.env.NODE_ENV !== "production";
   let html = httpResponse.html;
   if (isDevelopment) {
-    const scriptTag = `<script type="module" src="/@id/${VIRTUAL_ENTRY_CLIENT_ID}"></script>`;
+    const scriptTag = `<script type="module" src="/@id/${VIRTUAL_ENTRY_CLIENT_ID}" async></script>`;
     html = html.includes("</body>") ? html.replace("</body>", scriptTag + "</body>") : html + scriptTag;
     const importedModules = /* @__PURE__ */ new Set();
     const seen = /* @__PURE__ */ new Set();
@@ -6799,7 +6780,7 @@ async function renderPage(options) {
       }
     };
     for (const id of moduleIds) {
-      const p = path3.join(projectRoot, id).replace(/\\/g, "/");
+      const p = path2.join(projectRoot, id).replace(/\\/g, "/");
       const mod = VITE_DEV_SERVER_INSTANCE.current.moduleGraph.getModuleById(p);
       if (!mod) {
         console.error(`Module not found: ${p}`);
@@ -6819,7 +6800,7 @@ async function renderPage(options) {
       html = html.replace("<head>", "<head>" + stylesheets.join("\n"));
     }
   } else {
-    const clientOutDirAbs = path3.resolve(projectRoot, "dist/client");
+    const clientOutDirAbs = path2.resolve(projectRoot, "dist/client");
     const { clientEntry, manifest } = await getClientAssets(
       clientOutDirAbs,
       "vite-manifest.json"
@@ -6831,10 +6812,15 @@ async function renderPage(options) {
       }
     }
     if (clientEntry) {
-      const scriptTag = `<script type="module" src="/${clientEntry}"></script>`;
+      const scriptTag = `<script type="module" src="/${clientEntry}" async></script>`;
       html = html.includes("</body>") ? html.replace("</body>", scriptTag + "</body>") : html + scriptTag;
     }
   }
+  const contextString = JSON.stringify(options.context);
+  html = html.replace(
+    "</head>",
+    `<script type="application/json" k-request-context>${contextString}</script></head>`
+  );
   return {
     httpResponse: {
       ...httpResponse,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-kiru",
-  "version": "0.30.1",
+  "version": "0.32.0-preview.0",
   "description": "",
   "main": "dist/index.js",
   "type": "module",
@@ -8,8 +8,18 @@
   "keywords": [],
   "author": "",
   "license": "ISC",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./server": {
+      "types": "./dist/server.d.ts",
+      "default": "./dist/server.js"
+    }
+  },
   "peerDependencies": {
-    "kiru": ">=0.51.8"
+    "kiru": ">=0.54.0-preview.0"
   },
   "devDependencies": {
     "@types/node": "^22.17.0",
@@ -18,7 +28,8 @@
     "tsx": "^4.20.3",
     "typescript": "^5.9.2",
     "kiru-devtools-client": "^0.0.0",
-    "kiru-devtools-host": "^1.0.0"
+    "kiru-devtools-host": "^1.0.0",
+    "kiru": "^0.54.0-preview.0"
   },
   "dependencies": {
     "glob": "^12.0.0",