vike-lite 1.15.8 → 1.15.9

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-DSrh6B3f.mjs → server-CRcgzWMc.mjs}

@@ -1,4 +1,4 @@
-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-BCs8gL_o.mjs";
 //#region src/utils/serializeContext.ts
@@ -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-DSrh6B3f.mjs";
+import { t as renderPage } from "./server-CRcgzWMc.mjs";
 export { renderPage };

package/dist/vite.mjs

@@ -1,4 +1,5 @@
-import { t as renderPage } from "./server-DSrh6B3f.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";
@@ -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.8",
+  "version": "1.15.9",
   "license": "MIT",
   "repository": {
     "type": "git",

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 };