vike-lite 1.6.0 → 1.6.2

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: typeof import('virtual:routes')['routes'];
-  errorRoute: typeof import('virtual:routes')['errorRoute'] | null;
+  routes: any[];
+  errorRoute: any | 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

package/dist/vite.mjs

@@ -4,11 +4,6 @@ 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: [] };
@@ -17,20 +12,15 @@ function generateRoutes(viteRoot, pagesDir) {
 	function walk(dir, routePath, parentLayout, parentHead) {
 		const files = fs.readdirSync(dir);
 		const importPath = path.relative(viteRoot, dir).replaceAll("\\", "/");
-		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 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 route = {
 				path: routePath || "/",
-				page: `${importPath}/${pageFile}`
+				page: `${importPath}/+Page.tsx`,
+				hasData: files.includes("+data.ts"),
+				hasTitle: files.includes("+title.ts")
 			};
-			const dataFile = findFile(files, "+data", pageExtensions);
-			if (dataFile) route.data = `${importPath}/${dataFile}`;
-			const titleFile = findFile(files, "+title", pageExtensions);
-			if (titleFile) route.title = `${importPath}/${titleFile}`;
 			if (currentLayout) route.layout = currentLayout;
 			if (currentHead) route.head = currentHead;
 			routes.push(route);
@@ -39,10 +29,9 @@ function generateRoutes(viteRoot, pagesDir) {
 			const fullPath = path.join(dir, file);
 			if (!fs.statSync(fullPath).isDirectory()) continue;
 			if (file === "_error") {
-				const errorPageFile = findFile(fs.readdirSync(fullPath), "+Page", pageExtensionsX);
-				if (errorPageFile) errorRoute = {
+				if (fs.readdirSync(fullPath).includes("+Page.tsx")) errorRoute = {
 					path: "_error",
-					page: `${importPath}/_error/${errorPageFile}`,
+					page: `${importPath}/_error/+Page.tsx`,
 					layout: currentLayout,
 					head: currentHead
 				};
@@ -183,11 +172,10 @@ 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}'),`;
-					if (r.data) code += `data:'${r.data}',`;
-					if (r.title) code += `title:'${r.title}',`;
+					code += `hasData:${r.hasData},hasTitle:${r.hasTitle},`;
 					if (isSSR) {
-						if (r.data) code += `Data:()=>import('/${r.data}'),`;
-						if (r.title) code += `Title:()=>import('/${r.title}'),`;
+						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")}'),`;
 					}
 					code += "},";
 				}

package/package.json

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