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

package/dist/index.js

@@ -27,7 +27,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 // ../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.umd.js
 var require_sourcemap_codec_umd = __commonJS({
   "../../node_modules/.pnpm/@jridgewell+sourcemap-codec@1.5.5/node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.umd.js"(exports, module) {
-    (function(global, factory) {
+    (function(global2, factory) {
       if (typeof exports === "object" && typeof module !== "undefined") {
         factory(module);
         module.exports = def(module);
@@ -39,8 +39,8 @@ var require_sourcemap_codec_umd = __commonJS({
       } else {
         const mod = { exports: {} };
         factory(mod);
-        global = typeof globalThis !== "undefined" ? globalThis : global || self;
-        global.sourcemapCodec = def(mod);
+        global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self;
+        global2.sourcemapCodec = def(mod);
       }
       function def(m) {
         return "default" in m.exports ? m.exports.default : m.exports;
@@ -8861,13 +8861,14 @@ export { dir, baseUrl, pages, layouts, guards, transition }
 `;
   }
   function createEntryServerModule() {
+    const documentModuleId = userDoc.substring(projectRoot.length);
     if (mode === "ssr") {
       return `
 import { render as kiruServerRender } from "kiru/router/ssr"
 import Document from "${userDoc}"
 import * as config from "${VIRTUAL_CONFIG_ID}"
 
-export const documentModuleId = "${userDoc.substring(projectRoot.length)}"
+export const documentModuleId = "${documentModuleId}"
 
 export async function render(url, ctx) {
   return kiruServerRender(url, { ...ctx, ...config, Document })
@@ -8882,7 +8883,7 @@ import {
 import Document from "${userDoc}"
 import * as config from "${VIRTUAL_CONFIG_ID}"
 
-export const documentModuleId = "${userDoc.substring(projectRoot.length)}"
+export const documentModuleId = "${documentModuleId}"
 
 export async function render(url, ctx) {
   return kiruStaticRender(url, { ...ctx, ...config, Document })
@@ -11614,15 +11615,30 @@ ${code}`, "utf-8");
 import { build } from "vite";
 
 // src/globals.ts
+var $KIRU_HEADLESS_GLOBAL = Symbol.for("kiru.headlessGlobal");
+var global = globalThis[$KIRU_HEADLESS_GLOBAL] ??= {
+  viteDevServer: null,
+  server: null
+};
 var VITE_DEV_SERVER_INSTANCE = {
   get current() {
-    return (
-      // @ts-ignore
-      globalThis.KIRU_VITE_DEV_SERVER_INSTANCE ?? null
-    );
+    return global.viteDevServer;
+  },
+  set current(server) {
+    global.viteDevServer = server;
+  }
+};
+var entryServerResolvers = [];
+var KIRU_SERVER_ENTRY = {
+  get current() {
+    return global.serverEntry;
   },
   set current(server) {
-    globalThis.KIRU_VITE_DEV_SERVER_INSTANCE = server;
+    global.serverEntry = server;
+    if (server) {
+      entryServerResolvers.forEach((fn) => fn());
+      entryServerResolvers = [];
+    }
   }
 };
 
@@ -11669,11 +11685,12 @@ function kiru(opts = {}) {
         createPreviewMiddleware(state.projectRoot, state.baseOutDir)
       );
     },
-    configureServer(server) {
+    async configureServer(server) {
       VITE_DEV_SERVER_INSTANCE.current = server;
       if (state.isProduction || state.isBuild) return;
       const {
         ssgOptions,
+        ssrOptions,
         devtoolsEnabled,
         dtClientPathname,
         dtHostScriptPath,
@@ -11723,6 +11740,12 @@ ${ANSI.yellow("Error:")} ${error.message}`
             next(e);
           }
         });
+      } else if (ssrOptions) {
+        queueMicrotask(() => {
+          server.ssrLoadModule(VIRTUAL_ENTRY_SERVER_ID).then((mod) => {
+            KIRU_SERVER_ENTRY.current = mod;
+          });
+        });
       }
     },
     resolveId(id) {
@@ -11827,10 +11850,10 @@ ${ANSI.yellow("Error:")} ${error.message}`
             ...inlineConfig?.build,
             ssr: true,
             rollupOptions: {
-              input: path7.resolve(
-                state.projectRoot,
-                state.ssrOptions.runtimeEntry
-              )
+              input: [
+                path7.resolve(state.projectRoot, state.ssrOptions.runtimeEntry),
+                VIRTUAL_ENTRY_SERVER_ID
+              ]
             }
           }
         });

package/dist/server.js

@@ -6658,20 +6658,51 @@ function tEntries(obj) {
 }
 
 // src/virtual-modules.ts
+var VIRTUAL_ENTRY_SERVER_ID = "virtual:kiru:entry-server";
 var VIRTUAL_ENTRY_CLIENT_ID = "virtual:kiru:entry-client";
 
 // src/globals.ts
+var $KIRU_HEADLESS_GLOBAL = Symbol.for("kiru.headlessGlobal");
+var global = globalThis[$KIRU_HEADLESS_GLOBAL] ??= {
+  viteDevServer: null,
+  server: null
+};
 var VITE_DEV_SERVER_INSTANCE = {
   get current() {
-    return (
-      // @ts-ignore
-      globalThis.KIRU_VITE_DEV_SERVER_INSTANCE ?? null
-    );
+    return global.viteDevServer;
+  },
+  set current(server) {
+    global.viteDevServer = server;
+  }
+};
+var entryServerResolvers = [];
+var KIRU_SERVER_ENTRY = {
+  get current() {
+    return global.serverEntry;
   },
   set current(server) {
-    globalThis.KIRU_VITE_DEV_SERVER_INSTANCE = server;
+    global.serverEntry = server;
+    if (server) {
+      entryServerResolvers.forEach((fn) => fn());
+      entryServerResolvers = [];
+    }
   }
 };
+async function awaitServerRendererInitialized_Dev() {
+  if (KIRU_SERVER_ENTRY.current) {
+    return Promise.resolve(KIRU_SERVER_ENTRY.current);
+  }
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(() => {
+      entryServerResolvers = entryServerResolvers.filter((r) => r !== resolve);
+      reject(new Error("Failed to acquire server renderer. Seek help!"));
+    }, 1e4);
+    entryServerResolvers.push(() => {
+      clearTimeout(timeout);
+      resolve(KIRU_SERVER_ENTRY.current);
+    });
+  });
+}
 
 // src/server.ts
 async function getClientAssets(clientOutDirAbs, manifestPath) {
@@ -6748,8 +6779,56 @@ function collectCssForModules(manifest, moduleIds, projectRoot) {
   }
   return "";
 }
+async function resolveServerRenderer() {
+  if (process.env.NODE_ENV !== "production") {
+    return awaitServerRendererInitialized_Dev();
+  }
+  return loadServerRenderer_Production();
+}
+async function loadServerRenderer_Production() {
+  const projectRoot = process.cwd().replace(/\\/g, "/");
+  const serverOutDirAbs = path2.resolve(projectRoot, "dist/server");
+  const manifestPath = path2.resolve(serverOutDirAbs, "vite-manifest.json");
+  if (!fs.existsSync(manifestPath)) {
+    throw new Error(
+      `Server manifest not found at ${manifestPath}. Make sure the SSR build has been completed.`
+    );
+  }
+  const manifest = JSON.parse(
+    fs.readFileSync(manifestPath, "utf-8")
+  );
+  const virtualEntryServerModule = Object.values(manifest).find(
+    (value) => value.src === VIRTUAL_ENTRY_SERVER_ID
+  );
+  if (!virtualEntryServerModule) {
+    throw new Error(
+      "Virtual entry server module not found in manifest. Make sure the SSR build has been completed."
+    );
+  }
+  const entryServerFile = virtualEntryServerModule.file;
+  const entryServerPath = path2.resolve(serverOutDirAbs, entryServerFile);
+  if (!fs.existsSync(entryServerPath)) {
+    throw new Error(
+      `Virtual entry server module file not found at ${entryServerPath}`
+    );
+  }
+  const fileUrl = `file://${entryServerPath.replace(/\\/g, "/")}`;
+  const module = await import(
+    /* @vite-ignore */
+    fileUrl
+  );
+  if (!module.render || !module.documentModuleId) {
+    throw new Error(
+      "Virtual entry server module does not export render and documentModuleId"
+    );
+  }
+  return {
+    render: module.render,
+    documentModuleId: module.documentModuleId
+  };
+}
 async function renderPage(options) {
-  const { render, documentModuleId } = await import("virtual:kiru:entry-server");
+  const { render, documentModuleId } = await resolveServerRenderer();
   const moduleIds = [documentModuleId];
   const projectRoot = process.cwd().replace(/\\/g, "/");
   const { httpResponse } = await render(options.url, {

package/package.json

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