vike-lite 1.12.0 → 1.13.0

package/dist/client/router.mjs

@@ -1,4 +1,3 @@
-import { t as BASE_URL } from "../shared-DEpJkq09.mjs";
 //#region src/client/router.ts
 /**
 * Change page programmatically on the client without reloading the browser.
@@ -8,7 +7,10 @@ import { t as BASE_URL } from "../shared-DEpJkq09.mjs";
 function navigate(url, options) {
 	if (typeof globalThis === "undefined") throw new Error("navigate() can only be called on the client side.");
 	let finalUrl = url;
-	if (finalUrl.startsWith("/")) finalUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (finalUrl === "/" ? "" : finalUrl);
+	if (finalUrl.startsWith("/")) {
+		const { BASE_URL } = import.meta.env;
+		finalUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (finalUrl === "/" ? "" : finalUrl);
+	}
 	globalThis.history.pushState({ triggeredBy: "vike-lite" }, "", finalUrl);
 	globalThis.dispatchEvent(new CustomEvent("vike-navigate", { detail: {
 		keepScrollPosition: options?.keepScrollPosition,

package/dist/server-Cm1ZA_Dp.mjs

@@ -0,0 +1,220 @@
+import { t as matchRoute } from "./matchRoute-nTNPxoMq.mjs";
+import { AbortRedirect, AbortRender } from "./server/abort.mjs";
+import { n as store } from "./store-DPJQje-K.mjs";
+//#region src/utils/serializeContext.ts
+const ESCAPE_LOOKUP = {
+	"&": String.raw`\u0026`,
+	">": String.raw`\u003e`,
+	"<": String.raw`\u003c`,
+	"\u2028": String.raw`\u2028`,
+	"\u2029": String.raw`\u2029`
+};
+const ESCAPE_REGEX = /[&><\u{2028}\u{2029}]/gu;
+function serializeContext(data) {
+	return JSON.stringify(data).replaceAll(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
+}
+//#endregion
+//#region src/server/renderPage.ts
+const isProd = process.env.NODE_ENV === "production";
+function withBase(file) {
+	const { BASE_URL } = import.meta.env;
+	return `${BASE_URL === "/" ? "" : BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL}${file.startsWith("/") ? file : `/${file}`}`;
+}
+const assetsCache = /* @__PURE__ */ new WeakMap();
+function getAssets(route, nonce) {
+	if (!isProd) return computeAssets(route, nonce);
+	const nonceKey = nonce || "";
+	let routeCache = assetsCache.get(route);
+	if (!routeCache) {
+		routeCache = /* @__PURE__ */ new Map();
+		assetsCache.set(route, routeCache);
+	}
+	let assets = routeCache.get(nonceKey);
+	if (!assets) {
+		assets = computeAssets(route, nonce);
+		routeCache.set(nonceKey, assets);
+	}
+	return assets;
+}
+function computeAssets(route, nonce) {
+	if (!isProd) return {
+		cssLinks: "",
+		jsPreloads: "",
+		entryClient: withBase("@id/virtual:entry-client")
+	};
+	const cssFiles = /* @__PURE__ */ new Set();
+	const jsFiles = /* @__PURE__ */ new Map();
+	const { manifest } = store;
+	function getVirtualEntryClientKey() {
+		for (const key in manifest) if (manifest[key].isEntry) return key;
+		throw new Error("entry-client not found in manifest");
+	}
+	function collectAssets(key, isCritical) {
+		const chunk = manifest[key];
+		if (!chunk) return;
+		const current = jsFiles.get(chunk.file);
+		if (current === true) return;
+		if (current === false && !isCritical) return;
+		jsFiles.set(chunk.file, isCritical);
+		if (chunk.css) for (const css of chunk.css) cssFiles.add(css);
+		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp, false);
+	}
+	const virtualEntryClientKey = getVirtualEntryClientKey();
+	collectAssets(virtualEntryClientKey, true);
+	const { page, layout, head } = route;
+	collectAssets(page, true);
+	if (head) collectAssets(head, true);
+	if (layout) collectAssets(layout, true);
+	const criticalJs = [];
+	const sharedJs = [];
+	for (const [file, isCritical] of jsFiles) (isCritical ? criticalJs : sharedJs).push(file);
+	const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
+	return {
+		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="${withBase(href)}"${nonceAttr}>`).join(""),
+		jsPreloads: [...criticalJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin fetchpriority="high"${nonceAttr}>`), ...sharedJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin${nonceAttr}>`)].join(""),
+		entryClient: withBase(manifest[virtualEntryClientKey].file)
+	};
+}
+async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
+	const matched = matchRoute(urlPathname, store.routes);
+	if (!matched) return null;
+	const { route, routeParams } = matched;
+	const pageContext = {
+		routeParams,
+		urlOriginal,
+		urlPathname
+	};
+	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
+		route.Data?.() ?? null,
+		route.Title?.() ?? null,
+		isJsonRequest ? null : route.Page(),
+		isJsonRequest ? null : route.Head?.() ?? null,
+		isJsonRequest ? null : route.Layout?.() ?? null
+	]);
+	if (dataMod) try {
+		pageContext.data = await (dataMod.data ?? dataMod.default)(pageContext);
+	} catch (error) {
+		console.error("+data hook failed at:", urlPathname);
+		throw error;
+	}
+	if (titleMod) try {
+		const titleFn = titleMod.title ?? titleMod.default;
+		pageContext.title = typeof titleFn === "function" ? titleFn(pageContext) : titleFn;
+	} catch (error) {
+		console.error("+title hook failed at:", urlPathname);
+		throw error;
+	}
+	return {
+		pageContext,
+		route,
+		PageModule,
+		HeadModule,
+		LayoutModule
+	};
+}
+async function renderErrorPage(req, status, urlPathname, error, nonce) {
+	let errorMessage;
+	let is500;
+	if (status === 500) {
+		console.error(`[vike-lite] Server Error:`, error);
+		errorMessage = isProd ? "Internal Server Error" : error instanceof Error ? error.message : "Unknown error";
+		is500 = true;
+	} 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,
+			store.errorRoute.Layout?.() ?? null
+		]);
+		const pageContext = {
+			urlOriginal: req.url,
+			urlPathname,
+			routeParams: {},
+			is404: status === 404,
+			is500,
+			errorMessage
+		};
+		const html = await onRenderHtml({
+			pageContext,
+			Page: PageModule.Page ?? PageModule.default,
+			Layout: LayoutModule ? LayoutModule.Layout ?? LayoutModule.default : void 0,
+			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, nonce),
+			nonce
+		});
+		return new Response(html, {
+			status,
+			headers: { "Content-Type": "text/html" }
+		});
+	} catch (renderError) {
+		console.error("[vike-lite] Error page render failed:", renderError);
+		return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
+	}
+}
+async function renderPage(req, { nonce } = {}) {
+	let { pathname } = new URL(req.url);
+	const { BASE_URL } = import.meta.env;
+	if (BASE_URL !== "/") {
+		const baseSlashed = BASE_URL.endsWith("/") ? BASE_URL : BASE_URL + "/";
+		const baseNoSlash = baseSlashed.slice(0, -1);
+		pathname = pathname === baseNoSlash ? "/" : pathname.slice(baseSlashed.length - 1);
+	}
+	const isJsonRequest = pathname.endsWith(".pageContext.json");
+	let targetPathname = pathname;
+	if (isJsonRequest) {
+		targetPathname = targetPathname.replace(/\.pageContext\.json$/, "");
+		if (targetPathname === "/index") targetPathname = "/";
+	}
+	try {
+		const resolved = await buildPageContext(targetPathname, req.url, isJsonRequest);
+		if (!resolved) {
+			if (isJsonRequest) return Response.json({ is404: true }, { status: 404 });
+			return renderErrorPage(req, 404, targetPathname, 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({
+			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, nonce),
+			nonce
+		});
+		return new Response(html, {
+			status: 200,
+			headers: { "Content-Type": "text/html" }
+		});
+	} catch (error) {
+		if (error instanceof AbortRedirect) {
+			let redirectUrl = error.url;
+			if (redirectUrl.startsWith("/")) redirectUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (redirectUrl === "/" ? "" : redirectUrl);
+			if (isJsonRequest) return Response.json({ _redirect: redirectUrl }, { status: 200 });
+			return new Response(null, {
+				status: error.statusCode,
+				headers: { Location: redirectUrl }
+			});
+		}
+		if (error instanceof AbortRender) {
+			if (isJsonRequest) return Response.json({
+				is404: error.statusCode === 404,
+				is500: error.statusCode >= 500,
+				isError: true,
+				reason: error.reason
+			}, { status: error.statusCode });
+			return renderErrorPage(req, error.statusCode, targetPathname, error.reason, nonce);
+		}
+		console.error("Render Error:", error);
+		if (isJsonRequest) return Response.json({ is500: true }, { status: 500 });
+		return renderErrorPage(req, 500, targetPathname, error, nonce);
+	}
+}
+//#endregion
+export { renderPage as t };

package/dist/server.mjs

@@ -1,196 +1,2 @@
-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-DPJQje-K.mjs";
-//#region src/utils/serializeContext.ts
-const ESCAPE_LOOKUP = {
-	"&": String.raw`\u0026`,
-	">": String.raw`\u003e`,
-	"<": String.raw`\u003c`,
-	"\u2028": String.raw`\u2028`,
-	"\u2029": String.raw`\u2029`
-};
-const ESCAPE_REGEX = /[&><\u{2028}\u{2029}]/gu;
-function serializeContext(data) {
-	return JSON.stringify(data).replaceAll(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match]);
-}
-//#endregion
-//#region src/server/renderPage.ts
-const isProd = process.env.NODE_ENV === "production";
-function withBase(file) {
-	return `${BASE_URL.replace(/\/$/, "")}/${file.replace(/^\//, "")}`;
-}
-function getAssets(route, nonce) {
-	if (!isProd) return {
-		cssLinks: "",
-		jsPreloads: "",
-		entryClient: withBase("@id/virtual:entry-client")
-	};
-	const cssFiles = /* @__PURE__ */ new Set();
-	const jsFiles = /* @__PURE__ */ new Map();
-	const { manifest } = store;
-	function getVirtualEntryClientKey() {
-		for (const key in manifest) if (manifest[key].isEntry) return key;
-		throw new Error("entry-client not found in manifest");
-	}
-	function collectAssets(key, isCritical) {
-		const chunk = manifest[key];
-		if (!chunk) return;
-		const current = jsFiles.get(chunk.file);
-		if (current === true) return;
-		if (current === false && !isCritical) return;
-		jsFiles.set(chunk.file, isCritical);
-		if (chunk.css) for (const css of chunk.css) cssFiles.add(css);
-		if (chunk.imports) for (const imp of chunk.imports) collectAssets(imp, false);
-	}
-	const virtualEntryClientKey = getVirtualEntryClientKey();
-	collectAssets(virtualEntryClientKey, true);
-	const { page, layout, head } = route;
-	collectAssets(page, true);
-	if (head) collectAssets(head, true);
-	if (layout) collectAssets(layout, true);
-	const criticalJs = [];
-	const sharedJs = [];
-	for (const [file, isCritical] of jsFiles) (isCritical ? criticalJs : sharedJs).push(file);
-	const nonceAttr = nonce ? ` nonce="${nonce}"` : "";
-	return {
-		cssLinks: [...cssFiles].map((href) => `<link rel="stylesheet" href="${withBase(href)}"${nonceAttr}>`).join(""),
-		jsPreloads: [...criticalJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin fetchpriority="high"${nonceAttr}>`), ...sharedJs.map((href) => `<link rel="modulepreload" href="${withBase(href)}" crossorigin${nonceAttr}>`)].join(""),
-		entryClient: withBase(manifest[virtualEntryClientKey].file)
-	};
-}
-async function buildPageContext(urlPathname, urlOriginal, isJsonRequest) {
-	const matched = matchRoute(urlPathname, store.routes);
-	if (!matched) return null;
-	const { route, routeParams } = matched;
-	const pageContext = {
-		routeParams,
-		urlOriginal,
-		urlPathname
-	};
-	const [dataMod, titleMod, PageModule, HeadModule, LayoutModule] = await Promise.all([
-		route.Data?.() ?? null,
-		route.Title?.() ?? null,
-		isJsonRequest ? null : route.Page(),
-		isJsonRequest ? null : route.Head?.() ?? null,
-		isJsonRequest ? null : route.Layout?.() ?? null
-	]);
-	if (dataMod) try {
-		pageContext.data = await (dataMod.data ?? dataMod.default)(pageContext);
-	} catch (error) {
-		console.error("+data hook failed at:", urlPathname);
-		throw error;
-	}
-	if (titleMod) try {
-		const titleFn = titleMod.title ?? titleMod.default;
-		pageContext.title = typeof titleFn === "function" ? titleFn(pageContext) : titleFn;
-	} catch (error) {
-		console.error("+title hook failed at:", urlPathname);
-		throw error;
-	}
-	return {
-		pageContext,
-		route,
-		PageModule,
-		HeadModule,
-		LayoutModule
-	};
-}
-async function renderErrorPage(req, status, urlPathname, error, nonce) {
-	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,
-			store.errorRoute.Layout?.() ?? null
-		]);
-		const pageContext = {
-			urlOriginal: req.url,
-			urlPathname,
-			routeParams: {},
-			is404: status === 404,
-			is500: status === 500,
-			errorMessage: status === 500 && error instanceof Error ? error.message : void 0
-		};
-		const html = await onRenderHtml({
-			pageContext,
-			Page: PageModule.Page ?? PageModule.default,
-			Layout: LayoutModule ? LayoutModule.Layout ?? LayoutModule.default : void 0,
-			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, nonce),
-			nonce
-		});
-		return new Response(html, {
-			status,
-			headers: { "Content-Type": "text/html" }
-		});
-	} catch (renderError) {
-		console.error("Error page render failed:", renderError);
-		return new Response(status === 404 ? "Not Found" : "Internal Server Error", { status });
-	}
-}
-async function renderPage(req, { nonce } = {}) {
-	let { pathname } = new URL(req.url);
-	if (BASE_URL !== "/") {
-		const baseSlashed = BASE_URL.endsWith("/") ? BASE_URL : BASE_URL + "/";
-		const baseNoSlash = baseSlashed.slice(0, -1);
-		pathname = pathname === baseNoSlash ? "/" : pathname.slice(baseSlashed.length - 1);
-	}
-	const isJsonRequest = pathname.endsWith(".pageContext.json");
-	let targetPathname = pathname;
-	if (isJsonRequest) {
-		targetPathname = targetPathname.replace(/\.pageContext\.json$/, "");
-		if (targetPathname === "/index") targetPathname = "/";
-	}
-	try {
-		const resolved = await buildPageContext(targetPathname, req.url, isJsonRequest);
-		if (!resolved) {
-			if (isJsonRequest) return Response.json({ is404: true }, { status: 404 });
-			return renderErrorPage(req, 404, targetPathname, 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({
-			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, nonce),
-			nonce
-		});
-		return new Response(html, {
-			status: 200,
-			headers: { "Content-Type": "text/html" }
-		});
-	} catch (error) {
-		if (error instanceof AbortRedirect) {
-			let redirectUrl = error.url;
-			if (redirectUrl.startsWith("/")) redirectUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (redirectUrl === "/" ? "" : redirectUrl);
-			if (isJsonRequest) return Response.json({ _redirect: redirectUrl }, { status: 200 });
-			return new Response(null, {
-				status: error.statusCode,
-				headers: { Location: redirectUrl }
-			});
-		}
-		if (error instanceof AbortRender) {
-			if (isJsonRequest) return Response.json({
-				is404: error.statusCode === 404,
-				is500: error.statusCode >= 500,
-				isError: true,
-				reason: error.reason
-			}, { status: error.statusCode });
-			return renderErrorPage(req, error.statusCode, targetPathname, error.reason, nonce);
-		}
-		console.error("Render Error:", error);
-		if (isJsonRequest) return Response.json({ is500: true }, { status: 500 });
-		return renderErrorPage(req, 500, targetPathname, error, nonce);
-	}
-}
-//#endregion
+import { t as renderPage } from "./server-Cm1ZA_Dp.mjs";
 export { renderPage };

package/dist/vite.mjs

@@ -1,3 +1,4 @@
+import { t as renderPage } from "./server-Cm1ZA_Dp.mjs";
 import fs from "node:fs";
 import path from "node:path";
 import { Readable } from "node:stream";
@@ -360,7 +361,6 @@ if (process.env.NODE_ENV === 'production') {
 			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 = prerender;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.12.0",
+  "version": "1.13.0",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.mjs",
@@ -46,6 +46,7 @@
     "dist"
   ],
   "scripts": {
+    "tsc": "tsc --noEmit",
     "build": "tsdown"
   },
   "devDependencies": {

package/dist/shared-DEpJkq09.mjs

@@ -1,4 +0,0 @@
-//#region src/shared/index.ts
-const { BASE_URL } = import.meta.env;
-//#endregion
-export { BASE_URL as t };