vike-lite 1.1.1 → 1.1.3

package/dist/server.mjs

@@ -26,7 +26,7 @@ var AbortRender = class extends Error {
 //#endregion
 //#region src/server/renderPage.tsx
 const isProd = process.env.NODE_ENV === "production";
-function getAssets(pageModuleId) {
+function getAssets(route) {
 	if (!isProd) return {
 		cssLinks: "",
 		jsPreloads: "",
@@ -44,14 +44,16 @@ function getAssets(pageModuleId) {
 		if (visitedKeys.has(key)) return;
 		visitedKeys.add(key);
 		const chunk = manifest[key];
-		if (!chunk) throw new Error(`Asset not found in manifest for key: ${key}`);
 		jsFiles.add(chunk.file);
 		if (chunk.css) for (const css of chunk.css) cssFiles.add(css);
 		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp);
 	}
 	const virtualEntryClientKey = getVirtualEntryClientKey();
 	collectAssets(virtualEntryClientKey);
-	collectAssets(pageModuleId.replace("@/", ""));
+	const { page, layout, head } = route;
+	collectAssets(page.replace("@/", ""));
+	if (head) collectAssets(head.replace("@/", ""));
+	if (layout) collectAssets(layout.replace("@/", ""));
 	return {
 		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="/${href}">`).join(""),
 		jsPreloads: [...jsFiles].map((href) => `<link rel="modulepreload" href="/${href}">`).join(""),
@@ -119,7 +121,7 @@ async function renderErrorPage(req, status, urlPathname, error) {
 			Head: HeadModule ? HeadModule.Head ?? HeadModule.default : void 0,
 			pageTitleTag: `<title>${status === 404 ? "Page Not Found" : "Server Error"}</title>`,
 			serializedContext: serializeContext(pageContext),
-			assets: getAssets(store.errorRoute.page)
+			assets: getAssets(store.errorRoute)
 		});
 		return new Response(html, {
 			status,
@@ -147,14 +149,14 @@ async function renderPage(req) {
 		const { pageContext, route, PageModule, HeadModule, LayoutModule } = resolved;
 		if (isJsonRequest) return Response.json(pageContext);
 		const { default: onRenderHtml } = await store.config.onRenderHtml();
-		const html = await onRenderHtml({
+		const html = onRenderHtml({
 			pageContext,
 			Page: PageModule.Page ?? PageModule.default,
 			Head: HeadModule ? HeadModule.Head ?? HeadModule.default : void 0,
 			Layout: LayoutModule ? LayoutModule.Layout ?? LayoutModule.default : void 0,
 			pageTitleTag: pageContext.title ? `<title>${pageContext.title}</title>` : "",
 			serializedContext: serializeContext(pageContext),
-			assets: getAssets(route.page)
+			assets: getAssets(route)
 		});
 		return new Response(html, {
 			status: 200,

package/dist/vite.mjs

@@ -152,9 +152,10 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 				const isSSR = options.ssr;
 				let code = `import { onRenderHtml } from '${virtualAdapterId}';\nexport const config = { onRenderHtml };\nexport const routes = [\n`;
 				for (const r of routes) {
-					code += `{path:'${r.path}',page:'${r.page}',hasData:${r.hasData},hasTitle:${r.hasTitle},Page:()=>import('${r.page}'),`;
-					if (r.head) code += `Head:()=>import('${r.head}'),`;
-					if (r.layout) code += `Layout:()=>import('${r.layout}'),`;
+					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 (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")}'),`;
@@ -165,8 +166,8 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 				if (errorRoute) {
 					const e = errorRoute;
 					code += `export const errorRoute={path:'${e.path}',page:'${e.page}',Page:()=>import('${e.page}'),`;
-					if (e.layout) code += `Layout:()=>import('${e.layout}'),`;
-					if (e.head) code += `Head:()=>import('${e.head}'),`;
+					if (e.layout) code += `layout:'${e.layout}',Layout:()=>import('${e.layout}'),`;
+					if (e.head) code += `head:'${e.head}',Head:()=>import('${e.head}'),`;
 					code += "};\n";
 				} else code += "export const errorRoute=null;\n";
 				return code;

package/package.json

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