nitro-nightly 3.0.1-20251209-203952-cd9c2915 → 3.0.1-20251210-091123-c1787f75

package/dist/_presets.mjs

@@ -1359,6 +1359,10 @@ const stormkit = defineNitroPreset({
 });
 var preset_default$22 = [stormkit];
 
+//#endregion
+//#region src/presets/vercel/runtime/isr.ts
+const ISR_URL_PARAM = "__isr_route";
+
 //#endregion
 //#region src/presets/vercel/utils.ts
 const SUPPORTED_NODE_VERSIONS = [20, 22];
@@ -1439,17 +1443,17 @@ function generateBuildConfig(nitro, o11Routes) {
 	});
 	if (nitro.options.static) return config;
 	config.routes.push(...nitro.options.routeRules["/"]?.isr ? [{
-		src: "(?<url>/)",
-		dest: `/index${ISR_SUFFIX}?url=$url`
+		src: `(?<${ISR_URL_PARAM}>/)`,
+		dest: `/index${ISR_SUFFIX}?${ISR_URL_PARAM}=$${ISR_URL_PARAM}`
 	}] : [], ...rules.filter(([key, value]) => value.isr !== void 0 && key !== "/").map(([key, value]) => {
-		const src = key.replace(/^(.*)\/\*\*/, "(?<url>$1/.*)");
+		const src = `(?<${ISR_URL_PARAM}>${normalizeRouteSrc(key)})`;
 		if (value.isr === false) return {
 			src,
 			dest: FALLBACK_ROUTE
 		};
 		return {
 			src,
-			dest: withLeadingSlash(normalizeRouteDest(key) + ISR_SUFFIX + "?url=$url")
+			dest: withLeadingSlash(normalizeRouteDest(key) + ISR_SUFFIX + `?${ISR_URL_PARAM}=$${ISR_URL_PARAM}`)
 		};
 	}), ...(o11Routes || []).map((route) => ({
 		src: joinURL(nitro.options.baseURL, route.src),
@@ -1549,6 +1553,7 @@ async function writePrerenderConfig(filename, isrConfig, bypassToken) {
 		bypassToken,
 		...isrConfig
 	};
+	if (prerenderConfig.allowQuery && !prerenderConfig.allowQuery.includes(ISR_URL_PARAM)) prerenderConfig.allowQuery.push(ISR_URL_PARAM);
 	await writeFile$1(filename, JSON.stringify(prerenderConfig, null, 2));
 }
 

package/dist/presets/vercel/runtime/isr.d.mts

@@ -0,0 +1,2 @@
+export declare const ISR_URL_PARAM = "__isr_route";
+export declare function isrRouteRewrite(reqUrl: string, xNowRouteMatches: string | null): [pathname: string, search: string] | undefined;

package/dist/presets/vercel/runtime/isr.mjs

@@ -0,0 +1,19 @@
+export const ISR_URL_PARAM = "__isr_route";
+export function isrRouteRewrite(reqUrl, xNowRouteMatches) {
+	if (xNowRouteMatches) {
+		const isrURL = new URLSearchParams(xNowRouteMatches).get(ISR_URL_PARAM);
+		if (isrURL) {
+			return [decodeURIComponent(isrURL), ""];
+		}
+	} else {
+		const queryIndex = reqUrl.indexOf("?");
+		if (queryIndex !== -1) {
+			const params = new URLSearchParams(reqUrl.slice(queryIndex + 1));
+			const isrURL = params.get(ISR_URL_PARAM);
+			if (isrURL) {
+				params.delete(ISR_URL_PARAM);
+				return [decodeURIComponent(isrURL), params.toString()];
+			}
+		}
+	}
+}

package/dist/presets/vercel/runtime/vercel.node.mjs

@@ -1,14 +1,16 @@
 import "#nitro-internal-polyfills";
 import { toNodeHandler } from "srvx/node";
-import { useNitroApp } from "nitro/app";
+import { useNitroApp, getRouteRules } from "nitro/app";
+import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 const handler = toNodeHandler(nitroApp.fetch);
 export default function nodeHandler(req, res) {
-	const query = req.headers["x-now-route-matches"];
-	if (query) {
-		const url = new URLSearchParams(query).get("url");
-		if (url) {
-			req.url = decodeURIComponent(url);
+	// ISR route rewrite
+	const isrURL = isrRouteRewrite(req.url, req.headers["x-now-route-matches"]);
+	if (isrURL) {
+		const { routeRules } = getRouteRules("", isrURL[0]);
+		if (routeRules?.isr) {
+			req.url = isrURL[0] + (isrURL[1] ? `?${isrURL[1]}` : "");
 		}
 	}
 	return handler(req, res);

package/dist/presets/vercel/runtime/vercel.web.mjs

@@ -1,14 +1,14 @@
 import "#nitro-internal-polyfills";
-import { useNitroApp } from "nitro/app";
+import { useNitroApp, getRouteRules } from "nitro/app";
+import { isrRouteRewrite } from "./isr.mjs";
 const nitroApp = useNitroApp();
 export default { fetch(req, context) {
-	// Check for ISR request
-	const query = req.headers.get("x-now-route-matches");
-	if (query) {
-		const urlParam = new URLSearchParams(query).get("url");
-		if (urlParam) {
-			const url = new URL(decodeURIComponent(urlParam), req.url).href;
-			req = new Request(url, req);
+	// ISR route rewrite
+	const isrURL = isrRouteRewrite(req.url, req.headers.get("x-now-route-matches"));
+	if (isrURL) {
+		const { routeRules } = getRouteRules("", isrURL[0]);
+		if (routeRules?.isr) {
+			req = new Request(new URL(isrURL[0] + (isrURL[1] ? `?${isrURL[1]}` : ""), req.url).href, req);
 		}
 	}
 	// srvx compatibility

package/dist/runtime/app.d.mts

@@ -1 +1 @@
-export { useNitroApp, useNitroHooks, serverFetch, fetch } from "./internal/app.mjs";
+export { useNitroApp, useNitroHooks, serverFetch, getRouteRules, fetch } from "./internal/app.mjs";

package/dist/runtime/app.mjs

@@ -1 +1 @@
-export { useNitroApp, useNitroHooks, serverFetch, fetch } from "./internal/app.mjs";
+export { useNitroApp, useNitroHooks, serverFetch, getRouteRules, fetch } from "./internal/app.mjs";

package/dist/runtime/internal/app.d.mts

@@ -1,6 +1,6 @@
-import type { NitroApp, NitroRuntimeHooks } from "nitro/types";
+import type { MatchedRouteRules, NitroApp, NitroRuntimeHooks } from "nitro/types";
 import type { ServerRequest, ServerRequestContext } from "srvx";
-import type { H3EventContext, WebSocketHooks } from "h3";
+import type { H3EventContext, Middleware, WebSocketHooks } from "h3";
 import { HookableCore } from "hookable";
 declare global {
 	var __nitro__: NitroApp | undefined;
@@ -10,3 +10,7 @@ export declare function useNitroHooks(): HookableCore<NitroRuntimeHooks>;
 export declare function serverFetch(resource: string | URL | Request, init?: RequestInit, context?: ServerRequestContext | H3EventContext): Promise<Response>;
 export declare function resolveWebsocketHooks(req: ServerRequest): Promise<Partial<WebSocketHooks>>;
 export declare function fetch(resource: string | URL | Request, init?: RequestInit, context?: ServerRequestContext | H3EventContext): Promise<Response>;
+export declare function getRouteRules(method: string, pathname: string): {
+	routeRules?: MatchedRouteRules;
+	routeRuleMiddleware: Middleware[];
+};

package/dist/runtime/internal/app.mjs

@@ -148,7 +148,7 @@ function createH3App(config) {
 	}
 	return h3App;
 }
-function getRouteRules(method, pathname) {
+export function getRouteRules(method, pathname) {
 	const m = findRouteRules(method, pathname);
 	if (!m?.length) {
 		return { routeRuleMiddleware: [] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-nightly",
-  "version": "3.0.1-20251209-203952-cd9c2915",
+  "version": "3.0.1-20251210-091123-c1787f75",
   "description": "Build and Deploy Universal JavaScript Servers",
   "homepage": "https://nitro.build",
   "repository": "nitrojs/nitro",