vike-lite 1.6.2 → 1.7.1

package/README.md

@@ -18,9 +18,10 @@ import vikeLite from 'vike-lite/vite'
 export default {
   plugins: [
     vikeLite({
-      pagesDir = 'pages', // default
-      serverEntry = 'server/index', // default
-      apiPrefix = '/api'  // default
+      pagesDir = 'pages', // Default
+      serverEntry = 'server/index', // Default
+      apiPrefix = '/api',  // Default
+      prerender = false // Default
     })
   ]
 } satisfies UserConfig

package/dist/__internal/server.d.mts

@@ -2,8 +2,8 @@ import { t as Config } from "../index-Dt5n1zWh.mjs";
 
 //#region src/server/store.d.ts
 interface VikeState {
-  routes: any[];
-  errorRoute: any | null;
+  routes: typeof import('virtual:routes')['routes'];
+  errorRoute: typeof import('virtual:routes')['errorRoute'] | null;
   config: Config | null;
   manifest: Manifest | undefined;
 }

package/dist/server.mjs

@@ -74,8 +74,8 @@ async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
 		urlPathname
 	};
 	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
-		route.data?.() ?? null,
-		route.title?.() ?? null,
+		route.Data?.() ?? null,
+		route.Title?.() ?? null,
 		isJsonRequest ? null : route.Page(),
 		isJsonRequest ? null : route.Head?.() ?? null,
 		isJsonRequest ? null : route.Layout?.() ?? null
@@ -137,7 +137,7 @@ async function renderErrorPage(req, status, urlPathname, error) {
 	}
 }
 async function renderPage(req) {
-	let pathname = new URL(req.url).pathname;
+	let { pathname } = new URL(req.url);
 	if (BASE_URL !== "/") {
 		const baseSlashed = BASE_URL.endsWith("/") ? BASE_URL : BASE_URL + "/";
 		const baseNoSlash = baseSlashed.slice(0, -1);

package/dist/vite.d.mts

@@ -4,7 +4,8 @@ import { Plugin } from "vite";
 declare function routerPlugin({
   pagesDir,
   serverEntry,
-  apiPrefix
+  apiPrefix,
+  prerender
 }?: {
   /**
    * The directory where your page components are located.
@@ -24,6 +25,11 @@ declare function routerPlugin({
    * @default '/api'
    */
   apiPrefix?: string;
+  /**
+   * Whether to prerender the pages.
+   * @default false
+   */
+  prerender?: boolean;
 }): Plugin;
 //#endregion
 export { routerPlugin as default };

package/dist/vite.mjs

@@ -4,6 +4,11 @@ import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
 import { loadEnv } from "vite";
 //#region src/utils/generateRoutes.ts
+const pageExtensions = [".ts", ".js"];
+const pageExtensionsX = [".tsx", ".jsx"];
+function findFile(files, basename, extensions) {
+	return files.find((file) => extensions.some((ext) => file === `${basename}${ext}`));
+}
 function generateRoutes(viteRoot, pagesDir) {
 	const pagesAbsPath = path.resolve(viteRoot, pagesDir);
 	if (!fs.existsSync(pagesAbsPath)) return { routes: [] };
@@ -12,15 +17,22 @@ function generateRoutes(viteRoot, pagesDir) {
 	function walk(dir, routePath, parentLayout, parentHead) {
 		const files = fs.readdirSync(dir);
 		const importPath = path.relative(viteRoot, dir).replaceAll("\\", "/");
-		const currentLayout = files.includes("+Layout.tsx") ? `${importPath}/+Layout.tsx` : parentLayout;
-		const currentHead = files.includes("+Head.tsx") ? `${importPath}/+Head.tsx` : parentHead;
-		if (files.includes("+Page.tsx")) {
+		const layoutFile = findFile(files, "+Layout", pageExtensionsX);
+		const currentLayout = layoutFile ? `${importPath}/${layoutFile}` : parentLayout;
+		const headFile = findFile(files, "+Head", pageExtensionsX);
+		const currentHead = headFile ? `${importPath}/${headFile}` : parentHead;
+		const pageFile = findFile(files, "+Page", pageExtensionsX);
+		if (pageFile) {
 			const route = {
 				path: routePath || "/",
-				page: `${importPath}/+Page.tsx`,
-				hasData: files.includes("+data.ts"),
-				hasTitle: files.includes("+title.ts")
+				page: `${importPath}/${pageFile}`
 			};
+			const dataFile = findFile(files, "+data", pageExtensions);
+			const titleFile = findFile(files, "+title", pageExtensions);
+			const prerenderFile = findFile(files, "+prerender", pageExtensions);
+			if (dataFile) route.data = `${importPath}/${dataFile}`;
+			if (titleFile) route.title = `${importPath}/${titleFile}`;
+			if (prerenderFile) route.prerender = `${importPath}/${prerenderFile}`;
 			if (currentLayout) route.layout = currentLayout;
 			if (currentHead) route.head = currentHead;
 			routes.push(route);
@@ -29,9 +41,10 @@ function generateRoutes(viteRoot, pagesDir) {
 			const fullPath = path.join(dir, file);
 			if (!fs.statSync(fullPath).isDirectory()) continue;
 			if (file === "_error") {
-				if (fs.readdirSync(fullPath).includes("+Page.tsx")) errorRoute = {
+				const errorPageFile = findFile(fs.readdirSync(fullPath), "+Page", pageExtensionsX);
+				if (errorPageFile) errorRoute = {
 					path: "_error",
-					page: `${importPath}/_error/+Page.tsx`,
+					page: `${importPath}/_error/${errorPageFile}`,
 					layout: currentLayout,
 					head: currentHead
 				};
@@ -85,7 +98,7 @@ async function injectFOUCStyles(server, html) {
 const SUPPORTED_RENDERERS = ["solid"];
 //#endregion
 //#region src/vite-plugin.ts
-function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPrefix = "/api" } = {}) {
+function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPrefix = "/api", prerender = false } = {}) {
 	const isProd = process.env.NODE_ENV === "production";
 	let viteConfigRoot;
 	let outDir;
@@ -172,10 +185,13 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 					code += `{path:'${r.path}',page:'${r.page}',Page:()=>import('/${r.page}'),`;
 					if (r.head) code += `head:'${r.head}',Head:()=>import('/${r.head}'),`;
 					if (r.layout) code += `layout:'${r.layout}',Layout:()=>import('/${r.layout}'),`;
-					code += `hasData:${r.hasData},hasTitle:${r.hasTitle},`;
+					if (r.data) code += `data:'${r.data}',`;
+					if (r.title) code += `title:'${r.title}',`;
+					if (r.prerender) code += `prerender:'${r.prerender}',`;
 					if (isSSR) {
-						if (r.hasData) code += `data:()=>import('/${r.page.replace("+Page.tsx", "+data.ts")}'),`;
-						if (r.hasTitle) code += `title:()=>import('/${r.page.replace("+Page.tsx", "+title.ts")}'),`;
+						if (r.data) code += `Data:()=>import('/${r.data}'),`;
+						if (r.title) code += `Title:()=>import('/${r.title}'),`;
+						if (r.prerender) code += `Prerender:()=>import('/${r.prerender}'),`;
 					}
 					code += "},";
 				}
@@ -220,11 +236,8 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 						break;
 					}
 				}
-				if (hasCustomServer) return `import '${virtualSetupId}';
-            export * from '${customServerPath}';
-            export { default } from '${customServerPath}';`;
-				return String.raw`import '${virtualSetupId}';
-import { renderPage } from 'vike-lite/server';
+				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);
@@ -313,11 +326,67 @@ if (process.env.NODE_ENV === 'production') {
   const { PORT } = process.env;
   const port = PORT ? Number.parseInt(PORT) : 3000;
   server.listen(port, () => {
-    console.log('\n\x1b[32m🚀 Server is running at http://localhost:' + port + '\x1b[0m\n');
+    console.log('\n\u{1B}[32m🚀 Server is running at http://localhost:' + port + '\u{1B}[0m\n');
   });
 }`;
 			}
 		},
+		async closeBundle() {
+			if (!prerender || !isProd || !import.meta.env.SSR) return;
+			await new Promise((resolve) => setTimeout(resolve, 500));
+			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 urlsToPrerender = /* @__PURE__ */ new Set();
+			for (const route of routes) {
+				let shouldPrerender = true;
+				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(":")) urlsToPrerender.add(route.path === "/" ? "/" : route.path);
+					for (const url of dynamicUrls) urlsToPrerender.add(url);
+				}
+			}
+			if (urlsToPrerender.size === 0) return;
+			console.log("\n\x1B[36m📦 Starting Static Site Generation (SSG)...\x1B[0m");
+			const base = process.env.BASE_URL || "/";
+			const baseNoSlash = base.endsWith("/") ? base.slice(0, -1) : base;
+			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 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`);
+				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 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`);
+				console.log(`\u{1B}[32m✓\u{1B}[0m Pre-rendered: ${urlPath}`);
+				generatedCount++;
+			}
+			console.log(`\n\u{1B}[32m✨ SSG Completed! Generated ${generatedCount} static routes.\u{1B}[0m\n`);
+		},
 		configureServer(server) {
 			return () => {
 				const pagesPath = path.resolve(viteConfigRoot, pagesDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.6.2",
+  "version": "1.7.1",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",
@@ -41,9 +41,9 @@
     "build": "tsdown"
   },
   "devDependencies": {
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.0",
     "tsdown": "^0.22.3",
-    "vite": "^8.1.0"
+    "vite": "^8.1.3"
   },
   "peerDependencies": {
     "vite": ">=8"