vike-lite 1.0.12 → 1.0.14

package/dist/__internal/server.d.mts

@@ -1,15 +1,12 @@
-import { t as RenderContext } from "../index-Ck5rzSdQ.mjs";
+import { r as Manifest } from "../index-B6dJFVs8.mjs";
+import { t as Config } from "../index-kftPCG4J.mjs";
 
 //#region src/server/store.d.ts
 interface VikeState {
   routes: any[];
   errorRoute: any | null;
-  config: {
-    onRenderHtml: () => Promise<{
-      default: (ctx: RenderContext) => Promise<string>;
-    }>;
-  } | null;
-  manifest: Record<string, any> | undefined;
+  config: Config | null;
+  manifest: Manifest | undefined;
 }
 declare const store: VikeState;
 declare function setVikeState(newState: Partial<VikeState>): void;

package/dist/__internal/shared.d.mts

@@ -1,2 +1,2 @@
-import { n as matchRoute, t as RenderContext } from "../index-Ck5rzSdQ.mjs";
-export { RenderContext, matchRoute };
+import { n as RenderContext, r as matchRoute, t as Config } from "../index-kftPCG4J.mjs";
+export { Config, RenderContext, matchRoute };

package/dist/index-B6dJFVs8.d.mts

@@ -0,0 +1,29 @@
+//#region src/index.d.ts
+type PageContext<Data = unknown> = {
+  routeParams: Record<string, string>;
+  urlOriginal: string;
+  urlPathname: string;
+  data?: Data;
+  title?: string;
+  is404?: boolean;
+  is500?: boolean;
+  errorMessage?: string;
+};
+type DataAsync<Data = unknown> = (pageContext: PageContext) => Promise<Data>;
+type DataSync<Data = unknown> = (pageContext: PageContext) => Data;
+type Route = {
+  path: string;
+  page: string;
+  layout?: string;
+  head?: string;
+  hasData?: boolean;
+  hasTitle?: boolean;
+};
+type Manifest = Record<string, {
+  file: string;
+  css?: string[];
+  imports?: string[];
+  isEntry?: boolean;
+}>;
+//#endregion
+export { Route as a, PageContext as i, DataSync as n, Manifest as r, DataAsync as t };

package/dist/index-kftPCG4J.d.mts

@@ -0,0 +1,33 @@
+//#region src/shared/matchRoute.d.ts
+declare function matchRoute(urlPathname: string, routes: typeof import('virtual:routes').routes): {
+  route: any;
+  routeParams: Record<string, string>;
+} | null;
+//#endregion
+//#region src/shared/index.d.ts
+interface RenderContext {
+  pageContext: any;
+  Page: unknown;
+  Head?: unknown;
+  Layout?: unknown;
+  pageTitleTag: string;
+  serializedContext: string;
+  assets: {
+    cssLinks: string;
+    jsPreloads: string;
+    entryClient: string;
+  };
+}
+type Config = {
+  onRenderHtml: () => Promise<{
+    default: (ctx: RenderContext) => Promise<string>;
+  }>;
+  onRenderClient: () => Promise<{
+    default: (opts: {
+      routes: any[];
+      errorRoute: any;
+    }) => void;
+  }>;
+};
+//#endregion
+export { RenderContext as n, matchRoute as r, Config as t };

package/dist/index.d.mts

@@ -1,65 +1,2 @@
-//#region src/index.d.ts
-type PageContext<Data = unknown> = {
-  routeParams: Record<string, string>;
-  urlOriginal: string;
-  urlPathname: string;
-  data?: Data;
-  title?: string;
-  is404?: boolean;
-  is500?: boolean;
-  errorMessage?: string;
-};
-type DataAsync<Data = unknown> = (pageContext: PageContext) => Promise<Data>;
-type DataSync<Data = unknown> = (pageContext: PageContext) => Data;
-type Route = {
-  path: string;
-  page: string;
-  layout?: string;
-  head?: string;
-  hasData?: boolean;
-  hasTitle?: boolean;
-};
-type Manifest = Record<string, {
-  file: string;
-  css?: string[];
-  imports?: string[];
-}>;
-declare module 'virtual:routes' {
-  type Imported<Name extends string, T> = () => Promise<({ [K in Name]: T } & {
-    default?: T;
-  }) | ({ [K in Name]?: T } & {
-    default: T;
-  })>;
-  const config: {
-    onRenderClient: () => Promise<{
-      onRenderClient: () => void;
-    }>;
-    onRenderHtml: () => Promise<{
-      onRenderHtml: (pageContext: any) => string;
-    }>;
-  };
-  const routes: Array<{
-    path: string;
-    page: string;
-    hasData: boolean;
-    hasTitle: boolean;
-    Page: Imported<'Page', HTMLElement>;
-    Head?: Imported<'Head', HTMLElement>;
-    Layout?: Imported<'Layout', HTMLElement>;
-    data?: Imported<'data', (pageContext: PageContext) => Promise<PageContext['data']>>;
-    title?: Imported<'title', string | ((pageContext: PageContext) => string)>;
-  }>;
-  const errorRoute: {
-    path: string;
-    page: string;
-    Page: Imported<'Page', HTMLElement>;
-    Head?: Imported<'Head', HTMLElement>;
-    Layout?: Imported<'Layout', HTMLElement>;
-  };
-}
-declare module 'virtual:client-manifest' {
-  const manifest: Manifest;
-  export default manifest;
-}
-//#endregion
-export { DataAsync, DataSync, PageContext, Route };
+import { a as Route, i as PageContext, n as DataSync, r as Manifest, t as DataAsync } from "./index-B6dJFVs8.mjs";
+export { DataAsync, DataSync, Manifest, PageContext, Route };

package/dist/server.mjs

@@ -1,5 +1,18 @@
 import { t as matchRoute } from "./matchRoute-BONrLRYy.mjs";
 import { n as store } from "./store-BRWiOtOy.mjs";
+//#region src/utils/serializeContext.ts
+const ESCAPE_LOOKUP = {
+	"&": String.raw`\u0026`,
+	">": String.raw`\u003e`,
+	"<": String.raw`\u003c`,
+	"\u2028": String.raw`\u2028`,
+	"\u2029": String.raw`\u2029`
+};
+const ESCAPE_REGEX = /[&><\u{2028}\u{2029}]/gu;
+function serializeContext(data) {
+	return JSON.stringify(data).replaceAll(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
+}
+//#endregion
 //#region src/server/abort.ts
 var AbortRender = class extends Error {
 	statusCode;
@@ -13,18 +26,6 @@ var AbortRender = class extends Error {
 //#endregion
 //#region src/server/renderPage.tsx
 const isProd = process.env.NODE_ENV === "production";
-const virtualEntryClientId = "virtual:entry-client";
-const ESCAPE_LOOKUP = {
-	"&": String.raw`\u0026`,
-	">": String.raw`\u003e`,
-	"<": String.raw`\u003c`,
-	"\u2028": String.raw`\u2028`,
-	"\u2029": String.raw`\u2029`
-};
-const ESCAPE_REGEX = /[&><\u{2028}\u{2029}]/gu;
-function serializeContext(data) {
-	return JSON.stringify(data).replaceAll(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
-}
 function getAssets(pageModuleId) {
 	if (!isProd) return {
 		cssLinks: "",
@@ -33,7 +34,11 @@ function getAssets(pageModuleId) {
 	};
 	const cssFiles = /* @__PURE__ */ new Set();
 	const jsFiles = /* @__PURE__ */ new Set();
-	const manifest = store.manifest;
+	const { manifest } = store;
+	function getVirtualEntryClientKey() {
+		for (const key in manifest) if (manifest[key].isEntry) return key;
+		throw new Error("entry-client not found in manifest");
+	}
 	function collectAssets(key) {
 		const chunk = manifest[key];
 		if (!chunk) throw new Error(`Asset not found in manifest for key: ${key}`);
@@ -41,22 +46,23 @@ function getAssets(pageModuleId) {
 		if (chunk.css) for (const css of chunk.css) cssFiles.add(css);
 		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp);
 	}
-	collectAssets(virtualEntryClientId);
+	const virtualEntryClientKey = getVirtualEntryClientKey();
+	collectAssets(virtualEntryClientKey);
 	collectAssets(pageModuleId.replace("@/", ""));
 	return {
 		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="/${href}">`).join(""),
 		jsPreloads: [...jsFiles].map((href) => `<link rel="modulepreload" href="/${href}">`).join(""),
-		entryClient: "/" + manifest[virtualEntryClientId].file
+		entryClient: "/" + manifest[virtualEntryClientKey].file
 	};
 }
-async function buildPageContext(pathname, fullUrl, isJsonRequest) {
-	const matched = matchRoute(pathname, store.routes);
+async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
+	const matched = matchRoute(urlPathname, store.routes);
 	if (!matched) return null;
 	const { route, routeParams } = matched;
 	const pageContext = {
 		routeParams,
-		urlOriginal: fullUrl,
-		urlPathname: pathname
+		urlOriginal,
+		urlPathname
 	};
 	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
 		route.data?.() ?? null,
@@ -68,14 +74,14 @@ async function buildPageContext(pathname, fullUrl, isJsonRequest) {
 	if (dataMod) try {
 		pageContext.data = await (dataMod.data ?? dataMod.default)(pageContext);
 	} catch (error) {
-		console.error("+data hook failed at:", pathname);
+		console.error("+data hook failed at:", urlPathname);
 		throw error;
 	}
 	if (titleMod) try {
 		const titleFn = titleMod.title ?? titleMod.default;
 		pageContext.title = typeof titleFn === "function" ? titleFn(pageContext) : titleFn;
 	} catch (error) {
-		console.error("+title hook failed at:", pathname);
+		console.error("+title hook failed at:", urlPathname);
 		throw error;
 	}
 	return {
@@ -89,7 +95,7 @@ async function buildPageContext(pathname, fullUrl, isJsonRequest) {
 async function renderErrorPage(req, status, originalPathname, error) {
 	if (!store.errorRoute) return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
 	try {
-		const { onRenderHtml } = await store.config.onRenderHtml();
+		const { default: onRenderHtml } = await store.config.onRenderHtml();
 		const [PageModule, HeadModule, LayoutModule] = await Promise.all([
 			store.errorRoute.Page(),
 			store.errorRoute.Head?.() ?? null,
@@ -137,7 +143,7 @@ async function renderPage(req) {
 		}
 		const { pageContext, route, PageModule, HeadModule, LayoutModule } = resolved;
 		if (isJsonRequest) return Response.json(pageContext);
-		const { onRenderHtml } = await store.config.onRenderHtml();
+		const { default: onRenderHtml } = await store.config.onRenderHtml();
 		const html = await onRenderHtml({
 			pageContext,
 			Page: PageModule.Page ?? PageModule.default,

package/dist/vite.mjs

@@ -201,6 +201,13 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index.ts", api
 				server.middlewares.use(async (req, res, next) => {
 					try {
 						const ssrEnv = server.environments.ssr;
+						const { routes, errorRoute, config } = await ssrEnv.runner.import(virtualModuleId);
+						const { setVikeState } = await ssrEnv.runner.import("vike-lite/__internal/server");
+						setVikeState({
+							routes,
+							errorRoute,
+							config
+						});
 						const absoluteServerEntry = path.join(viteConfigRoot, serverEntry);
 						const { default: app } = await ssrEnv.runner.import(absoluteServerEntry);
 						const headers = new Headers();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",

package/dist/index-Ck5rzSdQ.d.mts

@@ -1,22 +0,0 @@
-//#region src/shared/matchRoute.d.ts
-declare function matchRoute(urlPathname: string, routes: Route[]): {
-  route: Route;
-  routeParams: Record<string, string>;
-} | null;
-//#endregion
-//#region src/shared/index.d.ts
-interface RenderContext {
-  pageContext: any;
-  Page: unknown;
-  Head?: unknown;
-  Layout?: unknown;
-  pageTitleTag: string;
-  serializedContext: string;
-  assets: {
-    cssLinks: string;
-    jsPreloads: string;
-    entryClient: string;
-  };
-}
-//#endregion
-export { matchRoute as n, RenderContext as t };