vike-lite 1.11.0 → 1.12.0

package/dist/__internal/server.d.mts

@@ -1,11 +1,9 @@
-import { t as Config } from "../index-ZDN-jKX_.mjs";
-
 //#region src/server/store.d.ts
 interface VikeState {
   routes: typeof import('virtual:routes')['routes'];
   errorRoute: typeof import('virtual:routes')['errorRoute'] | null;
-  config: Config | null;
-  manifest: Manifest | undefined;
+  config: typeof import('virtual:routes')['config'] | null;
+  manifest: typeof import('virtual:client-manifest')['default'] | null;
 }
 declare const store: VikeState;
 declare function setVikeState(newState: Partial<VikeState>): void;

package/dist/__internal/server.mjs

@@ -1,2 +1,2 @@
-import { n as store, t as setVikeState } from "../store-CfUB1COP.mjs";
+import { n as store, t as setVikeState } from "../store-DPJQje-K.mjs";
 export { setVikeState, store };

package/dist/__internal/shared.d.mts

@@ -1,2 +1,23 @@
-import { n as RenderContext, r as matchRoute, t as Config } from "../index-ZDN-jKX_.mjs";
-export { Config, RenderContext, matchRoute };
+//#region src/__internal/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/__internal/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;
+  };
+  nonce?: string;
+}
+//#endregion
+export { RenderContext, matchRoute };

package/dist/client/router.d.mts

@@ -1,5 +1,4 @@
 import { PageContext } from "../index.mjs";
-
 //#region src/client/router.d.ts
 /**
  * Change page programmatically on the client without reloading the browser.

package/dist/index.d.mts

@@ -1,16 +1,26 @@
 //#region src/index.d.ts
-type PageContext<Data = unknown> = {
+type PageContextBase = {
   routeParams: Record<string, string>;
   urlOriginal: string;
   urlPathname: string;
-  data?: Data;
+  search: string;
   title?: string;
-  nonce?: string;
   is404?: boolean;
   is500?: boolean;
   errorMessage?: string;
 };
-type DataAsync<Data = unknown> = (pageContext: PageContext) => Promise<Data>;
-type DataSync<Data = unknown> = (pageContext: PageContext) => Data;
+type PageContext<Data = unknown> = PageContextBase & (unknown extends Data ? {
+  data?: Data;
+} : {
+  data: Data;
+});
+type PageContextServer<Data = unknown> = PageContext<Data> & {
+  isClientSide: false;
+  nonce?: string;
+};
+type PageContextClient = PageContextBase & {
+  isClientSide: true;
+  isHydration?: boolean;
+};
 //#endregion
-export { DataAsync, DataSync, PageContext };
+export { PageContext, PageContextClient, PageContextServer };

package/dist/server.d.mts

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

package/dist/server.mjs

@@ -1,7 +1,7 @@
 import { t as BASE_URL } from "./shared-DEpJkq09.mjs";
 import { t as matchRoute } from "./matchRoute-nTNPxoMq.mjs";
 import { AbortRedirect, AbortRender } from "./server/abort.mjs";
-import { n as store } from "./store-CfUB1COP.mjs";
+import { n as store } from "./store-DPJQje-K.mjs";
 //#region src/utils/serializeContext.ts
 const ESCAPE_LOOKUP = {
 	"&": String.raw`\u0026`,

package/dist/{store-CfUB1COP.mjs → store-DPJQje-K.mjs}

@@ -4,7 +4,7 @@ if (!Object.hasOwn(globalThis, STORE_KEY)) globalThis[STORE_KEY] = {
 	routes: [],
 	errorRoute: null,
 	config: null,
-	manifest: void 0
+	manifest: null
 };
 const store = new Proxy({}, {
 	get: (_, prop) => globalThis[STORE_KEY][prop],

package/dist/vite.d.mts

@@ -1,12 +1,6 @@
 import { Plugin } from "vite";
-
 //#region src/vite-plugin.d.ts
-declare function routerPlugin({
-  pagesDir,
-  serverEntry,
-  apiPrefix,
-  prerender
-}?: {
+declare function routerPlugin({ pagesDir, serverEntry, apiPrefix, prerender }?: {
   /**
    * The directory where your page components are located.
    * This is where the plugin will look for your page files to generate routes.
@@ -26,7 +20,8 @@ declare function routerPlugin({
    */
   apiPrefix?: string;
   /**
-   * Whether to prerender the pages.
+   * Whether to prerender the pages by default.
+   * Individual pages can override this via +prerender.ts.
    * @default false
    */
   prerender?: boolean;

package/dist/vite.mjs

@@ -102,17 +102,18 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 	const isProd = process.env.NODE_ENV === "production";
 	let viteConfigRoot;
 	let outDir;
-	const virtualModuleId = "virtual:routes";
-	const virtualManifestId = "virtual:client-manifest";
-	const virtualRendererId = "virtual:vike-lite/renderer";
-	const virtualEntryClientId = "virtual:entry-client";
-	const virtualSetupId = "virtual:vike-lite/setup";
-	const virtualEntryServerId = "virtual:entry-server";
-	const resolvedVirtualModuleId = "\0virtual:routes";
-	const resolvedVirtualManifestId = "\0virtual:client-manifest";
-	const resolvedVirtualEntryClientId = "\0virtual:entry-client";
-	const resolvedVirtualSetupId = "\0virtual:vike-lite/setup";
-	const resolvedVirtualEntryServerId = "\0virtual:entry-server";
+	let hasAnyPrerender;
+	const VIRTUAL = {
+		routes: "virtual:routes",
+		manifest: "virtual:client-manifest",
+		renderer: "virtual:vike-lite/renderer",
+		entryClient: "virtual:entry-client",
+		setup: "virtual:vike-lite/setup",
+		entryServer: "virtual:entry-server",
+		entryPrerender: "virtual:entry-prerender"
+	};
+	const VIRTUAL_VALUES = new Set(Object.values(VIRTUAL));
+	const RESOLVED = Object.fromEntries(Object.entries(VIRTUAL).map(([k, v]) => [k, `\0${v}`]));
 	return {
 		name: "vike-lite",
 		config(config, { mode }) {
@@ -120,6 +121,9 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 			for (const key in envVariables) if (process.env[key] === void 0) process.env[key] = envVariables[key];
 			outDir = config.build?.outDir ?? "dist";
 			const { emptyOutDir, minify = true, cssMinify = true, sourcemap } = config.build || {};
+			viteConfigRoot = config.root ? path.resolve(config.root) : process.cwd();
+			const { routes } = generateRoutes(viteConfigRoot, pagesDir);
+			hasAnyPrerender = prerender || routes.some((r) => r.prerender);
 			return {
 				appType: "custom",
 				ssr: { noExternal: [/^vike-lite(?:$|-)/] },
@@ -132,7 +136,7 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 						sourcemap,
 						manifest: true,
 						rolldownOptions: {
-							input: virtualEntryClientId,
+							input: VIRTUAL.entryClient,
 							output: {
 								format: "esm",
 								hoistTransitiveImports: false,
@@ -184,7 +188,10 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 						minify,
 						sourcemap,
 						rolldownOptions: {
-							input: virtualEntryServerId,
+							input: hasAnyPrerender ? {
+								index: VIRTUAL.entryServer,
+								prerender: VIRTUAL.entryPrerender
+							} : VIRTUAL.entryServer,
 							output: {
 								format: "esm",
 								entryFileNames: "index.mjs",
@@ -199,21 +206,16 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 			};
 		},
 		configResolved(config) {
-			viteConfigRoot = config.root;
 			if (!config.plugins.some((plugin) => plugin.name?.startsWith("vike-lite-") && SUPPORTED_RENDERERS.includes(plugin.name.replace("vike-lite-", "")))) throw new Error(`No UI renderer plugin found in 'vite.config': please install and configure one of ${SUPPORTED_RENDERERS.map((r) => `vike-lite-${r}`).join(", ")}`);
 		},
 		resolveId(id) {
-			if (id === virtualModuleId) return resolvedVirtualModuleId;
-			if (id === virtualManifestId) return resolvedVirtualManifestId;
-			if (id === virtualEntryClientId) return resolvedVirtualEntryClientId;
-			if (id === virtualSetupId) return resolvedVirtualSetupId;
-			if (id === virtualEntryServerId) return resolvedVirtualEntryServerId;
+			if (VIRTUAL_VALUES.has(id)) return "\0" + id;
 		},
 		async load(id, options) {
-			if (id === resolvedVirtualModuleId) {
+			if (id === RESOLVED.routes) {
 				const { routes, errorRoute } = generateRoutes(viteConfigRoot, pagesDir);
 				const isSSR = options.ssr;
-				let code = `import { onRenderHtml } from '${virtualRendererId}';\nexport const config = { onRenderHtml };\nexport const routes = [\n`;
+				let code = `import { onRenderHtml } from '${VIRTUAL.renderer}';\nexport const config = { onRenderHtml };\nexport const routes = [\n`;
 				for (const r of routes) {
 					code += `{path:'${r.path}',page:'${r.page}',Page:()=>import('/${r.page}'),`;
 					if (r.head) code += `head:'${r.head}',Head:()=>import('/${r.head}'),`;
@@ -238,44 +240,30 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 				} else code += "export const errorRoute=null;\n";
 				return code;
 			}
-			if (id === resolvedVirtualManifestId) {
+			if (id === RESOLVED.manifest) {
 				if (!isProd || !options?.ssr) return "export default {}";
 				const manifestPath = path.join(viteConfigRoot, outDir, "client/.vite/manifest.json");
 				return `export default ${fs.readFileSync(manifestPath, "utf8")}`;
 			}
-			if (id === resolvedVirtualEntryClientId) return `import { routes, errorRoute } from '${virtualModuleId}';
-          import { onRenderClient } from '${virtualRendererId}';
-          const { default: render } = await onRenderClient();
-          await render({ routes, errorRoute });`;
-			if (id === resolvedVirtualSetupId) return `import { routes, errorRoute, config } from '${virtualModuleId}';
-          import { setVikeState } from 'vike-lite/__internal/server';
-          let manifest;
-          if (process.env.NODE_ENV === 'production') {
-            manifest = (await import('${virtualManifestId}')).default;
-          }
-          setVikeState({ routes, errorRoute, config, manifest });`;
-			if (id === resolvedVirtualEntryServerId) {
-				let hasCustomServer = false;
-				let customServerPath = "";
+			if (id === RESOLVED.entryClient) return `import{routes,errorRoute}from'${VIRTUAL.routes}';import{onRenderClient}from'${VIRTUAL.renderer}';const{default:render}=await onRenderClient();await render({routes,errorRoute});`;
+			if (id === RESOLVED.setup) return `import{routes,errorRoute,config}from'${VIRTUAL.routes}';import{setVikeState}from'vike-lite/__internal/server';const manifest=process.env.NODE_ENV==='production'?(await import('${VIRTUAL.manifest}')).default:null;setVikeState({routes,errorRoute,config,manifest});`;
+			if (id === RESOLVED.entryServer) {
 				if (serverEntry) {
 					const basePath = path.resolve(viteConfigRoot, serverEntry);
+					let serverEntryPath = "";
 					for (const ext of [
 						".ts",
 						".js",
 						".mjs"
 					]) if (fs.existsSync(basePath + ext)) {
-						hasCustomServer = true;
-						customServerPath = (basePath + ext).replaceAll("\\", "/");
+						serverEntryPath = (basePath + ext).replaceAll("\\", "/");
 						break;
 					}
+					if (!serverEntryPath) throw new Error(`[vike-lite] serverEntry ${serverEntry} file not found!`);
+					return `import '${VIRTUAL.setup}';export * from'${serverEntryPath}';export{default}from'${serverEntryPath}';`;
 				}
-				if (hasCustomServer) return `import '${virtualSetupId}';` + (prerender ? `export{routes}from'${virtualModuleId}';` : "") + `export * from'${customServerPath}';export{default}from'${customServerPath}';`;
-				return `import '${virtualSetupId}';` + (prerender ? `export{routes}from'${virtualModuleId}';` : "") + `import { renderPage } from 'vike-lite/server';
-export default {
-  async fetch(request) {
-    return renderPage(request);
-  }
-};
+				return `import '${VIRTUAL.setup}';import{renderPage}from'vike-lite/server';
+export default{async fetch(request){return renderPage(request);}};
 if (process.env.NODE_ENV === 'production') {
   const { createServer } = await import('node:http');
   const { Readable } = await import('node:stream');
@@ -291,18 +279,27 @@ if (process.env.NODE_ENV === 'production') {
     '.mjs': 'text/javascript; charset=utf-8',
     '.css': 'text/css; charset=utf-8',
     '.json': 'application/json; charset=utf-8',
+    '.xml': 'application/xml',
+    '.txt': 'text/plain; charset=utf-8',
+    '.map': 'application/json; charset=utf-8',
     '.png': 'image/png',
     '.jpg': 'image/jpeg',
     '.jpeg': 'image/jpeg',
     '.gif': 'image/gif',
     '.svg': 'image/svg+xml',
     '.ico': 'image/x-icon',
-    '.webmanifest': 'application/manifest+json',
-    '.xml': 'application/xml',
-    '.txt': 'text/plain; charset=utf-8',
+    '.webp': 'image/webp',
+    '.avif': 'image/avif',
     '.woff': 'font/woff',
     '.woff2': 'font/woff2',
-    '.wasm': 'application/wasm'
+    '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
+    '.mp4': 'video/mp4',
+    '.webm': 'video/webm',
+    '.mp3': 'audio/mpeg',
+    '.pdf': 'application/pdf',
+    '.wasm': 'application/wasm',
+    '.webmanifest': 'application/manifest+json'
   };
   const { BASE_URL } = import.meta.env;
   const server = createServer(async (req, res) => {
@@ -334,22 +331,13 @@ if (process.env.NODE_ENV === 'production') {
       }
       const { method } = req;
       const init = { method, headers };
-      if (req.method === 'HEAD') {
-        res.end()
-        return
-      }
-      if (method !== 'GET' && method !== 'HEAD') {
-        init.body = Readable.toWeb(req);
-        init.duplex = 'half';
-      }
+      if (method !== 'GET' && method !== 'HEAD') { init.body = Readable.toWeb(req); init.duplex = 'half'; }
       const request = new Request(urlObj.href, init);
       const response = await renderPage(request);
       res.statusCode = response.status;
-      for (const [key, val] of response.headers) {
-        res.setHeader(key, val);
-      }
-      if (response.body) await pipeline(Readable.fromWeb(response.body), res);
-      else res.end();
+      for (const [key, val] of response.headers) res.setHeader(key, val);
+      if (method === 'HEAD' || !response.body) { await response.body?.cancel(); res.end(); return; }
+      try { await pipeline(Readable.fromWeb(response.body), res); } catch {}
     } catch (e) {
       console.error(e);
       res.statusCode = 500;
@@ -363,19 +351,19 @@ if (process.env.NODE_ENV === 'production') {
   });
 }`;
 			}
+			if (id === RESOLVED.entryPrerender) return `import'${VIRTUAL.setup}';export{routes}from'${VIRTUAL.routes}';`;
 		},
 		async closeBundle() {
-			if (!prerender || !isProd || !import.meta.env.SSR) return;
-			await new Promise((resolve) => setTimeout(resolve, 500));
+			if (!isProd || this.environment.name !== "ssr") return;
 			const { pathToFileURL } = await import("node:url");
-			const serverEntryPath = path.resolve(viteConfigRoot, outDir, "server/index.mjs");
-			if (!fs.existsSync(serverEntryPath)) return;
-			const serverModule = await import(pathToFileURL(serverEntryPath).href);
-			const app = serverModule.default;
-			const routes = serverModule.routes || [];
+			const prerenderPath = path.resolve(viteConfigRoot, outDir, "server/prerender.mjs");
+			if (!fs.existsSync(prerenderPath)) return;
+			const { routes } = await import(pathToFileURL(prerenderPath).href);
+			if (!routes) return;
+			const { renderPage } = await import("vike-lite/server");
 			const urlsToPrerender = /* @__PURE__ */ new Set();
 			for (const route of routes) {
-				let shouldPrerender = true;
+				let shouldPrerender = prerender;
 				let dynamicUrls = [];
 				if (route.Prerender) {
 					const mod = await route.Prerender();
@@ -389,7 +377,11 @@ if (process.env.NODE_ENV === 'production') {
 					}
 				}
 				if (shouldPrerender) {
-					if (!route.path.includes(":")) urlsToPrerender.add(route.path === "/" ? "/" : route.path);
+					if (route.path.includes(":") && dynamicUrls.length === 0) {
+						console.warn(`[vike-lite] ⚠️ 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);
 				}
 			}
@@ -400,21 +392,19 @@ if (process.env.NODE_ENV === 'production') {
 			let generatedCount = 0;
 			const clientDir = path.resolve(viteConfigRoot, outDir, "client");
 			for (const urlPath of urlsToPrerender) {
-				const htmlReq = new Request(`http://localhost${baseNoSlash}${urlPath}`);
-				const htmlRes = await app.fetch(htmlReq);
-				if (htmlRes.ok && htmlRes.headers.get("content-type")?.includes("text/html")) {
+				const htmlRes = await renderPage(new Request(`http://localhost${baseNoSlash}${urlPath}`));
+				if (htmlRes && 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 console.error(`\u{1B}[31m✖ SSG HTML Error for ${urlPath}\u{1B}[0m`);
+				} else throw new Error(`\u{1B}[31m✖ SSG HTML Error for ${urlPath}\u{1B}[0m`);
 				const jsonTarget = urlPath === "/" ? "/index" : urlPath;
-				const jsonReq = new Request(`http://localhost${baseNoSlash}${jsonTarget}.pageContext.json`);
-				const jsonRes = await app.fetch(jsonReq);
-				if (jsonRes.ok) {
+				const jsonRes = await renderPage(new Request(`http://localhost${baseNoSlash}${jsonTarget}.pageContext.json`));
+				if (jsonRes && jsonRes.ok) {
 					const jsonOutPath = path.join(clientDir, `${jsonTarget}.pageContext.json`);
 					fs.mkdirSync(path.dirname(jsonOutPath), { recursive: true });
 					fs.writeFileSync(jsonOutPath, await jsonRes.text());
-				} else console.error(`\u{1B}[31m✖ SSG JSON Error for ${jsonTarget}\u{1B}[0m`);
+				} else throw new Error(`\u{1B}[31m✖ SSG JSON Error for ${jsonTarget}\u{1B}[0m`);
 				console.log(`\u{1B}[32m✓\u{1B}[0m Pre-rendered: ${urlPath}`);
 				generatedCount++;
 			}
@@ -426,14 +416,14 @@ if (process.env.NODE_ENV === 'production') {
 				server.watcher.on("all", (event, file) => {
 					if (!((event === "add" || event === "unlink") && file.startsWith(pagesPath))) return;
 					for (const env of Object.values(server.environments)) {
-						const mod = env.moduleGraph.getModuleById(resolvedVirtualModuleId);
+						const mod = env.moduleGraph.getModuleById(RESOLVED.routes);
 						if (mod) env.moduleGraph.invalidateModule(mod);
 					}
 					server.ws.send({ type: "full-reload" });
 				});
 				server.middlewares.use(async (req, res, next) => {
 					try {
-						const { default: app } = await server.environments.ssr.runner.import(resolvedVirtualEntryServerId);
+						const { default: app } = await server.environments.ssr.runner.import(RESOLVED.entryServer);
 						const headers = new Headers();
 						for (const [key, value] of Object.entries(req.headers)) {
 							if (key.startsWith(":")) continue;
@@ -461,11 +451,15 @@ if (process.env.NODE_ENV === 'production') {
 							return;
 						}
 						for (const [key, value] of response.headers) res.setHeader(key, value);
-						if (!response.body) {
-							res.end();
+						if (req.method === "HEAD" || !response.body) {
+							await response.body?.cancel();
+							if (!res.destroyed && !res.closed) res.end();
+							return;
+						}
+						if (res.destroyed || res.closed) {
+							await response.body.cancel();
 							return;
 						}
-						if (res.destroyed || res.closed) return;
 						try {
 							await pipeline(Readable.fromWeb(response.body), res);
 						} catch {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",
@@ -49,9 +49,9 @@
     "build": "tsdown"
   },
   "devDependencies": {
-    "@types/node": "^26.1.0",
-    "tsdown": "^0.22.3",
-    "vite": "^8.1.3"
+    "@types/node": "^26.1.1",
+    "tsdown": "^0.22.4",
+    "vite": "^8.1.4"
   },
   "peerDependencies": {
     "vite": ">=8"

package/dist/index-ZDN-jKX_.d.mts

@@ -1,34 +0,0 @@
-//#region src/__internal/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/__internal/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;
-  };
-  nonce?: 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 };