vike-lite 1.15.7 → 1.15.9

package/dist/__internal/client.d.mts

@@ -0,0 +1,6 @@
+//#region src/__internal/client.d.ts
+declare function createLinkClickHandler(onNavigate: (url: URL) => void): (e: MouseEvent) => void;
+declare function createLinkPrefetchHandler(onPrefetch: (url: URL) => void): (e: Event) => void;
+declare function finalizeNavigation(shouldScrollToTop: boolean): void;
+//#endregion
+export { createLinkClickHandler, createLinkPrefetchHandler, finalizeNavigation };

package/dist/__internal/client.mjs

@@ -0,0 +1,43 @@
+//#region src/__internal/client.ts
+function getClientSideUrl(target) {
+	if (!target?.href || target.target && target.target !== "_self" || target.hasAttribute("download") || target.hasAttribute("data-native") || target.getAttribute("rel")?.includes("external")) return null;
+	try {
+		const url = new URL(target.href, globalThis.location.href);
+		if (url.protocol !== "http:" && url.protocol !== "https:" || url.origin !== globalThis.location.origin) return null;
+		return url;
+	} catch {
+		return null;
+	}
+}
+function isSamePage(url) {
+	return url.pathname === globalThis.location.pathname && url.search === globalThis.location.search;
+}
+function createLinkClickHandler(onNavigate) {
+	return (e) => {
+		if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
+		const url = getClientSideUrl(e.target.closest("a"));
+		if (!url || isSamePage(url)) return;
+		e.preventDefault();
+		globalThis.history.pushState({ triggeredBy: "vike-lite" }, "", url.href);
+		onNavigate(url);
+	};
+}
+function createLinkPrefetchHandler(onPrefetch) {
+	return (e) => {
+		const url = getClientSideUrl(e.target.closest("a"));
+		if (!url || isSamePage(url)) return;
+		onPrefetch(url);
+	};
+}
+function finalizeNavigation(shouldScrollToTop) {
+	if (shouldScrollToTop) {
+		globalThis.scrollTo(0, 0);
+		shouldScrollToTop = false;
+	} else if (globalThis.location.hash) requestAnimationFrame(() => {
+		try {
+			document.querySelector(decodeURIComponent(globalThis.location.hash))?.scrollIntoView();
+		} catch {}
+	});
+}
+//#endregion
+export { createLinkClickHandler, createLinkPrefetchHandler, finalizeNavigation };

package/dist/__internal/server.d.mts

@@ -1,6 +1,6 @@
 //#region src/server/store.d.ts
 interface VikeState {
-  routes: typeof import('virtual:vike-lite/routes')['routes'];
+  routes: typeof import('virtual:vike-lite/routes')['routes'] | [];
   errorRoute: typeof import('virtual:vike-lite/routes')['errorRoute'] | null;
   config: typeof import('virtual:vike-lite/routes')['config'] | null;
   manifest: typeof import('virtual:vike-lite/client-manifest')['default'] | null;

package/dist/__internal/server.mjs

@@ -1,2 +1,2 @@
-import { n as store, t as setVikeState } from "../store-DPJQje-K.mjs";
+import { n as store, t as setVikeState } from "../store-BCs8gL_o.mjs";
 export { setVikeState, store };

package/dist/__internal/shared.d.mts

@@ -1,10 +1,4 @@
-//#region src/__internal/shared/matchRoute.d.ts
-declare function matchRoute(urlPathname: string, routes: typeof import('virtual:vike-lite/routes').routes): {
-  route: any;
-  routeParams: Record<string, string>;
-} | null;
-//#endregion
-//#region src/__internal/shared/index.d.ts
+//#region src/__internal/shared.d.ts
 interface RenderContext {
   pageContext: any;
   Page: unknown;
@@ -19,5 +13,11 @@ interface RenderContext {
   };
   nonce?: string;
 }
+declare function matchRoute(urlPathname: string, routes: typeof import('virtual:vike-lite/routes').routes): {
+  route: any;
+  routeParams: Record<string, string>;
+} | null;
+declare const BASE_URL: string;
+declare function stripBase(pathname: string): string;
 //#endregion
-export { RenderContext, matchRoute };
+export { BASE_URL, RenderContext, matchRoute, stripBase };

package/dist/__internal/shared.mjs

@@ -1,2 +1,54 @@
-import { t as matchRoute } from "../matchRoute-nTNPxoMq.mjs";
-export { matchRoute };
+//#region src/__internal/shared.ts
+const regexCache = /* @__PURE__ */ new Map();
+function escapeRegex(str) {
+	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+}
+function matchRoute(urlPathname, routes) {
+	for (const route of routes) {
+		if (!route.path.includes(":")) {
+			if (route.path === urlPathname || route.path + "/" === urlPathname) return {
+				route,
+				routeParams: {}
+			};
+			continue;
+		}
+		let compiled = regexCache.get(route.path);
+		if (!compiled) {
+			const paramNames = [];
+			const regexPath = route.path.split("/").map((segment) => {
+				if (segment.startsWith(":")) {
+					paramNames.push(segment.slice(1));
+					return "([^/]+)";
+				}
+				return escapeRegex(segment);
+			}).join("/");
+			compiled = {
+				regex: new RegExp(`^${regexPath}/?$`),
+				paramNames
+			};
+			regexCache.set(route.path, compiled);
+		}
+		const match = urlPathname.match(compiled.regex);
+		if (match) {
+			const routeParams = {};
+			for (let i = 0; i < compiled.paramNames.length; i++) routeParams[compiled.paramNames[i]] = decodeURIComponent(match[i + 1]);
+			return {
+				route,
+				routeParams
+			};
+		}
+	}
+	return null;
+}
+const BASE_URL = (() => {
+	const { BASE_URL } = import.meta.env;
+	return BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL;
+})();
+function stripBase(pathname) {
+	if (BASE_URL === "") return pathname;
+	if (pathname === BASE_URL) return "/";
+	if (pathname.startsWith(BASE_URL + "/")) return pathname.slice(BASE_URL.length);
+	return pathname;
+}
+//#endregion
+export { BASE_URL, matchRoute, stripBase };

package/dist/client/router.mjs

@@ -1,3 +1,4 @@
+import { BASE_URL } from "../__internal/shared.mjs";
 //#region src/client/router.ts
 /**
 * Change page programmatically on the client without reloading the browser.
@@ -7,10 +8,7 @@
 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("/")) {
-		const { BASE_URL } = import.meta.env;
-		finalUrl = (BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL) + (finalUrl === "/" ? "" : finalUrl);
-	}
+	if (finalUrl.startsWith("/")) finalUrl = BASE_URL + (finalUrl === "/" ? "" : finalUrl);
 	globalThis.history.pushState({ triggeredBy: "vike-lite" }, "", finalUrl);
 	globalThis.dispatchEvent(new CustomEvent("vike-navigate", { detail: {
 		keepScrollPosition: options?.keepScrollPosition,

package/dist/{server-BITt1YvS.mjs → server-CRcgzWMc.mjs}

@@ -1,6 +1,6 @@
-import { t as matchRoute } from "./matchRoute-nTNPxoMq.mjs";
+import { BASE_URL, matchRoute, stripBase } from "./__internal/shared.mjs";
 import { AbortRedirect, AbortRender } from "./server/abort.mjs";
-import { n as store } from "./store-DPJQje-K.mjs";
+import { n as store } from "./store-BCs8gL_o.mjs";
 //#region src/utils/serializeContext.ts
 const ESCAPE_LOOKUP = {
 	"&": String.raw`\u0026`,
@@ -17,8 +17,7 @@ function serializeContext(data) {
 //#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}`}`;
+	return `${BASE_URL === "" ? "" : BASE_URL}${file.startsWith("/") ? file : `/${file}`}`;
 }
 const assetsCache = /* @__PURE__ */ new WeakMap();
 function computeAssetFiles(route) {
@@ -160,12 +159,7 @@ async function renderErrorPage(req, status, urlPathname, error, nonce) {
 }
 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);
-	}
+	pathname = stripBase(pathname);
 	const isJsonRequest = pathname.endsWith(".pageContext.json");
 	let targetPathname = pathname;
 	if (isJsonRequest) {
@@ -197,7 +191,7 @@ async function renderPage(req, { nonce } = {}) {
 	} 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 (redirectUrl.startsWith("/")) redirectUrl = BASE_URL + (redirectUrl === "/" ? "" : redirectUrl);
 			if (isJsonRequest) return Response.json({ _redirect: redirectUrl }, { status: 200 });
 			return new Response(null, {
 				status: error.statusCode,

package/dist/server.mjs

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

package/dist/store-BCs8gL_o.mjs

@@ -0,0 +1,13 @@
+//#region src/server/store.ts
+const KEY = Symbol.for("vike-lite:store");
+const store = globalThis[KEY] ??= {
+	routes: [],
+	errorRoute: null,
+	config: null,
+	manifest: null
+};
+function setVikeState(newState) {
+	Object.assign(store, newState);
+}
+//#endregion
+export { store as n, setVikeState as t };

package/dist/vite.mjs

@@ -1,12 +1,13 @@
-import { t as renderPage } from "./server-BITt1YvS.mjs";
+import { BASE_URL } from "./__internal/shared.mjs";
+import { t as renderPage } from "./server-CRcgzWMc.mjs";
 import fs from "node:fs";
 import path from "node:path";
 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 = [
+const nonPageExtensions = [".ts", ".js"];
+const pageExtensions = [
 	".tsx",
 	".jsx",
 	".vue"
@@ -22,19 +23,19 @@ 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 layoutFile = findFile(files, "+Layout", pageExtensions);
 		const currentLayout = layoutFile ? `${importPath}/${layoutFile}` : parentLayout;
-		const headFile = findFile(files, "+Head", pageExtensionsX);
+		const headFile = findFile(files, "+Head", pageExtensions);
 		const currentHead = headFile ? `${importPath}/${headFile}` : parentHead;
-		const pageFile = findFile(files, "+Page", pageExtensionsX);
+		const pageFile = findFile(files, "+Page", pageExtensions);
 		if (pageFile) {
 			const route = {
 				path: routePath || "/",
 				page: `${importPath}/${pageFile}`
 			};
-			const dataFile = findFile(files, "+data", pageExtensions);
-			const titleFile = findFile(files, "+title", pageExtensions);
-			const prerenderFile = findFile(files, "+prerender", pageExtensions);
+			const dataFile = findFile(files, "+data", nonPageExtensions);
+			const titleFile = findFile(files, "+title", nonPageExtensions);
+			const prerenderFile = findFile(files, "+prerender", nonPageExtensions);
 			if (dataFile) route.data = `${importPath}/${dataFile}`;
 			if (titleFile) route.title = `${importPath}/${titleFile}`;
 			if (prerenderFile) route.prerender = `${importPath}/${prerenderFile}`;
@@ -46,7 +47,7 @@ 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);
+				const errorPageFile = findFile(fs.readdirSync(fullPath), "+Page", pageExtensions);
 				if (errorPageFile) errorRoute = {
 					path: "_error",
 					page: `${importPath}/_error/${errorPageFile}`,
@@ -322,19 +323,17 @@ function vikeLite({ pagesDir = "pages", apiPrefix = "/api", prerender = false, s
 			}
 			if (urlsToPrerender.size === 0) return;
 			console.log("[vike-lite] 📦 Starting Static Site Generation (SSG)…");
-			const { BASE_URL } = import.meta.env;
-			const baseNoSlash = BASE_URL.endsWith("/") ? BASE_URL.slice(0, -1) : BASE_URL;
 			let generatedCount = 0;
 			const clientDir = path.join(viteConfigRoot, outDir, "client");
 			for (const urlPath of urlsToPrerender) {
-				const htmlRes = await renderPage(new Request(`http://localhost${baseNoSlash}${urlPath}`));
+				const htmlRes = await renderPage(new Request(`http://localhost${BASE_URL}${urlPath}`));
 				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 throw new Error(`[vike-lite] ❌ SSG HTML Error for "${urlPath}"`);
 				const jsonTarget = urlPath === "/" ? "/index" : urlPath;
-				const jsonRes = await renderPage(new Request(`http://localhost${baseNoSlash}${jsonTarget}.pageContext.json`));
+				const jsonRes = await renderPage(new Request(`http://localhost${BASE_URL}${jsonTarget}.pageContext.json`));
 				if (jsonRes?.ok) {
 					const jsonOutPath = path.join(clientDir, `${jsonTarget}.pageContext.json`);
 					fs.mkdirSync(path.dirname(jsonOutPath), { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vike-lite",
-  "version": "1.15.7",
+  "version": "1.15.9",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -60,6 +60,10 @@
       "types": "./dist/__internal/shared.d.mts",
       "import": "./dist/__internal/shared.mjs"
     },
+    "./__internal/client": {
+      "types": "./dist/__internal/client.d.mts",
+      "import": "./dist/__internal/client.mjs"
+    },
     "./__internal/server": {
       "types": "./dist/__internal/server.d.mts",
       "import": "./dist/__internal/server.mjs"
@@ -74,7 +78,7 @@
   },
   "devDependencies": {
     "@types/node": "^26.1.1",
-    "tsdown": "^0.22.8",
+    "tsdown": "^0.22.9",
     "vite": "^8.1.5"
   },
   "peerDependencies": {

package/dist/matchRoute-nTNPxoMq.mjs

@@ -1,44 +0,0 @@
-//#region src/__internal/shared/matchRoute.ts
-const regexCache = /* @__PURE__ */ new Map();
-function escapeRegex(str) {
-	return str.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
-}
-function matchRoute(urlPathname, routes) {
-	for (const route of routes) {
-		if (!route.path.includes(":")) {
-			if (route.path === urlPathname || route.path + "/" === urlPathname) return {
-				route,
-				routeParams: {}
-			};
-			continue;
-		}
-		let compiled = regexCache.get(route.path);
-		if (!compiled) {
-			const paramNames = [];
-			const regexPath = route.path.split("/").map((segment) => {
-				if (segment.startsWith(":")) {
-					paramNames.push(segment.slice(1));
-					return "([^/]+)";
-				}
-				return escapeRegex(segment);
-			}).join("/");
-			compiled = {
-				regex: new RegExp(`^${regexPath}/?$`),
-				paramNames
-			};
-			regexCache.set(route.path, compiled);
-		}
-		const match = urlPathname.match(compiled.regex);
-		if (match) {
-			const routeParams = {};
-			for (let i = 0; i < compiled.paramNames.length; i++) routeParams[compiled.paramNames[i]] = decodeURIComponent(match[i + 1]);
-			return {
-				route,
-				routeParams
-			};
-		}
-	}
-	return null;
-}
-//#endregion
-export { matchRoute as t };

package/dist/store-DPJQje-K.mjs

@@ -1,20 +0,0 @@
-//#region src/server/store.ts
-const STORE_KEY = "_vike_lite";
-if (!Object.hasOwn(globalThis, STORE_KEY)) globalThis[STORE_KEY] = {
-	routes: [],
-	errorRoute: null,
-	config: null,
-	manifest: null
-};
-const store = new Proxy({}, {
-	get: (_, prop) => globalThis[STORE_KEY][prop],
-	set: (_, prop, value) => {
-		globalThis[STORE_KEY][prop] = value;
-		return true;
-	}
-});
-function setVikeState(newState) {
-	Object.assign(globalThis[STORE_KEY], newState);
-}
-//#endregion
-export { store as n, setVikeState as t };