vike-lite 1.15.18 → 1.15.20

package/dist/__internal/client.d.mts

@@ -5,26 +5,48 @@ declare function createLinkPrefetchHandler(onPrefetch: (url: URL) => void): (e:
 declare function finalizeNavigation(shouldScrollToTop: {
   current: boolean;
 }): void;
-interface ViewComponents {
-  Page: any | null;
-  Layout: any | null;
-  Head: any | null;
+interface ViewComponents<TComponent = unknown> {
+  Page: TComponent | null;
+  Layout: TComponent | null;
+  Head: TComponent | null;
+}
+/**
+ * Shape of a dynamically-imported `+Page`/`+Layout`/`+Head` module. The actual
+ * component type isn't statically known here (it's whatever the framework
+ * adapter's JSX/template runtime expects) — callers of `loadViewModules`
+ * specify it via the `TComponent` type param instead.
+ */
+interface ViewModule {
+  default?: unknown;
+  Page?: unknown;
+  Layout?: unknown;
+  Head?: unknown;
 }
 interface RouteModuleLoaders {
-  Page: () => Promise<any>;
-  Layout?: () => Promise<any>;
-  Head?: () => Promise<any>;
+  Page: () => Promise<ViewModule>;
+  Layout?: () => Promise<ViewModule>;
+  Head?: () => Promise<ViewModule>;
 }
 /**
  * Load a route's Page/Layout/Head modules in parallel and resolve each
  * module's export (named export first, falling back to the default export).
  */
-declare function loadViewModules(route: RouteModuleLoaders): Promise<ViewComponents>;
+declare function loadViewModules<TComponent = unknown>(route: RouteModuleLoaders): Promise<ViewComponents<TComponent>>;
 /**
  * Build the URL of the `+data`/`+title` JSON endpoint for a given pathname
  * (e.g. base "/my-app" and path "/about" → "/my-app/about.pageContext.json").
  */
 declare function buildPageContextJsonUrl(pathname: string, search: string): string;
+/** Shape of a `.pageContext.json` payload as produced by the server-side `+data`/`+title` hooks. */
+interface PageContextJson {
+  data?: unknown;
+  title?: string;
+  is404?: boolean;
+  is500?: boolean;
+  isError?: boolean;
+  reason?: string;
+  _redirect?: string;
+}
 /**
  * Fetch and parse a `.pageContext.json` endpoint, throwing a descriptive error
  * if a proxy/CDN intercepted the request with a non-JSON response.
@@ -32,14 +54,14 @@ declare function buildPageContextJsonUrl(pathname: string, search: string): stri
 declare function fetchPageContextJson(jsonUrl: string, options: {
   signal: AbortSignal;
   cache?: RequestCache;
-}): Promise<any>;
+}): Promise<PageContextJson>;
 interface PrefetchableRoute {
   page?: string;
   layout?: string;
   head?: string;
-  Page?: () => Promise<any>;
-  Layout?: () => Promise<any>;
-  Head?: () => Promise<any>;
+  Page?: () => Promise<unknown>;
+  Layout?: () => Promise<unknown>;
+  Head?: () => Promise<unknown>;
 }
 /**
  * Create a per-router-instance prefetcher that loads a route's modules at most once
@@ -57,7 +79,7 @@ declare function tryRecoverFromStaleModuleGraph(message: string, urlToReload: st
  * `isHydration`) onto the raw context blob the server injected via `window.__PAGE_CONTEXT__`.
  * Centralized so every adapter sets these consistently instead of some silently omitting them.
  */
-declare function buildInitialClientContext<T extends Record<string, any>>(rawContext: T | undefined, isHydration: boolean): T & {
+declare function buildInitialClientContext<T extends object>(rawContext: T | undefined, isHydration: boolean): T & {
   isClientSide: true;
   isHydration: boolean;
 };
@@ -74,7 +96,7 @@ interface HydrationInitialContext {
  * initial pathname. Returns a null view when hydration isn't happening (client
  * takeover) — the router's own first-load effect performs the initial load instead.
  */
-declare function resolveHydrationView(initialContext: HydrationInitialContext, isHydration: boolean, routes: VikeState['routes'], errorRoute: VikeState['errorRoute']): Promise<ViewComponents>;
+declare function resolveHydrationView<TComponent = unknown>(initialContext: HydrationInitialContext, isHydration: boolean, routes: VikeState['routes'], errorRoute: VikeState['errorRoute']): Promise<ViewComponents<TComponent>>;
 /**
  * Consume the server-injected initial context if it still matches the given pathname
  * (i.e. this is the very first client-side route load, right after SSR hydration/render).
@@ -85,4 +107,4 @@ declare function resolveHydrationView(initialContext: HydrationInitialContext, i
  */
 declare function consumeMatchingInitialContext(pathname: string): boolean;
 //#endregion
-export { ViewComponents, buildInitialClientContext, buildPageContextJsonUrl, consumeMatchingInitialContext, createLinkClickHandler, createLinkPrefetchHandler, createRoutePrefetcher, fetchPageContextJson, finalizeNavigation, loadViewModules, resolveHydrationView, tryRecoverFromStaleModuleGraph };
+export { PageContextJson, ViewComponents, buildInitialClientContext, buildPageContextJsonUrl, consumeMatchingInitialContext, createLinkClickHandler, createLinkPrefetchHandler, createRoutePrefetcher, fetchPageContextJson, finalizeNavigation, loadViewModules, resolveHydrationView, tryRecoverFromStaleModuleGraph };

package/dist/__internal/client.mjs

@@ -52,7 +52,7 @@ async function loadViewModules(route) {
 		route.Head?.() ?? null
 	]);
 	return {
-		Page: PageMod.Page ?? PageMod.default,
+		Page: PageMod.Page ?? PageMod.default ?? null,
 		Layout: LayoutMod?.Layout ?? LayoutMod?.default ?? null,
 		Head: HeadMod?.Head ?? HeadMod?.default ?? null
 	};

package/dist/__internal/shared.d.mts

@@ -1,6 +1,7 @@
+import { PageContextServer } from "../index.mjs";
 //#region src/__internal/shared.d.ts
 interface RenderContext {
-  pageContext: any;
+  pageContext: PageContextServer;
   Page: unknown;
   Head?: unknown;
   Layout?: unknown;

package/dist/server.d.mts

@@ -1,7 +1,7 @@
 //#region src/server/renderPage.d.ts
 declare function renderPage(req: Request, { nonce }?: {
   nonce?: string;
-  [key: string]: any;
+  [key: string]: unknown;
 }): Promise<Response>;
 //#endregion
 export { renderPage };

package/dist/server.mjs

@@ -79,7 +79,8 @@ async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
 	const pageContext = {
 		routeParams,
 		urlOriginal,
-		urlPathname
+		urlPathname,
+		isClientSide: false
 	};
 	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
 		route.Data?.() ?? null,
@@ -133,7 +134,8 @@ async function renderErrorPage(req, status, urlPathname, error, nonce) {
 			routeParams: {},
 			is404: status === 404,
 			is500,
-			errorMessage
+			errorMessage,
+			isClientSide: false
 		};
 		const html = await store.config.onRenderHtml({
 			pageContext,

package/dist/vite.mjs

@@ -141,6 +141,8 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 			viteConfigRoot = config.root ? path.resolve(config.root) : process.cwd();
 			const { routes } = generateRoutes(viteConfigRoot, pagesDir);
 			hasAnyPrerender = prerender || routes.some((r) => r.prerender);
+			const serverInput = { index: VIRTUAL.entryServer };
+			if (hasAnyPrerender) serverInput.prerender = VIRTUAL.entryPrerender;
 			return {
 				appType: "custom",
 				ssr: { noExternal: [/^vike-lite(?:$|-)/] },
@@ -205,10 +207,7 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 						minify,
 						sourcemap,
 						rolldownOptions: {
-							input: hasAnyPrerender ? {
-								index: VIRTUAL.entryServer,
-								prerender: VIRTUAL.entryPrerender
-							} : { index: VIRTUAL.entryServer },
+							input: serverInput,
 							output: {
 								format: "esm",
 								entryFileNames: "[name].mjs",
@@ -295,57 +294,64 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 			}
 			if (id === RESOLVED.entryPrerender) return importSetup + `export{routes}from'${VIRTUAL.routes}';export{renderPage}from'vike-lite/server';`;
 		},
-		async closeBundle() {
-			if (!isProd || !hasAnyPrerender || this.environment.name !== "ssr") return;
-			const { pathToFileURL } = await import("node:url");
-			const { routes, renderPage } = await import(pathToFileURL(path.join(viteConfigRoot, outDir, "server/prerender.mjs")).href);
-			const urlsToPrerender = /* @__PURE__ */ new Set();
-			for (const route of routes) {
-				let shouldPrerender = prerender;
-				let dynamicUrls = [];
-				if (route.Prerender) {
-					const mod = await route.Prerender();
-					const prerenderFn = mod.default ?? mod.prerender;
-					const result = typeof prerenderFn === "function" ? await prerenderFn() : prerenderFn;
-					if (result === false) shouldPrerender = false;
-					else if (result === true) shouldPrerender = true;
-					else if (Array.isArray(result)) {
-						shouldPrerender = true;
-						dynamicUrls = result;
+		closeBundle: {
+			order: "pre",
+			async handler() {
+				if (!isProd || !hasAnyPrerender || this.environment.name !== "ssr") return;
+				const { pathToFileURL } = await import("node:url");
+				const prerenderPath = path.join(viteConfigRoot, outDir, "server/prerender.mjs");
+				const { routes, renderPage } = await import(pathToFileURL(prerenderPath).href);
+				try {
+					fs.unlinkSync(prerenderPath);
+				} catch {}
+				const urlsToPrerender = /* @__PURE__ */ new Set();
+				for (const route of routes) {
+					let shouldPrerender = prerender;
+					let dynamicUrls = [];
+					if (route.Prerender) {
+						const mod = await route.Prerender();
+						const prerenderFn = mod.default ?? mod.prerender;
+						const result = typeof prerenderFn === "function" ? await prerenderFn() : prerenderFn;
+						if (result === false) shouldPrerender = false;
+						else if (result === true) shouldPrerender = true;
+						else if (Array.isArray(result)) {
+							shouldPrerender = true;
+							dynamicUrls = result;
+						}
 					}
-				}
-				if (shouldPrerender) {
-					if (route.path.includes(":") && dynamicUrls.length === 0) {
-						console.warn(`⚠️ Skipping dynamic route ${route.path}: no URLs provided by +prerender. Return an array of URLs to prerender it.`);
-						continue;
+					if (shouldPrerender) {
+						if (route.path.includes(":") && dynamicUrls.length === 0) {
+							console.warn(`⚠️ Skipping dynamic route ${route.path}: no URLs provided by +prerender. Return an array of URLs to prerender it.`);
+							continue;
+						}
+						if (!route.path.includes(":")) urlsToPrerender.add(route.path);
+						for (const url of dynamicUrls) urlsToPrerender.add(url);
 					}
-					if (!route.path.includes(":")) urlsToPrerender.add(route.path);
-					for (const url of dynamicUrls) urlsToPrerender.add(url);
 				}
+				if (urlsToPrerender.size === 0) {
+					console.warn("⚠️ No static routes to generate: if you don't want to use SSG, in the 'vite.config' set the \"prerender\" option as \"false\" or remove it.");
+					return;
+				}
+				console.log("📦 Starting Static Site Generation (SSG)…");
+				const clientDir = path.join(viteConfigRoot, outDir, "client");
+				for (const urlPath of urlsToPrerender) {
+					const htmlRes = await renderPage(new Request(`http://localhost${baseUrl}${urlPath}`));
+					if (htmlRes.ok && htmlRes.headers.get("content-type")?.includes("text/html")) {
+						const outDirRoute = path.join(clientDir, urlPath === "/" ? "" : urlPath);
+						fs.mkdirSync(outDirRoute, { recursive: true });
+						fs.writeFileSync(path.join(outDirRoute, "index.html"), await htmlRes.text());
+					} else throw new Error(`❌ SSG HTML Error for "${urlPath}"`);
+					const jsonTarget = urlPath === "/" ? "/index" : urlPath;
+					const jsonRes = await renderPage(new Request(`http://localhost${baseUrl}${jsonTarget}.pageContext.json`));
+					if (jsonRes.ok) {
+						const jsonOutPath = path.join(clientDir, `${jsonTarget}.pageContext.json`);
+						fs.mkdirSync(path.dirname(jsonOutPath), { recursive: true });
+						fs.writeFileSync(jsonOutPath, await jsonRes.text());
+					} else throw new Error(`❌ SSG JSON Error for "${jsonTarget}"`);
+					console.log(`   → route ${urlPath}`);
+				}
+				console.log(`✨ SSG Completed! Generated ${urlsToPrerender.size} static routes`);
 			}
-			if (urlsToPrerender.size === 0) {
-				console.warn("⚠️ No static routes to generate: if you don't want to use SSG, in the 'vite.config' set the \"prerender\" option as \"false\" or remove it.");
-				return;
-			}
-			console.log("📦 Starting Static Site Generation (SSG)…");
-			const clientDir = path.join(viteConfigRoot, outDir, "client");
-			for (const urlPath of urlsToPrerender) {
-				const htmlRes = await renderPage(new Request(`http://localhost${baseUrl}${urlPath}`));
-				if (htmlRes.ok && htmlRes.headers.get("content-type")?.includes("text/html")) {
-					const outDirRoute = path.join(clientDir, urlPath === "/" ? "" : urlPath);
-					fs.mkdirSync(outDirRoute, { recursive: true });
-					fs.writeFileSync(path.join(outDirRoute, "index.html"), await htmlRes.text());
-				} else throw new Error(`❌ SSG HTML Error for "${urlPath}"`);
-				const jsonTarget = urlPath === "/" ? "/index" : urlPath;
-				const jsonRes = await renderPage(new Request(`http://localhost${baseUrl}${jsonTarget}.pageContext.json`));
-				if (jsonRes.ok) {
-					const jsonOutPath = path.join(clientDir, `${jsonTarget}.pageContext.json`);
-					fs.mkdirSync(path.dirname(jsonOutPath), { recursive: true });
-					fs.writeFileSync(jsonOutPath, await jsonRes.text());
-				} else throw new Error(`❌ SSG JSON Error for "${jsonTarget}"`);
-				console.log(`   → route ${urlPath}`);
-			}
-			console.log(`✨ SSG Completed! Generated ${urlsToPrerender.size} static routes`);
 		},
 		configureServer(server) {
 			return () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.15.18",
+  "version": "1.15.20",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -82,7 +82,7 @@
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
-    "tsdown": "^0.22.11",
+    "tsdown": "^0.22.12",
     "vite": "^8.1.5",
     "vitest": "^4.1.10"
   },