From fe49b93896e0f68727c63d1ec6b91523072bd9a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 27 Mar 2025 15:32:53 +0000 Subject: [PATCH 1/2] chore(deps): update dependency @netlify/functions to ^3.0.4 --- package-lock.json | 58 ++++++++--------------------------------------- package.json | 2 +- 2 files changed, 10 insertions(+), 50 deletions(-) diff --git a/package-lock.json b/package-lock.json index 65bb0d5215..00950ab150 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@netlify/edge-bundler": "^12.2.3", "@netlify/edge-functions": "^2.11.1", "@netlify/eslint-config-node": "^7.0.1", - "@netlify/functions": "^3.0.0", + "@netlify/functions": "^3.0.4", "@netlify/serverless-functions-api": "^1.36.0", "@netlify/zip-it-and-ship-it": "^10.0.4", "@opentelemetry/api": "^1.8.0", @@ -4868,12 +4868,12 @@ } }, "node_modules/@netlify/functions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.0.tgz", - "integrity": "sha512-XXf9mNw4+fkxUzukDpJtzc32bl1+YlXZwEhc5ZgMcTbJPLpgRLDs5WWSPJ4eY/Mv1ZFvtxmMwmfgoQYVt68Qog==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.4.tgz", + "integrity": "sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==", "dev": true, "dependencies": { - "@netlify/serverless-functions-api": "1.30.1" + "@netlify/serverless-functions-api": "1.36.0" }, "engines": { "node": ">=18.0.0" @@ -4893,19 +4893,6 @@ "node": "^14.16.0 || >=16.0.0" } }, - "node_modules/@netlify/functions/node_modules/@netlify/serverless-functions-api": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.30.1.tgz", - "integrity": "sha512-JkbaWFeydQdeDHz1mAy4rw+E3bl9YtbCgkntfTxq+IlNX/aIMv2/b1kZnQZcil4/sPoZGL831Dq6E374qRpU1A==", - "dev": true, - "dependencies": { - "@netlify/node-cookies": "^0.1.0", - "urlpattern-polyfill": "8.0.2" - }, - "engines": { - "node": ">=18.0.0" - } - }, "node_modules/@netlify/git-utils": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-5.2.0.tgz", @@ -4977,15 +4964,6 @@ "node": "^14.16.0 || >=16.0.0" } }, - "node_modules/@netlify/node-cookies": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@netlify/node-cookies/-/node-cookies-0.1.0.tgz", - "integrity": "sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==", - "dev": true, - "engines": { - "node": "^14.16.0 || >=16.0.0" - } - }, "node_modules/@netlify/open-api": { "version": "2.36.0", "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.36.0.tgz", @@ -39271,24 +39249,12 @@ } }, "@netlify/functions": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.0.tgz", - "integrity": "sha512-XXf9mNw4+fkxUzukDpJtzc32bl1+YlXZwEhc5ZgMcTbJPLpgRLDs5WWSPJ4eY/Mv1ZFvtxmMwmfgoQYVt68Qog==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/@netlify/functions/-/functions-3.0.4.tgz", + "integrity": "sha512-Ox8+ABI+nsLK+c4/oC5dpquXuEIjzfTlJrdQKgQijCsDQoje7inXFAtKDLvvaGvuvE+PVpMLwQcIUL6P9Ob1hQ==", "dev": true, "requires": { - "@netlify/serverless-functions-api": "1.30.1" - }, - "dependencies": { - "@netlify/serverless-functions-api": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/@netlify/serverless-functions-api/-/serverless-functions-api-1.30.1.tgz", - "integrity": "sha512-JkbaWFeydQdeDHz1mAy4rw+E3bl9YtbCgkntfTxq+IlNX/aIMv2/b1kZnQZcil4/sPoZGL831Dq6E374qRpU1A==", - "dev": true, - "requires": { - "@netlify/node-cookies": "^0.1.0", - "urlpattern-polyfill": "8.0.2" - } - } + "@netlify/serverless-functions-api": "1.36.0" } }, "@netlify/functions-utils": { @@ -39360,12 +39326,6 @@ "path-exists": "^5.0.0" } }, - "@netlify/node-cookies": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@netlify/node-cookies/-/node-cookies-0.1.0.tgz", - "integrity": "sha512-OAs1xG+FfLX0LoRASpqzVntVV/RpYkgpI0VrUnw2u0Q1qiZUzcPffxRK8HF3gc4GjuhG5ahOEMJ9bswBiZPq0g==", - "dev": true - }, "@netlify/open-api": { "version": "2.36.0", "resolved": "https://registry.npmjs.org/@netlify/open-api/-/open-api-2.36.0.tgz", diff --git a/package.json b/package.json index e9ea79c4b5..5e24d31871 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "@netlify/edge-bundler": "^12.2.3", "@netlify/edge-functions": "^2.11.1", "@netlify/eslint-config-node": "^7.0.1", - "@netlify/functions": "^3.0.0", + "@netlify/functions": "^3.0.4", "@netlify/serverless-functions-api": "^1.36.0", "@netlify/zip-it-and-ship-it": "^10.0.4", "@opentelemetry/api": "^1.8.0", From 99fed3e261898eafb11ac1d2dbc68d379b5967e2 Mon Sep 17 00:00:00 2001 From: Mateusz Bocian Date: Thu, 27 Mar 2025 12:27:16 -0400 Subject: [PATCH 2/2] chore: remove FutureContext now that waitUntil type is defined --- src/run/handlers/request-context.cts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/run/handlers/request-context.cts b/src/run/handlers/request-context.cts index 36e27e35a9..c48686fb94 100644 --- a/src/run/handlers/request-context.cts +++ b/src/run/handlers/request-context.cts @@ -7,11 +7,6 @@ import type { NetlifyCachedRouteValue } from '../../shared/cache-types.cjs' type SystemLogger = typeof systemLogger -// TODO: remove once public types are updated -export interface FutureContext extends Context { - waitUntil?: (promise: Promise) => void -} - export type RequestContext = { /** * Determine if this request is for CDN SWR background revalidation @@ -43,7 +38,7 @@ export type RequestContext = { type RequestContextAsyncLocalStorage = AsyncLocalStorage -export function createRequestContext(request?: Request, context?: FutureContext): RequestContext { +export function createRequestContext(request?: Request, context?: Context): RequestContext { const backgroundWorkPromises: Promise[] = [] const isDebugRequest =