vike-lite 1.13.1 → 1.13.2

package/dist/{server-Cm1ZA_Dp.mjs → server-GrGbl23a.mjs}

@@ -122,7 +122,6 @@ async function renderErrorPage(req, status, urlPathname, error, nonce) {
 	} else is500 = false;
 	if (!store.errorRoute) return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
 	try {
-		const { default: onRenderHtml } = await store.config.onRenderHtml();
 		const [PageModule, HeadModule, LayoutModule] = await Promise.all([
 			store.errorRoute.Page(),
 			store.errorRoute.Head?.() ?? null,
@@ -136,7 +135,7 @@ async function renderErrorPage(req, status, urlPathname, error, nonce) {
 			is500,
 			errorMessage
 		};
-		const html = await onRenderHtml({
+		const html = await store.config.onRenderHtml({
 			pageContext,
 			Page: PageModule.Page ?? PageModule.default,
 			Layout: LayoutModule ? LayoutModule.Layout ?? LayoutModule.default : void 0,
@@ -177,8 +176,7 @@ async function renderPage(req, { nonce } = {}) {
 		}
 		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 = await store.config.onRenderHtml({
 			pageContext,
 			Page: PageModule.Page ?? PageModule.default,
 			Head: HeadModule ? HeadModule.Head ?? HeadModule.default : void 0,

package/dist/server.mjs

@@ -1,2 +1,2 @@
-import { t as renderPage } from "./server-Cm1ZA_Dp.mjs";
+import { t as renderPage } from "./server-GrGbl23a.mjs";
 export { renderPage };

package/dist/vite.d.mts

@@ -1,5 +1,5 @@
 import { Plugin } from "vite";
-//#region src/vite-plugin.d.ts
+//#region src/vite/index.d.ts
 declare function routerPlugin({ pagesDir, serverEntry, apiPrefix, prerender }?: {
   /**
    * The directory where your page components are located.

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as renderPage } from "./server-Cm1ZA_Dp.mjs";
+import { t as renderPage } from "./server-GrGbl23a.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { Readable } from "node:stream";
@@ -98,7 +98,7 @@ async function injectFOUCStyles(server, html) {
 //#region src/config.ts
 const SUPPORTED_RENDERERS = ["solid"];
 //#endregion
-//#region src/vite-plugin.ts
+//#region src/vite/index.ts
 function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPrefix = "/api", prerender = false } = {}) {
 	const isProd = process.env.NODE_ENV === "production";
 	let viteConfigRoot;
@@ -107,7 +107,8 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 	const VIRTUAL = {
 		routes: "virtual:routes",
 		manifest: "virtual:client-manifest",
-		renderer: "virtual:vike-lite/renderer",
+		client: "virtual:vike-lite/client",
+		server: "virtual:vike-lite/server",
 		entryClient: "virtual:entry-client",
 		setup: "virtual:vike-lite/setup",
 		entryServer: "virtual:entry-server",
@@ -216,7 +217,7 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 			if (id === RESOLVED.routes) {
 				const { routes, errorRoute } = generateRoutes(viteConfigRoot, pagesDir);
 				const isSSR = options.ssr;
-				let code = `import { onRenderHtml } from '${VIRTUAL.renderer}';\nexport const config = { onRenderHtml };\nexport const routes = [\n`;
+				let code = `import { onRenderHtml } from '${VIRTUAL.server}';\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}'),`;
@@ -246,7 +247,7 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 				const manifestPath = path.join(viteConfigRoot, outDir, "client/.vite/manifest.json");
 				return `export default ${fs.readFileSync(manifestPath, "utf8")}`;
 			}
-			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.entryClient) return `import{routes,errorRoute}from'${VIRTUAL.routes}';import{onRenderClient}from'${VIRTUAL.client}';await (await onRenderClient()).default({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) {
@@ -263,94 +264,8 @@ function routerPlugin({ pagesDir = "pages", serverEntry = "server/index", apiPre
 					if (!serverEntryPath) throw new Error(`[vike-lite] serverEntry ${serverEntry} file not found`);
 					return `import '${VIRTUAL.setup}';export * from'${serverEntryPath}';export{default}from'${serverEntryPath}';`;
 				}
-				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');
-  const { pipeline } = await import('node:stream/promises');
-  const fs = await import('node:fs');
-  const path = await import('node:path');
-  const { fileURLToPath } = await import('node:url');
-  const __dirname = path.dirname(fileURLToPath(import.meta.url));
-  const clientDir = path.resolve(__dirname, '../client');
-  const MIME_TYPES = {
-    '.html': 'text/html; charset=utf-8',
-    '.js': 'text/javascript; charset=utf-8',
-    '.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',
-    '.webp': 'image/webp',
-    '.avif': 'image/avif',
-    '.woff': 'font/woff',
-    '.woff2': 'font/woff2',
-    '.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) => {
-    try {
-      const urlObj = new URL(req.url || '/', 'http://' + (req.headers.host || 'localhost'));
-      const pathname = urlObj.pathname;
-      let fileUrl = pathname;
-      if (BASE_URL !== '/' && pathname.startsWith(BASE_URL)) fileUrl = '/' + pathname.slice(BASE_URL.length);
-      if (fileUrl !== '/') {
-        const filePath = path.resolve(clientDir, '.' + fileUrl)
-        if (!filePath.startsWith(clientDir + path.sep)) {
-          res.statusCode = 403
-          res.end('Forbidden')
-          return
-        }
-        if (filePath.startsWith(clientDir) && fs.existsSync(filePath) && fs.statSync(filePath).isFile()) {
-          const ext = path.extname(filePath).toLowerCase();
-          const mimeType = MIME_TYPES[ext] || 'application/octet-stream';
-          res.setHeader('Content-Type', mimeType);
-          res.setHeader('Cache-Control', fileUrl.startsWith('/assets/') ? 'public, max-age=31536000, immutable' : 'public, max-age=0, must-revalidate')
-          fs.createReadStream(filePath).pipe(res);
-          return;
-        }
-      }
-      const headers = new Headers();
-      for (const [key, val] of Object.entries(req.headers)) {
-        if (Array.isArray(val)) val.forEach(v => headers.append(key, v));
-        else if (val) headers.set(key, val);
-      }
-      const { method } = req;
-      const init = { method, headers };
-      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 (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;
-      res.end('Internal Server Error');
-    }
-  });
-  const { PORT } = process.env;
-  const port = PORT ? Number.parseInt(PORT) : 3000;
-  server.listen(port, () => {
-    console.log('\n\u{1B}[32m🚀 Server is running at http://localhost:' + port + '\u{1B}[0m\n');
-  });
-}`;
+				const defaultServerEntry = fs.readFileSync(path.resolve(viteConfigRoot, "defaultServerEntry.mjs"), "utf8");
+				return `import '${VIRTUAL.setup}';` + defaultServerEntry;
 			}
 			if (id === RESOLVED.entryPrerender) return `import'${VIRTUAL.setup}';export{routes}from'${VIRTUAL.routes}';`;
 		},

package/package.json

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