nitro-nightly 3.0.1-20251209-203952-cd9c2915 → 3.0.1-20251210-103926-22a293c5

package/dist/_build/vite.build.mjs

@@ -6,7 +6,7 @@ import "../_libs/acorn.mjs";
 import "../_libs/unimport.mjs";
 import "../_libs/@rollup/plugin-commonjs.mjs";
 import { i as a } from "../_libs/std-env.mjs";
-import "../_chunks/vCTaGRPD.mjs";
+import "../_chunks/C0jn5-Q_.mjs";
 import "../_libs/tsconfck.mjs";
 import "../_chunks/Df3_4Pam.mjs";
 import "../_chunks/CycPUgTQ.mjs";

package/dist/_build/vite.plugin.mjs

@@ -3,7 +3,7 @@ import { t as assetsPlugin } from "../_libs/@pi0/vite-plugin-fullstack.mjs";
 import { d as sanitizeFilePath } from "../_libs/local-pkg.mjs";
 import { t as formatCompatibilityDate } from "../_libs/compatx.mjs";
 import { i as a, r as T } from "../_libs/std-env.mjs";
-import { a as copyPublicAssets, i as prepare, s as createNitro } from "../_chunks/vCTaGRPD.mjs";
+import { a as copyPublicAssets, i as prepare, s as createNitro } from "../_chunks/C0jn5-Q_.mjs";
 import { n as prettyPath } from "../_chunks/Df3_4Pam.mjs";
 import { i as scanHandlers } from "../_chunks/CycPUgTQ.mjs";
 import { n as writeBuildInfo, t as getBuildInfo } from "./common.mjs";

package/dist/_chunks/{vCTaGRPD.mjs → C0jn5-Q_.mjs}

@@ -818,7 +818,12 @@ var Router = class {
 	compileToString(opts) {
 		if (this._compiled) return this._compiled;
 		this._compiled = compileRouterToString(this._router, void 0, opts);
-		if (this.routes.length === 1 && this.routes[0].route === "/**" && this.routes[0].method === "") this._compiled = `/* @__PURE__ */ (() => {const data=${(opts?.serialize || JSON.stringify)(this.routes[0].data)};return ((_m, p)=>{return {data,params:{"_":p.slice(1)}};})})()`;
+		if (this.routes.length === 1 && this.routes[0].route === "/**" && this.routes[0].method === "") {
+			const data = (opts?.serialize || JSON.stringify)(this.routes[0].data);
+			let retCode = `{data,params:{"_":p.slice(1)}}`;
+			if (opts?.matchAll) retCode = `[${retCode}]`;
+			this._compiled = `/* @__PURE__ */ (() => {const data=${data};return ((_m, p)=>{return ${retCode};})})()`;
+		}
 		return this._compiled;
 	}
 	match(method, path) {

package/dist/_libs/rou3.mjs

@@ -1,4 +1,4 @@
-//#region node_modules/.pnpm/rou3@0.7.10/node_modules/rou3/dist/index.mjs
+//#region node_modules/.pnpm/rou3@0.7.11/node_modules/rou3/dist/index.mjs
 const NullProtoObj = /* @__PURE__ */ (() => {
 	const e = function() {};
 	return e.prototype = Object.create(null), Object.freeze(e.prototype), e;
@@ -19,7 +19,7 @@ function splitPath(path) {
 function getMatchParams(segments, paramsMap) {
 	const params = new NullProtoObj();
 	for (const [index, name] of paramsMap) {
-		const segment = index < 0 ? segments.slice(-1 * index).join("/") : segments[index];
+		const segment = index < 0 ? segments.slice(-(index + 1)).join("/") : segments[index];
 		if (typeof name === "string") params[name] = segment;
 		else {
 			const match = segment.match(name);
@@ -45,7 +45,7 @@ function addRoute(ctx, method = "", path, data) {
 			if (!node.wildcard) node.wildcard = { key: "**" };
 			node = node.wildcard;
 			paramsMap.push([
-				-i,
+				-(i + 1),
 				segment.split(":")[1] || "_",
 				segment.length === 2
 			]);
@@ -200,7 +200,7 @@ function _findAll(ctx, node, method, segments, index, matches = []) {
 }
 
 //#endregion
-//#region node_modules/.pnpm/rou3@0.7.10/node_modules/rou3/dist/compiler.mjs
+//#region node_modules/.pnpm/rou3@0.7.11/node_modules/rou3/dist/compiler.mjs
 /**
 * Compile the router instance into a compact runnable code.
 *

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/builder.mjs

@@ -5,7 +5,7 @@ import "./_libs/@pi0/vite-plugin-fullstack.mjs";
 import "./_libs/acorn.mjs";
 import "./_libs/unimport.mjs";
 import "./_libs/@rollup/plugin-commonjs.mjs";
-import { a as copyPublicAssets, c as loadOptions, i as prepare, n as runTask, o as build, r as prerender, s as createNitro, t as listTasks } from "./_chunks/vCTaGRPD.mjs";
+import { a as copyPublicAssets, c as loadOptions, i as prepare, n as runTask, o as build, r as prerender, s as createNitro, t as listTasks } from "./_chunks/C0jn5-Q_.mjs";
 import "./_libs/tsconfck.mjs";
 import "./_chunks/Df3_4Pam.mjs";
 import { n as writeTypes } from "./_chunks/CycPUgTQ.mjs";

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/dist/vite.mjs

@@ -5,7 +5,7 @@ import "./_libs/@pi0/vite-plugin-fullstack.mjs";
 import "./_libs/acorn.mjs";
 import "./_libs/unimport.mjs";
 import "./_libs/@rollup/plugin-commonjs.mjs";
-import "./_chunks/vCTaGRPD.mjs";
+import "./_chunks/C0jn5-Q_.mjs";
 import "./_libs/tsconfck.mjs";
 import "./_chunks/Df3_4Pam.mjs";
 import "./_chunks/CycPUgTQ.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nitro-nightly",
-  "version": "3.0.1-20251209-203952-cd9c2915",
+  "version": "3.0.1-20251210-103926-22a293c5",
   "description": "Build and Deploy Universal JavaScript Servers",
   "homepage": "https://nitro.build",
   "repository": "nitrojs/nitro",
@@ -141,7 +141,7 @@
     "rolldown": "1.0.0-beta.53",
     "rolldown-vite": "^7.2.10",
     "rollup": "^4.53.3",
-    "rou3": "^0.7.10",
+    "rou3": "^0.7.11",
     "scule": "^1.3.0",
     "semver": "^7.7.3",
     "serve-placeholder": "^2.0.2",