nitropack-nightly 2.13.0-20250716-094945.42a23de2 → 2.13.0-20251211-001347-056ec854

package/dist/cli/build.mjs

@@ -5,7 +5,7 @@ import { resolve } from 'pathe';
 import { c as commonArgs } from './common.mjs';
 
 if (!globalThis.crypto) {
-  globalThis.crypto = nodeCrypto;
+  globalThis.crypto = nodeCrypto.webcrypto;
 }
 const build = defineCommand({
   meta: {

package/dist/cli/dev.mjs

@@ -8,7 +8,7 @@ import { c as commonArgs } from './common.mjs';
 
 const hmrKeyRe = /^runtimeConfig\.|routeRules\./;
 if (!globalThis.crypto) {
-  globalThis.crypto = nodeCrypto;
+  globalThis.crypto = nodeCrypto.webcrypto;
 }
 const dev = defineCommand({
   meta: {

package/dist/core/index.mjs

@@ -749,7 +749,7 @@ async function _loadUserConfig(configOverrides = {}, opts = {}) {
           static: getConf("static"),
           dev: true,
           compatibilityDate: compatibilityDate || fallbackCompatibilityDate
-        }).then((p) => p?._meta?.name).catch(() => "nitro-dev") : "nitro-dev";
+        }).then((p) => p?._meta?.name || "nitro-dev").catch(() => "nitro-dev") : "nitro-dev";
       } else if (!preset) {
         preset = await resolvePreset("", {
           static: getConf("static"),
@@ -1196,12 +1196,13 @@ async function writeTypes(nitro) {
     );
     const resolvedImportPathMap = /* @__PURE__ */ new Map();
     for (const i of allImports) {
-      if (resolvedImportPathMap.has(i.from)) {
+      const from = i.typeFrom || i.from;
+      if (resolvedImportPathMap.has(from)) {
         continue;
       }
-      let path = resolveAlias(i.from, nitro.options.alias);
+      let path = resolveAlias(from, nitro.options.alias);
       if (!isAbsolute(path)) {
-        const resolvedPath = resolveModulePath(i.from, {
+        const resolvedPath = resolveModulePath(from, {
           try: true,
           from: nitro.options.nodeModulesDirs,
           conditions: ["type", "node", "import"],
@@ -1224,12 +1225,15 @@ async function writeTypes(nitro) {
       if (isAbsolute(path)) {
         path = relative(typesDir, path);
       }
-      resolvedImportPathMap.set(i.from, path);
+      resolvedImportPathMap.set(from, path);
     }
     autoImportedTypes = [
       nitro.options.imports && nitro.options.imports.autoImport !== false ? (await nitro.unimport.generateTypeDeclarations({
         exportHelper: false,
-        resolvePath: (i) => resolvedImportPathMap.get(i.from) ?? i.from
+        resolvePath: (i) => {
+          const from = i.typeFrom || i.from;
+          return resolvedImportPathMap.get(from) ?? from;
+        }
       })).trim() : ""
     ];
   }
@@ -1619,8 +1623,16 @@ async function buildProduction(nitro, rollupConfig) {
       nitro: version
     },
     commands: {
-      preview: resolveTmplPath(nitro.options.commands.preview, nitro),
-      deploy: resolveTmplPath(nitro.options.commands.deploy, nitro)
+      preview: resolveTmplPath(
+        nitro.options.commands.preview,
+        nitro,
+        nitro.options.output.dir
+      ),
+      deploy: resolveTmplPath(
+        nitro.options.commands.deploy,
+        nitro,
+        nitro.options.output.dir
+      )
     },
     config: {
       ...Object.fromEntries(
@@ -1642,14 +1654,22 @@ async function buildProduction(nitro, rollupConfig) {
     }
   }
   await nitro.hooks.callHook("compiled", nitro);
-  if (buildInfo.commands?.preview) {
+  if (nitro.options.commands?.preview) {
     nitro.logger.success(
-      `You can preview this build using \`${buildInfo.commands?.preview}\``
+      `You can preview this build using \`${resolveTmplPath(
+        nitro.options.commands.preview,
+        nitro,
+        process.cwd()
+      )}\``
     );
   }
-  if (buildInfo.commands?.deploy) {
+  if (nitro.options.commands?.deploy) {
     nitro.logger.success(
-      `You can deploy this build using \`${buildInfo.commands?.deploy}\``
+      `You can deploy this build using \`${resolveTmplPath(
+        nitro.options.commands.deploy,
+        nitro,
+        process.cwd()
+      )}\``
     );
   }
 }
@@ -1674,7 +1694,7 @@ async function _snapshot(nitro) {
     })
   );
 }
-function resolveTmplPath(input, nitro) {
+function resolveTmplPath(input, nitro, relativeTo) {
   if (!input || !input.includes("{{")) {
     return input;
   }
@@ -1684,7 +1704,7 @@ function resolveTmplPath(input, nitro) {
       match
     );
     if (val) {
-      val = relative(nitro.options.rootDir, val);
+      val = relative(relativeTo, val) || ".";
     } else {
       nitro.logger.warn(
         `cannot resolve template param '${match}' in ${input.slice(0, 20)}`
@@ -2490,7 +2510,14 @@ function fmtFrame(frame) {
 
 function createVFSHandler(nitro) {
   return eventHandler(async (event) => {
-    const ip = getRequestIP(event, { xForwardedFor: false });
+    const { socket } = event.node.req;
+    const isUnixSocket = (
+      // No network addresses
+      !socket?.remoteAddress && !socket?.localAddress && // Empty address object
+      Object.keys(socket?.address?.() || {}).length === 0 && // Socket is readable/writable but has no port info
+      socket?.readable && socket?.writable && !socket?.remotePort
+    );
+    const ip = getRequestIP(event, { xForwardedFor: isUnixSocket });
     const isLocalRequest = ip && /^::1$|^127\.\d+\.\d+\.\d+$/.test(ip);
     if (!isLocalRequest) {
       throw createError({

package/dist/meta/index.mjs

@@ -1,4 +1,4 @@
-const version = "2.13.0-20250716-094945.42a23de2";
+const version = "2.13.0-20251211-001347-056ec854";
 
 const compatibilityChanges = [
   {

package/dist/presets/_nitro/runtime/nitro-dev.mjs

@@ -18,7 +18,7 @@ import {
   toNodeListener
 } from "h3";
 if (!globalThis.crypto) {
-  globalThis.crypto = nodeCrypto;
+  globalThis.crypto = nodeCrypto.webcrypto;
 }
 const { NITRO_NO_UNIX_SOCKET, NITRO_DEV_WORKER_ID } = process.env;
 trapUnhandledNodeErrors();

package/dist/presets/_types.gen.d.ts

@@ -6,13 +6,13 @@ import type { PresetOptions as FirebaseOptions } from "./firebase/preset";
 import type { PresetOptions as NetlifyOptions } from "./netlify/preset";
 import type { PresetOptions as VercelOptions } from "./vercel/preset";
 export interface PresetOptions {
-    awsAmplify: AwsAmplifyOptions;
-    awsLambda: AwsLambdaOptions;
-    azure: AzureOptions;
-    cloudflare: CloudflareOptions;
-    firebase: FirebaseOptions;
-    netlify: NetlifyOptions;
-    vercel: VercelOptions;
+    awsAmplify?: AwsAmplifyOptions;
+    awsLambda?: AwsLambdaOptions;
+    azure?: AzureOptions;
+    cloudflare?: CloudflareOptions;
+    firebase?: FirebaseOptions;
+    netlify?: NetlifyOptions;
+    vercel?: VercelOptions;
 }
 export declare const presetsWithConfig: readonly ["awsAmplify", "awsLambda", "azure", "cloudflare", "firebase", "netlify", "vercel"];
 export type PresetName = "alwaysdata" | "aws-amplify" | "aws-lambda" | "azure" | "azure-functions" | "azure-swa" | "base-worker" | "bun" | "cleavr" | "cli" | "cloudflare" | "cloudflare-dev" | "cloudflare-durable" | "cloudflare-module" | "cloudflare-module-legacy" | "cloudflare-pages" | "cloudflare-pages-static" | "cloudflare-worker" | "deno" | "deno-deploy" | "deno-server" | "deno-server-legacy" | "digital-ocean" | "edgio" | "firebase" | "firebase-app-hosting" | "flight-control" | "genezio" | "github-pages" | "gitlab-pages" | "heroku" | "iis" | "iis-handler" | "iis-node" | "koyeb" | "layer0" | "netlify" | "netlify-builder" | "netlify-edge" | "netlify-legacy" | "netlify-static" | "nitro-dev" | "nitro-prerender" | "node" | "node-cluster" | "node-listener" | "node-server" | "platform-sh" | "render-com" | "service-worker" | "static" | "stormkit" | "vercel" | "vercel-edge" | "vercel-static" | "winterjs" | "zeabur" | "zeabur-static" | "zerops" | "zerops-static";

package/dist/presets/_unenv/node-compat/cloudflare.mjs

@@ -13,11 +13,16 @@ export const builtnNodeModules = [
   // Missing exports: CallTracker, partialDeepStrictEqual
   "async_hooks",
   "buffer",
+  "constants",
+  // Missing exports: EXTENSIONLESS_FORMAT_JAVASCRIPT, EXTENSIONLESS_FORMAT_WASM, O_DIRECT, O_NOATIME, RTLD_DEEPBIND, SIGPOLL, SIGPWR, SIGSTKFLT, defaultCipherList
+  "crypto",
   "diagnostics_channel",
   "dns",
   "dns/promises",
   "events",
   // Missing exports: captureRejections, init
+  "fs/promises",
+  "module",
   "net",
   "path",
   "path/posix",
@@ -30,22 +35,16 @@ export const builtnNodeModules = [
   "string_decoder",
   "timers",
   "timers/promises",
+  "tls",
   "url",
+  "util",
   "util/types",
   "zlib"
 ];
 export const hybridNodeModules = [
   "console",
-  "crypto",
-  // Missing exports: Cipher, Decipher
-  "module",
-  // Missing exports: Module, SourceMap, constants, enableCompileCache, findPackageJSON, findSourceMap, flushCompileCache, getCompileCacheDir, getSourceMapsSupport, globalPaths, register, runMain, setSourceMapsSupport, stripTypeScriptTypes, syncBuiltinESMExports
-  "process",
+  "process"
   // Missing exports: abort, allowedNodeEnvironmentFlags, arch, argv, argv0, assert, availableMemory, binding, chdir, config, constrainedMemory, cpuUsage, cwd, debugPort, dlopen, domain, emitWarning, execArgv, execPath, exitCode, finalization, getActiveResourcesInfo, getegid, geteuid, getgid, getgroups, getuid, hasUncaughtExceptionCaptureCallback, hrtime, initgroups, kill, loadEnvFile, memoryUsage, moduleLoadList, openStdin, pid, ppid, reallyExit, ref, release, report, resourceUsage, setSourceMapsEnabled, setUncaughtExceptionCaptureCallback, setegid, seteuid, setgid, setgroups, setuid, sourceMapsEnabled, stderr, stdin, stdout, title, umask, unref, uptime, version, versions
-  "tls",
-  // Missing exports: createSecurePair
-  "util"
-  // Missing exports: isBoolean, isBuffer, isDate, isError, isFunction, isNull, isNullOrUndefined, isNumber, isObject, isPrimitive, isRegExp, isString, isSymbol, isUndefined
 ];
 export const unsupportedNodeModules = [
   "_http_agent",
@@ -57,11 +56,9 @@ export const unsupportedNodeModules = [
   "_stream_wrap",
   "child_process",
   "cluster",
-  "constants",
   "dgram",
   "domain",
   "fs",
-  "fs/promises",
   "http",
   "http2",
   "https",

package/dist/presets/aws-lambda/preset.mjs

@@ -7,7 +7,7 @@ const awsLambda = defineNitroPreset(
     },
     hooks: {
       "rollup:before": (nitro, rollupConfig) => {
-        if (nitro.options.awsLambda.streaming) {
+        if (nitro.options.awsLambda?.streaming) {
           rollupConfig.input += "-streaming";
         }
       }

package/dist/presets/bun/runtime/bun.mjs

@@ -6,6 +6,7 @@ const nitroApp = useNitroApp();
 const ws = import.meta._websocket ? wsAdapter(nitroApp.h3App.websocket) : void 0;
 const server = Bun.serve({
   port: process.env.NITRO_PORT || process.env.PORT || 3e3,
+  host: process.env.NITRO_HOST || process.env.HOST,
   websocket: import.meta._websocket ? ws.websocket : void 0,
   async fetch(req, server2) {
     if (import.meta._websocket && req.headers.get("upgrade") === "websocket") {
@@ -26,7 +27,7 @@ const server = Bun.serve({
     });
   }
 });
-console.log(`Listening on http://localhost:${server.port}...`);
+console.log(`Listening on ${server.url}...`);
 if (import.meta._tasks) {
   startScheduleRunner();
 }

package/dist/presets/cloudflare/dev.mjs

@@ -58,7 +58,7 @@ export async function cloudflareDev(nitro) {
     fileURLToPath(new URL("runtime/", import.meta.url))
   );
   nitro.options.plugins = nitro.options.plugins || [];
-  nitro.options.plugins.push(
+  nitro.options.plugins.unshift(
     fileURLToPath(new URL("runtime/plugin.dev", import.meta.url))
   );
 }

package/dist/presets/cloudflare/preset.mjs

@@ -44,7 +44,7 @@ const cloudflarePages = defineNitroPreset(
     hooks: {
       "build:before": async (nitro) => {
         await enableNodeCompat(nitro);
-        if (!nitro.options.cloudflare.deployConfig) {
+        if (!nitro.options.cloudflare?.deployConfig) {
           nitro.options.commands.preview = "npx wrangler pages dev {{ output.dir }}";
           nitro.options.commands.deploy = "npx wrangler pages deploy {{ output.dir }}";
         }
@@ -52,7 +52,7 @@ const cloudflarePages = defineNitroPreset(
       async compiled(nitro) {
         await writeWranglerConfig(nitro, "pages");
         await writeCFRoutes(nitro);
-        await writeCFHeaders(nitro);
+        await writeCFHeaders(nitro, "output");
         await writeCFPagesRedirects(nitro);
       }
     }
@@ -76,13 +76,13 @@ const cloudflarePagesStatic = defineNitroPreset(
     },
     hooks: {
       "build:before": async (nitro) => {
-        if (!nitro.options.cloudflare.deployConfig) {
+        if (!nitro.options.cloudflare?.deployConfig) {
           nitro.options.commands.preview = "npx wrangler pages dev {{ output.dir }}";
           nitro.options.commands.deploy = "npx wrangler pages deploy {{ output.dir }}";
         }
       },
       async compiled(nitro) {
-        await writeCFHeaders(nitro);
+        await writeCFHeaders(nitro, "output");
         await writeCFPagesRedirects(nitro);
       }
     }
@@ -99,7 +99,20 @@ export const cloudflareDev = defineNitroPreset(
     extends: "nitro-dev",
     modules: [
       async (nitro) => await import("./dev.mjs").then((m) => m.cloudflareDev(nitro))
-    ]
+    ],
+    esbuild: {
+      options: {
+        target: "es2022"
+      }
+    },
+    unenv: {
+      meta: {
+        name: "cloudflare-dev"
+      },
+      alias: {
+        "cloudflare:workers": "nitropack/presets/cloudflare/runtime/shims/workers.dev"
+      }
+    }
   },
   {
     name: "cloudflare-dev",
@@ -136,14 +149,14 @@ const cloudflareModule = defineNitroPreset(
     hooks: {
       "build:before": async (nitro) => {
         await enableNodeCompat(nitro);
-        if (!nitro.options.cloudflare.deployConfig) {
+        if (!nitro.options.cloudflare?.deployConfig) {
           nitro.options.commands.preview = "npx wrangler dev {{ output.serverDir }}/index.mjs --assets {{ output.publicDir }}";
           nitro.options.commands.deploy = "npx wrangler deploy {{ output.serverDir }}/index.mjs --assets {{ output.publicDir }}";
         }
       },
       async compiled(nitro) {
         await writeWranglerConfig(nitro, "module");
-        await writeCFHeaders(nitro);
+        await writeCFHeaders(nitro, "public");
         await writeFile(
           resolve(nitro.options.output.dir, "package.json"),
           JSON.stringify({ private: true, main: "./server/index.mjs" }, null, 2)

package/dist/presets/cloudflare/runtime/plugin.dev.mjs

@@ -1,15 +1,12 @@
 import { useRuntimeConfig, getRequestURL } from "#imports";
-const _proxy = _getPlatformProxy().catch((error) => {
+const proxy = await _getPlatformProxy().catch((error) => {
   console.error("Failed to initialize wrangler bindings proxy", error);
   return _createStubProxy();
-}).then((proxy) => {
-  globalThis.__env__ = proxy.env;
-  return proxy;
 });
-globalThis.__env__ = _proxy.then((proxy) => proxy.env);
+globalThis.__env__ = proxy.env;
+globalThis.__wait_until__ = proxy.ctx.waitUntil.bind(proxy.ctx);
 export default (function(nitroApp) {
   nitroApp.hooks.hook("request", async (event) => {
-    const proxy = await _proxy;
     event.context.cf = proxy.cf;
     event.context.waitUntil = proxy.ctx.waitUntil.bind(proxy.ctx);
     const request = new Request(getRequestURL(event));
@@ -27,7 +24,7 @@ export default (function(nitroApp) {
   });
   nitroApp.hooks._hooks.request.unshift(nitroApp.hooks._hooks.request.pop());
   nitroApp.hooks.hook("close", () => {
-    return _proxy?.then((proxy) => proxy.dispose);
+    return proxy?.dispose();
   });
 });
 async function _getPlatformProxy() {
@@ -45,8 +42,8 @@ async function _getPlatformProxy() {
   if (runtimeConfig.wrangler.environment) {
     proxyOptions.environment = runtimeConfig.wrangler.environment;
   }
-  const proxy = await getPlatformProxy(proxyOptions);
-  return proxy;
+  const proxy2 = await getPlatformProxy(proxyOptions);
+  return proxy2;
 }
 function _createStubProxy() {
   return {

package/dist/presets/cloudflare/runtime/shims/workers.dev.d.mts

@@ -0,0 +1,21 @@
+export function waitUntil(promise: any): Promise<void>;
+export function withEnv(newEnv: any, fn: any): void;
+export class DurableObject extends NotImplemented {
+}
+export class RpcPromise extends NotImplemented {
+}
+export class RpcProperty extends NotImplemented {
+}
+export class RpcStub extends NotImplemented {
+}
+export class RpcTarget extends NotImplemented {
+}
+export class ServiceStub extends NotImplemented {
+}
+export class WorkerEntrypoint extends NotImplemented {
+}
+export class WorkflowEntrypoint extends NotImplemented {
+}
+declare class NotImplemented {
+}
+export {};

package/dist/presets/cloudflare/runtime/shims/workers.dev.mjs

@@ -0,0 +1,27 @@
+// Shim for "cloudflare:workers" import in dev environment
+
+// unenv shim respects __env__
+export { env } from "unenv/node/internal/process/env";
+
+export async function waitUntil(promise) {
+  await globalThis.__wait_until__?.(promise);
+}
+
+export function withEnv(newEnv, fn) {
+  throw new Error("cf.withEnv is not implemented in dev env currently.");
+}
+
+class NotImplemented {
+  constructor() {
+    throw new Error("Not implemented in dev env currently.");
+  }
+}
+
+export class DurableObject extends NotImplemented {}
+export class RpcPromise extends NotImplemented {}
+export class RpcProperty extends NotImplemented {}
+export class RpcStub extends NotImplemented {}
+export class RpcTarget extends NotImplemented {}
+export class ServiceStub extends NotImplemented {}
+export class WorkerEntrypoint extends NotImplemented {}
+export class WorkflowEntrypoint extends NotImplemented {}

package/dist/presets/cloudflare/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Nitro } from "nitropack/types";
 export declare function writeCFRoutes(nitro: Nitro): Promise<void>;
-export declare function writeCFHeaders(nitro: Nitro): Promise<void>;
+export declare function writeCFHeaders(nitro: Nitro, outdir: "public" | "output"): Promise<void>;
 export declare function writeCFPagesRedirects(nitro: Nitro): Promise<void>;
 export declare function enableNodeCompat(nitro: Nitro): Promise<void>;
 export declare function writeWranglerConfig(nitro: Nitro, cfTarget: "pages" | "module"): Promise<void>;

package/dist/presets/cloudflare/utils.mjs

@@ -75,8 +75,11 @@ export async function writeCFRoutes(nitro) {
 function comparePaths(a, b) {
   return a.split("/").length - b.split("/").length || a.localeCompare(b);
 }
-export async function writeCFHeaders(nitro) {
-  const headersPath = join(nitro.options.output.dir, "_headers");
+export async function writeCFHeaders(nitro, outdir) {
+  const headersPath = join(
+    outdir === "public" ? nitro.options.output.publicDir : nitro.options.output.dir,
+    "_headers"
+  );
   const contents = [];
   const rules = Object.entries(nitro.options.routeRules).sort(
     (a, b) => b[0].split(/\/(?!\*)/).length - a[0].split(/\/(?!\*)/).length
@@ -282,5 +285,5 @@ async function generateWorkerName(nitro) {
   );
   const pkgName = pkgJSON?.name;
   const subpath = relative(nitro.options.workspaceDir, nitro.options.rootDir);
-  return `${gitRepo || pkgName}/${subpath}`.replace(/[^a-zA-Z0-9-]/g, "-").replace(/-$/, "");
+  return `${gitRepo || pkgName}/${subpath}`.toLowerCase().replace(/[^a-zA-Z0-9-]/g, "-").replace(/-$/, "");
 }

package/dist/presets/firebase/runtime/firebase-gen-1.mjs

@@ -1,7 +1,7 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitropack/runtime";
 import { useAppConfig } from "nitropack/runtime";
-import functions from "firebase-functions";
+import functions from "firebase-functions/v1";
 import { toNodeListener } from "h3";
 const nitroApp = useNitroApp();
 const firebaseConfig = useAppConfig().nitro.firebase;

package/dist/presets/firebase/runtime/firebase-gen-2.d.ts

@@ -1,2 +1,2 @@
 import "#nitro-internal-pollyfills";
-export declare const __firebaseServerFunctionName__: import("firebase-functions/v2/https").HttpsFunction;
+export declare const __firebaseServerFunctionName__: import("firebase-functions/https").HttpsFunction;

package/dist/presets/firebase/types.d.ts

@@ -1,4 +1,4 @@
-import type { RuntimeOptions, region } from "firebase-functions";
+import type { RuntimeOptions, region } from "firebase-functions/v1";
 import type { HttpsOptions } from "firebase-functions/v2/https";
 export type FirebaseOptions = FirebaseFunctionsOptions | AppHostingOptions;
 export type FirebaseFunctionsOptions = FirebaseOptionsGen1 | FirebaseOptionsGen2;

package/dist/presets/netlify/legacy/runtime/netlify-builder.d.ts

@@ -1,2 +1,2 @@
 import "#nitro-internal-pollyfills";
-export declare const handler: import("@netlify/functions").Handler;
+export declare const handler: (event: any, context: any, callback?: any) => any;

package/dist/presets/netlify/legacy/runtime/netlify-builder.mjs

@@ -1,4 +1,41 @@
 import "#nitro-internal-pollyfills";
-import { builder } from "@netlify/functions";
 import { lambda } from "./netlify-lambda.mjs";
-export const handler = builder(lambda);
+export const handler = wrapHandler(lambda);
+const BUILDER_FUNCTIONS_FLAG = true;
+const HTTP_STATUS_METHOD_NOT_ALLOWED = 405;
+const METADATA_VERSION = 1;
+const augmentResponse = (response) => {
+  if (!response) {
+    return response;
+  }
+  const metadata = {
+    version: METADATA_VERSION,
+    builder_function: BUILDER_FUNCTIONS_FLAG,
+    ttl: response.ttl || 0
+  };
+  return {
+    ...response,
+    metadata
+  };
+};
+function wrapHandler(handler2) {
+  return (event, context, callback) => {
+    if (event.httpMethod !== "GET" && event.httpMethod !== "HEAD") {
+      return Promise.resolve({
+        body: "Method Not Allowed",
+        statusCode: HTTP_STATUS_METHOD_NOT_ALLOWED
+      });
+    }
+    const modifiedEvent = {
+      ...event,
+      multiValueQueryStringParameters: {},
+      queryStringParameters: {}
+    };
+    const wrappedCallback = (error, response) => callback ? callback(error, augmentResponse(response)) : null;
+    const execution = handler2(modifiedEvent, context, wrappedCallback);
+    if (typeof execution === "object" && typeof execution.then === "function") {
+      return execution.then(augmentResponse);
+    }
+    return execution;
+  };
+}

package/dist/presets/netlify/legacy/runtime/netlify.mjs

@@ -14,7 +14,7 @@ export const handler = async function handler2(event, context) {
       (r) => r.builder || r.default.builder
     );
     const ttl = typeof routeRules.isr === "number" ? routeRules.isr : false;
-    const builderHandler = ttl ? (event2, context2) => lambda(event2, context2).then((r) => ({ ...r, ttl })) : lambda;
+    const builderHandler = ttl ? ((event2, context2) => lambda(event2, context2).then((r) => ({ ...r, ttl }))) : lambda;
     return builder(builderHandler)(event, context);
   }
   return lambda(event, context);

package/dist/presets/vercel/preset.mjs

@@ -10,9 +10,12 @@ const vercel = defineNitroPreset(
   {
     extends: "node",
     entry: "./runtime/vercel",
+    vercel: {
+      skewProtection: !!process.env.VERCEL_SKEW_PROTECTION_ENABLED
+    },
     output: {
       dir: "{{ rootDir }}/.vercel/output",
-      serverDir: "{{ output.dir }}/functions/__nitro.func",
+      serverDir: "{{ output.dir }}/functions/__fallback.func",
       publicDir: "{{ output.dir }}/static/{{ baseURL }}"
     },
     commands: {
@@ -41,7 +44,7 @@ const vercelEdge = defineNitroPreset(
     exportConditions: ["edge-light"],
     output: {
       dir: "{{ rootDir }}/.vercel/output",
-      serverDir: "{{ output.dir }}/functions/__nitro.func",
+      serverDir: "{{ output.dir }}/functions/__fallback.func",
       publicDir: "{{ output.dir }}/static/{{ baseURL }}"
     },
     commands: {
@@ -85,6 +88,9 @@ const vercelEdge = defineNitroPreset(
 const vercelStatic = defineNitroPreset(
   {
     extends: "static",
+    vercel: {
+      skewProtection: !!process.env.VERCEL_SKEW_PROTECTION_ENABLED
+    },
     output: {
       dir: "{{ rootDir }}/.vercel/output",
       publicDir: "{{ output.dir }}/static/{{ baseURL }}"

package/dist/presets/vercel/runtime/consts.d.ts

@@ -0,0 +1 @@
+export declare const ISR_URL_PARAM = "__isr_route";

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

@@ -0,0 +1 @@
+export const ISR_URL_PARAM = "__isr_route";

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

@@ -1,15 +1,34 @@
 import "#nitro-internal-pollyfills";
 import { useNitroApp } from "nitropack/runtime";
+import { getRouteRulesForPath } from "nitropack/runtime/internal/index";
 import { toNodeListener } from "h3";
-import { parseQuery } from "ufo";
+import { parseQuery, withQuery } from "ufo";
+import { ISR_URL_PARAM } from "./consts.mjs";
 const nitroApp = useNitroApp();
 const handler = toNodeListener(nitroApp.h3App);
 const listener = function(req, res) {
-  const query = req.headers["x-now-route-matches"];
-  if (query) {
-    const { url } = parseQuery(query);
-    if (url) {
-      req.url = url;
+  const isrRoute = req.headers["x-now-route-matches"];
+  if (isrRoute) {
+    const { [ISR_URL_PARAM]: url } = parseQuery(isrRoute);
+    if (url && typeof url === "string") {
+      const routeRules = getRouteRulesForPath(url);
+      if (routeRules.isr) {
+        req.url = url;
+      }
+    }
+  } else {
+    const queryIndex = req.url.indexOf("?");
+    const urlQueryIndex = queryIndex === -1 ? -1 : req.url.indexOf(`${ISR_URL_PARAM}=`, queryIndex);
+    if (urlQueryIndex !== -1) {
+      const { [ISR_URL_PARAM]: url, ...params } = parseQuery(
+        req.url.slice(queryIndex)
+      );
+      if (url && typeof url === "string") {
+        const routeRules = getRouteRulesForPath(url);
+        if (routeRules.isr) {
+          req.url = withQuery(url, params);
+        }
+      }
     }
   }
   return handler(req, res);