From 02c11ed4a0cde188d6ed7898b1c287e7488bad32 Mon Sep 17 00:00:00 2001 From: onmax Date: Mon, 16 Nov 2026 20:09:43 +0100 Subject: [PATCH] fix(netlify): forward event.waitUntil to the Netlify context --- src/presets/netlify/runtime/netlify-edge.ts | 1 + src/presets/netlify/runtime/netlify.ts | 4 ++- test/presets/netlify.test.ts | 29 ++++++++++++++++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/presets/netlify/runtime/netlify-edge.ts b/src/presets/netlify/runtime/netlify-edge.ts index c93d46e498..cdb2039948 100644 --- a/src/presets/netlify/runtime/netlify-edge.ts +++ b/src/presets/netlify/runtime/netlify-edge.ts @@ -13,6 +13,7 @@ export default async function netlifyEdge(netlifyReq: Request, context: Context) req.ip = context.ip; req.runtime ??= { name: "netlify-edge" }; req.runtime.netlify ??= { context } as any; + req.waitUntil ??= context.waitUntil?.bind(context); const url = new URL(req.url); diff --git a/src/presets/netlify/runtime/netlify.ts b/src/presets/netlify/runtime/netlify.ts index fb6505d4f7..ce951ce1d3 100644 --- a/src/presets/netlify/runtime/netlify.ts +++ b/src/presets/netlify/runtime/netlify.ts @@ -1,13 +1,15 @@ import "#nitro/virtual/polyfills"; import { useNitroApp } from "nitro/app"; +import type { Context } from "@netlify/functions"; import type { ServerRequest } from "srvx"; const nitroApp = useNitroApp(); const ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60; -const handler = async (req: ServerRequest): Promise => { +const handler = async (req: ServerRequest, context?: Context): Promise => { req.runtime ??= { name: "netlify" }; + req.waitUntil ??= context?.waitUntil?.bind(context); req.ip ??= req.headers.get("x-nf-client-connection-ip") || undefined; const response = await nitroApp.fetch(req); diff --git a/test/presets/netlify.test.ts b/test/presets/netlify.test.ts index a94649996a..84f2fc562a 100644 --- a/test/presets/netlify.test.ts +++ b/test/presets/netlify.test.ts @@ -3,7 +3,7 @@ import { tmpdir } from "node:os"; import type { Context as FunctionContext } from "@netlify/functions"; import { execa, execaSync } from "execa"; import { join, resolve } from "pathe"; -import { describe, expect, it } from "vitest"; +import { describe, expect, it, vi } from "vitest"; import type { Nitro } from "nitro/types"; import { generateNetlifyEdgeFunction, @@ -177,6 +177,18 @@ describe("nitro:preset:netlify", async () => { ); }); + it("forwards event.waitUntil to the Netlify context", async () => { + const { default: handler } = (await import(resolve(ctx.outDir, "server/main.mjs"))) as { + default: (req: Request, ctx: FunctionContext) => Promise; + }; + const waitUntil = vi.fn(); + const res = await handler(new Request("https://example.com/wait-until"), { + waitUntil, + } as unknown as FunctionContext); + expect(await res.text()).toBe("done"); + expect(waitUntil).toHaveBeenCalledWith(expect.any(Promise)); + }); + // https://github.com/nitrojs/nitro/issues/5035 // Missing public assets now reach the function, which opts them out of // the immutable `cache-control` route rule of the asset dir. @@ -299,4 +311,19 @@ describe("nitro:preset:netlify-edge", async () => { ); expect(stdout).toBe("ok"); }); + + it.runIf(hasDeno)("forwards event.waitUntil to the Netlify context", async () => { + const { stdout } = await execa( + "deno", + [ + "eval", + `const { default: handler } = await import("./server.mjs"); + let calls = 0; + const res = await handler(new Request("http://localhost/wait-until"), { waitUntil: () => calls++ }); + console.log(await res.text(), calls);`, + ], + { cwd: ctx.nitro!.options.output.serverDir } + ); + expect(stdout).toBe("done 1"); + }); });