@netlify/plugin-nextjs 5.9.3 → 5.10.0-fetch-patch-logs

package/dist/build/content/prerendered.js

@@ -7,14 +7,14 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-J4D25YDX.js";
+} from "../../esm-chunks/chunk-JPTD4GEB.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5QSXBV7L.js";
 import "../../esm-chunks/chunk-GNGHTHMQ.js";
 import "../../esm-chunks/chunk-ZSVHJNNY.js";
 import "../../esm-chunks/chunk-KGYJQ2U2.js";
 import "../../esm-chunks/chunk-ZENB67PD.js";
 import "../../esm-chunks/chunk-APO262HE.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-OEQOKJGE.js";
 export {
   copyFetchContent,

package/dist/build/content/static.js

@@ -9,20 +9,22 @@ import {
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
+  setHeadersConfig,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-NTLBFRPA.js";
+} from "../../esm-chunks/chunk-MKMK7FBF.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5QSXBV7L.js";
 import "../../esm-chunks/chunk-GNGHTHMQ.js";
 import "../../esm-chunks/chunk-ZSVHJNNY.js";
 import "../../esm-chunks/chunk-KGYJQ2U2.js";
 import "../../esm-chunks/chunk-ZENB67PD.js";
 import "../../esm-chunks/chunk-APO262HE.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-OEQOKJGE.js";
 export {
   copyStaticAssets,
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
+  setHeadersConfig,
   unpublishStaticDir
 };

package/dist/build/functions/edge.js

@@ -7,7 +7,7 @@
 import {
   clearStaleEdgeHandlers,
   createEdgeHandlers
-} from "../../esm-chunks/chunk-HGXG447M.js";
+} from "../../esm-chunks/chunk-3RQSTU2O.js";
 import "../../esm-chunks/chunk-GFYWJNQR.js";
 import "../../esm-chunks/chunk-KGYJQ2U2.js";
 import "../../esm-chunks/chunk-APO262HE.js";

package/dist/build/templates/handler-monorepo.tmpl.js

@@ -28,6 +28,7 @@ export default async function (req, context) {
         'site.id': context.site.id,
         'http.method': req.method,
         'http.target': req.url,
+        isBackgroundRevalidation: requestContext.isBackgroundRevalidation,
         monorepo: true,
         cwd: '{{cwd}}',
       })
@@ -35,7 +36,7 @@ export default async function (req, context) {
         const { default: handler } = await import('{{nextServerHandler}}')
         cachedHandler = handler
       }
-      const response = await cachedHandler(req, context)
+      const response = await cachedHandler(req, context, span, requestContext)
       span.setAttributes({
         'http.status_code': response.status,
       })

package/dist/build/templates/handler.tmpl.js

@@ -25,10 +25,11 @@ export default async function handler(req, context) {
         'site.id': context.site.id,
         'http.method': req.method,
         'http.target': req.url,
+        isBackgroundRevalidation: requestContext.isBackgroundRevalidation,
         monorepo: false,
         cwd: process.cwd(),
       })
-      const response = await serverHandler(req, context)
+      const response = await serverHandler(req, context, span, requestContext)
       span.setAttributes({
         'http.status_code': response.status,
       })

package/dist/esm-chunks/{chunk-HGXG447M.js → chunk-3RQSTU2O.js}

@@ -409,9 +409,7 @@ var require_dist = __commonJS({
 var import_fast_glob = __toESM(require_out(), 1);
 var import_path_to_regexp = __toESM(require_dist(), 1);
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, join, relative, sep } from "node:path";
-import { sep as posixSep } from "node:path/posix";
-var toPosixPath = (path) => path.split(sep).join(posixSep);
+import { dirname, join } from "node:path";
 var writeEdgeManifest = async (ctx, manifest) => {
   await mkdir(ctx.edgeFunctionsDir, { recursive: true });
   await writeFile(join(ctx.edgeFunctionsDir, "manifest.json"), JSON.stringify(manifest, null, 2));
@@ -429,13 +427,21 @@ var copyRuntime = async (ctx, handlerDirectory) => {
   );
 };
 var augmentMatchers = (matchers, ctx) => {
-  if (!ctx.buildConfig.i18n) {
+  const i18NConfig = ctx.buildConfig.i18n;
+  if (!i18NConfig) {
     return matchers;
   }
   return matchers.flatMap((matcher) => {
     if (matcher.originalSource && matcher.locale !== false) {
       return [
-        matcher,
+        matcher.regexp ? {
+          ...matcher,
+          // https://github.com/vercel/next.js/blob/5e236c9909a768dc93856fdfad53d4f4adc2db99/packages/next/src/build/analysis/get-page-static-info.ts#L332-L336
+          // Next is producing pretty broad matcher for i18n locale. Presumably rest of their infrastructure protects this broad matcher
+          // from matching on non-locale paths. For us this becomes request entry point, so we need to narrow it down to just defined locales
+          // otherwise users might get unexpected matches on paths like `/api*`
+          regexp: matcher.regexp.replace(/\[\^\/\.]+/g, `(${i18NConfig.locales.join("|")})`)
+        } : matcher,
         {
           ...matcher,
           regexp: (0, import_path_to_regexp.pathToRegexp)(matcher.originalSource).source
@@ -471,14 +477,13 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
   await writeFile(
     join(handlerDirectory, `${handlerName}.js`),
     `
-    import { decode as _base64Decode } from './edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts';
     import { init as htmlRewriterInit } from './edge-runtime/vendor/deno.land/x/htmlrewriter@v1.0.0/src/index.ts'
-    import {handleMiddleware} from './edge-runtime/middleware.ts';
+    import { handleMiddleware } from './edge-runtime/middleware.ts';
     import handler from './server/${name}.js';
 
-    await htmlRewriterInit({ module_or_path: _base64Decode(${JSON.stringify(
-      htmlRewriterWasm.toString("base64")
-    )}).buffer });
+    await htmlRewriterInit({ module_or_path: Uint8Array.from(${JSON.stringify([
+      ...htmlRewriterWasm
+    ])}) });
 
     export default (req, context) => handleMiddleware(req, context, handler);
     `
@@ -493,21 +498,9 @@ var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
   const parts = [shim];
   const outputFile = join(destDir, `server/${name}.js`);
   if (wasm?.length) {
-    const base64ModulePath = join(
-      destDir,
-      "edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts"
-    );
-    const base64ModulePathRelativeToOutputFile = toPosixPath(
-      relative(dirname(outputFile), base64ModulePath)
-    );
-    parts.push(`import { decode as _base64Decode } from "${base64ModulePathRelativeToOutputFile}";`);
     for (const wasmChunk of wasm ?? []) {
       const data = await readFile(join(srcDir, wasmChunk.filePath));
-      parts.push(
-        `const ${wasmChunk.name} = _base64Decode(${JSON.stringify(
-          data.toString("base64")
-        )}).buffer`
-      );
+      parts.push(`const ${wasmChunk.name} = Uint8Array.from(${JSON.stringify([...data])})`);
     }
   }
   for (const file of files) {

package/dist/esm-chunks/{chunk-BEIUVQZK.js → chunk-HXVWGXWM.js}

@@ -6,7 +6,10 @@
     
 import {
   getRegionalBlobStore
-} from "./chunk-K4RDUZYO.js";
+} from "./chunk-RYJYZQ4X.js";
+import {
+  getLogger
+} from "./chunk-SGXRYMYQ.js";
 import {
   encodeBlobKey
 } from "./chunk-TYCYFZ22.js";
@@ -93,15 +96,6 @@ var adjustDateHeader = async ({
   tracer,
   requestContext
 }) => {
-  const cacheState = headers.get("x-nextjs-cache");
-  const isServedFromCache = cacheState === "HIT" || cacheState === "STALE";
-  span.setAttributes({
-    "x-nextjs-cache": cacheState ?? void 0,
-    isServedFromCache
-  });
-  if (!isServedFromCache) {
-    return;
-  }
   const key = new URL(request.url).pathname;
   let lastModified;
   if (requestContext.responseCacheGetLastModified) {
@@ -145,20 +139,33 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = ({ headers, status }, request, requestContext) => {
+function setCacheControlFromRequestContext(headers, revalidate) {
+  const cdnCacheControl = (
+    // if we are serving already stale response, instruct edge to not attempt to cache that response
+    headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate, durable" : `s-maxage=${revalidate || 31536e3}, stale-while-revalidate=31536000, durable`
+  );
+  headers.set("netlify-cdn-cache-control", cdnCacheControl);
+}
+var setCacheControlHeaders = ({ headers, status }, request, requestContext, nextConfig) => {
   if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
-    const cdnCacheControl = (
-      // if we are serving already stale response, instruct edge to not attempt to cache that response
-      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate, durable" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000, durable`
-    );
-    headers.set("netlify-cdn-cache-control", cdnCacheControl);
+    setCacheControlFromRequestContext(headers, requestContext.routeHandlerRevalidate);
     return;
   }
-  if (status === 404 && request.url.endsWith(".php")) {
-    headers.set("cache-control", "public, max-age=0, must-revalidate");
-    headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
+  if (status === 308 && request.url.endsWith("/") !== nextConfig.trailingSlash) {
+    getLogger().withFields({ trailingSlash: nextConfig.trailingSlash, location: headers.get("location") }).log("NetlifyHeadersHandler.trailingSlashRedirect");
   }
   const cacheControl = headers.get("cache-control");
+  if (status === 404) {
+    if (request.url.endsWith(".php")) {
+      headers.set("cache-control", "public, max-age=0, must-revalidate");
+      headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
+      return;
+    }
+    if (process.env.CACHE_404_PAGE && request.url.endsWith("/404") && ["GET", "HEAD"].includes(request.method)) {
+      setCacheControlFromRequestContext(headers, requestContext.pageHandlerRevalidate);
+      return;
+    }
+  }
   if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
       "s-maxage",
@@ -177,7 +184,7 @@ var setCacheControlHeaders = ({ headers, status }, request, requestContext) => {
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
   }
-  if (cacheControl === null && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsReadForNonFallback) {
+  if (cacheControl === null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsReadForNonFallback) {
     headers.set("cache-control", "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
   }
@@ -192,8 +199,7 @@ var NEXT_CACHE_TO_CACHE_STATUS = {
   MISS: `fwd=miss`,
   STALE: `hit; fwd=stale`
 };
-var setCacheStatusHeader = (headers) => {
-  const nextCache = headers.get("x-nextjs-cache");
+var setCacheStatusHeader = (headers, nextCache) => {
   if (typeof nextCache === "string") {
     if (nextCache in NEXT_CACHE_TO_CACHE_STATUS) {
       const cacheStatus = NEXT_CACHE_TO_CACHE_STATUS[nextCache];

package/dist/esm-chunks/{chunk-J4D25YDX.js → chunk-JPTD4GEB.js}

@@ -4,6 +4,9 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  encodeBlobKey
+} from "./chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./chunk-5QSXBV7L.js";
@@ -20,9 +23,6 @@ import {
 import {
   require_semver
 } from "./chunk-APO262HE.js";
-import {
-  encodeBlobKey
-} from "./chunk-TYCYFZ22.js";
 import {
   __toESM
 } from "./chunk-OEQOKJGE.js";
@@ -160,12 +160,13 @@ var routeToFilePath = (path) => {
   }
   return `/${path}`;
 };
-var buildPagesCacheValue = async (path, shouldUseEnumKind, shouldSkipJson = false) => ({
+var buildPagesCacheValue = async (path, initialRevalidateSeconds, shouldUseEnumKind, shouldSkipJson = false) => ({
   kind: shouldUseEnumKind ? "PAGES" : "PAGE",
   html: await readFile(`${path}.html`, "utf-8"),
   pageData: shouldSkipJson ? {} : JSON.parse(await readFile(`${path}.json`, "utf-8")),
   headers: void 0,
-  status: void 0
+  status: void 0,
+  revalidate: initialRevalidateSeconds
 });
 var buildAppCacheValue = async (path, shouldUseAppPageKind) => {
   const meta = JSON.parse(await readFile(`${path}.meta`, "utf-8"));
@@ -231,6 +232,7 @@ var copyPrerenderedContent = async (ctx) => {
                 }
                 value = await buildPagesCacheValue(
                   join(ctx.publishDir, "server/pages", key),
+                  meta.initialRevalidateSeconds,
                   shouldUseEnumKind
                 );
                 break;
@@ -260,6 +262,7 @@ var copyPrerenderedContent = async (ctx) => {
           const key = routeToFilePath(route);
           const value = await buildPagesCacheValue(
             join(ctx.publishDir, "server/pages", key),
+            void 0,
             shouldUseEnumKind,
             true
             // there is no corresponding json file for fallback, so we are skipping it for this entry

package/dist/esm-chunks/{chunk-NTLBFRPA.js → chunk-MKMK7FBF.js}

@@ -4,6 +4,9 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  encodeBlobKey
+} from "./chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./chunk-5QSXBV7L.js";
@@ -17,9 +20,6 @@ import {
 import {
   require_out
 } from "./chunk-KGYJQ2U2.js";
-import {
-  encodeBlobKey
-} from "./chunk-TYCYFZ22.js";
 import {
   __toESM
 } from "./chunk-OEQOKJGE.js";
@@ -80,6 +80,15 @@ var copyStaticAssets = async (ctx) => {
     }
   });
 };
+var setHeadersConfig = async (ctx) => {
+  const { basePath } = ctx.buildConfig;
+  ctx.netlifyConfig.headers.push({
+    for: `${basePath}/_next/static/*`,
+    values: {
+      "Cache-Control": "public, max-age=31536000, immutable"
+    }
+  });
+};
 var copyStaticExport = async (ctx) => {
   await tracer.withActiveSpan("copyStaticExport", async () => {
     if (!ctx.exportDetail?.outDirectory) {
@@ -116,6 +125,7 @@ var unpublishStaticDir = async (ctx) => {
 export {
   copyStaticContent,
   copyStaticAssets,
+  setHeadersConfig,
   copyStaticExport,
   publishStaticDir,
   unpublishStaticDir

package/dist/esm-chunks/{chunk-K4RDUZYO.js → chunk-RYJYZQ4X.js}

@@ -597,6 +597,7 @@ var getDeployStore = (input = {}) => {
 // src/run/regional-blob-store.cts
 var fetchBeforeNextPatchedIt = globalThis.fetch;
 var getRegionalBlobStore = (args = {}) => {
+  console.log("Blob store fetch patched", fetchBeforeNextPatchedIt.__nextPatched);
   return getDeployStore({
     ...args,
     fetch: fetchBeforeNextPatchedIt,

package/dist/esm-chunks/{chunk-LVXJQ2G2.js → chunk-SGXRYMYQ.js}

@@ -101,25 +101,6 @@ var init_internal = __esm({
 init_internal();
 
 // src/run/handlers/request-context.cts
-function createRequestContext(request, context) {
-  const backgroundWorkPromises = [];
-  return {
-    captureServerTiming: request?.headers.has("x-next-debug-logging") ?? false,
-    trackBackgroundWork: (promise) => {
-      if (context?.waitUntil) {
-        context.waitUntil(promise);
-      } else {
-        backgroundWorkPromises.push(promise);
-      }
-    },
-    get backgroundWorkPromise() {
-      return Promise.allSettled(backgroundWorkPromises);
-    },
-    logger: systemLogger.withLogLevel(
-      request?.headers.has("x-nf-debug-logging") || request?.headers.has("x-next-debug-logging") ? LogLevel.Debug : LogLevel.Log
-    )
-  };
-}
 var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
 var requestContextAsyncLocalStorage;
 function getRequestContextAsyncLocalStorage() {
@@ -141,7 +122,6 @@ function getLogger() {
 }
 
 export {
-  createRequestContext,
   getRequestContext,
   getLogger
 };

package/dist/esm-chunks/{chunk-NEZW7TGG.js → chunk-WHUPSPWV.js}

@@ -6,7 +6,7 @@
     
 import {
   getRequestContext
-} from "./chunk-LVXJQ2G2.js";
+} from "./chunk-SGXRYMYQ.js";
 import {
   wrapTracer
 } from "./chunk-5QSXBV7L.js";

package/dist/esm-chunks/{next-H2VMRX5P.js → next-LDOXJ7XH.js}

@@ -6,13 +6,13 @@
     
 import {
   getTracer
-} from "./chunk-NEZW7TGG.js";
-import {
-  getRequestContext
-} from "./chunk-LVXJQ2G2.js";
+} from "./chunk-WHUPSPWV.js";
 import {
   getRegionalBlobStore
-} from "./chunk-K4RDUZYO.js";
+} from "./chunk-RYJYZQ4X.js";
+import {
+  getRequestContext
+} from "./chunk-SGXRYMYQ.js";
 import "./chunk-5QSXBV7L.js";
 import "./chunk-GNGHTHMQ.js";
 import {

package/dist/esm-chunks/{package-MI2MBCHL.js → package-F536DQ6H.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.9.3";
+var version = "5.10.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -78,7 +78,7 @@ var devDependencies = {
   "@vercel/nft": "^0.27.0",
   cheerio: "^1.0.0-rc.12",
   "clean-package": "^2.2.0",
-  esbuild: "^0.24.0",
+  esbuild: "^0.25.0",
   execa: "^8.0.1",
   "fast-glob": "^3.3.2",
   "fs-monkey": "^1.0.6",

package/dist/index.js

@@ -7,22 +7,24 @@
 import {
   clearStaleEdgeHandlers,
   createEdgeHandlers
-} from "./esm-chunks/chunk-HGXG447M.js";
+} from "./esm-chunks/chunk-3RQSTU2O.js";
 import {
   clearStaleServerHandlers,
   createServerHandler
 } from "./esm-chunks/chunk-DLVROEVU.js";
 import {
   copyPrerenderedContent
-} from "./esm-chunks/chunk-J4D25YDX.js";
+} from "./esm-chunks/chunk-JPTD4GEB.js";
 import "./esm-chunks/chunk-IJZEDP6B.js";
 import {
   copyStaticAssets,
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
+  setHeadersConfig,
   unpublishStaticDir
-} from "./esm-chunks/chunk-NTLBFRPA.js";
+} from "./esm-chunks/chunk-MKMK7FBF.js";
+import "./esm-chunks/chunk-TYCYFZ22.js";
 import {
   wrapTracer
 } from "./esm-chunks/chunk-5QSXBV7L.js";
@@ -48,7 +50,6 @@ import {
 import "./esm-chunks/chunk-KGYJQ2U2.js";
 import "./esm-chunks/chunk-ZENB67PD.js";
 import "./esm-chunks/chunk-APO262HE.js";
-import "./esm-chunks/chunk-TYCYFZ22.js";
 import "./esm-chunks/chunk-UYKENJEU.js";
 import "./esm-chunks/chunk-OEQOKJGE.js";
 
@@ -83,7 +84,7 @@ var onBuild = async (options) => {
       await saveBuildCache(ctx);
     }
     if (ctx.buildConfig.output === "export") {
-      return Promise.all([copyStaticExport(ctx), setImageConfig(ctx)]);
+      return Promise.all([copyStaticExport(ctx), setHeadersConfig(ctx), setImageConfig(ctx)]);
     }
     await verifyAdvancedAPIRoutes(ctx);
     await verifyNetlifyFormsWorkaround(ctx);
@@ -93,6 +94,7 @@ var onBuild = async (options) => {
       copyPrerenderedContent(ctx),
       createServerHandler(ctx),
       createEdgeHandlers(ctx),
+      setHeadersConfig(ctx),
       setImageConfig(ctx)
     ]);
   });

package/dist/run/handlers/cache.cjs

@@ -203,7 +203,7 @@ var import_constants = require("next/dist/lib/constants.js");
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.9.3";
+var version = "5.10.0";
 
 // src/shared/cache-types.cts
 var isCachedPageValue = (value) => value.kind === "PAGE" || value.kind === "PAGES";
@@ -801,6 +801,7 @@ var getDeployStore = (input = {}) => {
 // src/run/regional-blob-store.cts
 var fetchBeforeNextPatchedIt = globalThis.fetch;
 var getRegionalBlobStore = (args = {}) => {
+  console.log("Blob store fetch patched", fetchBeforeNextPatchedIt.__nextPatched);
   return getDeployStore({
     ...args,
     fetch: fetchBeforeNextPatchedIt,
@@ -1809,6 +1810,19 @@ var NetlifyCacheHandler = class {
     const { encodeBlobKey: encodeBlobKey2 } = await Promise.resolve().then(() => (init_blobkey(), blobkey_exports));
     return await encodeBlobKey2(key);
   }
+  getTTL(blob) {
+    if (blob.value?.kind === "FETCH" || blob.value?.kind === "ROUTE" || blob.value?.kind === "APP_ROUTE" || blob.value?.kind === "PAGE" || blob.value?.kind === "PAGES" || blob.value?.kind === "APP_PAGE") {
+      const { revalidate } = blob.value;
+      if (typeof revalidate === "number") {
+        const revalidateAfter = revalidate * 1e3 + blob.lastModified;
+        return (revalidateAfter - Date.now()) / 1e3;
+      }
+      if (revalidate === false) {
+        return "PERMANENT";
+      }
+    }
+    return "NOT SET";
+  }
   captureResponseCacheLastModified(cacheValue, key, getCacheKeySpan) {
     if (cacheValue.value?.kind === "FETCH") {
       return;
@@ -1871,28 +1885,38 @@ var NetlifyCacheHandler = class {
       }
     }
   }
-  async injectEntryToPrerenderManifest(key, revalidate) {
-    if (this.options.serverDistDir && (typeof revalidate === "number" || revalidate === false)) {
+  async injectEntryToPrerenderManifest(key, { revalidate, cacheControl }) {
+    if (this.options.serverDistDir && (typeof revalidate === "number" || revalidate === false || typeof cacheControl !== "undefined")) {
       try {
         const { loadManifest } = await import("next/dist/server/load-manifest.js");
         const prerenderManifest = loadManifest(
           (0, import_node_path.join)(this.options.serverDistDir, "..", "prerender-manifest.json")
         );
-        try {
-          const { normalizePagePath } = await import("next/dist/shared/lib/page-path/normalize-page-path.js");
-          prerenderManifest.routes[key] = {
-            experimentalPPR: void 0,
-            dataRoute: (0, import_posix.join)("/_next/data", `${normalizePagePath(key)}.json`),
-            srcRoute: null,
-            // FIXME: provide actual source route, however, when dynamically appending it doesn't really matter
-            initialRevalidateSeconds: revalidate,
-            // Pages routes do not have a prefetch data route.
-            prefetchDataRoute: void 0
-          };
-        } catch {
-          const { SharedRevalidateTimings } = await import("next/dist/server/lib/incremental-cache/shared-revalidate-timings.js");
-          const sharedRevalidateTimings = new SharedRevalidateTimings(prerenderManifest);
-          sharedRevalidateTimings.set(key, revalidate);
+        if (typeof cacheControl !== "undefined") {
+          const { SharedCacheControls } = await import(
+            // @ts-expect-error supporting multiple next version, this module is not resolvable with currently used dev dependency
+            // eslint-disable-next-line import/no-unresolved, n/no-missing-import
+            "next/dist/server/lib/incremental-cache/shared-cache-controls.js"
+          );
+          const sharedCacheControls = new SharedCacheControls(prerenderManifest);
+          sharedCacheControls.set(key, cacheControl);
+        } else if (typeof revalidate === "number" || revalidate === false) {
+          try {
+            const { normalizePagePath } = await import("next/dist/shared/lib/page-path/normalize-page-path.js");
+            prerenderManifest.routes[key] = {
+              experimentalPPR: void 0,
+              dataRoute: (0, import_posix.join)("/_next/data", `${normalizePagePath(key)}.json`),
+              srcRoute: null,
+              // FIXME: provide actual source route, however, when dynamically appending it doesn't really matter
+              initialRevalidateSeconds: revalidate,
+              // Pages routes do not have a prefetch data route.
+              prefetchDataRoute: void 0
+            };
+          } catch {
+            const { SharedRevalidateTimings } = await import("next/dist/server/lib/incremental-cache/shared-revalidate-timings.js");
+            const sharedRevalidateTimings = new SharedRevalidateTimings(prerenderManifest);
+            sharedRevalidateTimings.set(key, revalidate);
+          }
         }
       } catch {
       }
@@ -1914,16 +1938,35 @@ var NetlifyCacheHandler = class {
         span.addEvent("Cache miss", { key, blobKey });
         return null;
       }
+      const ttl = this.getTTL(blob);
+      if (getRequestContext()?.isBackgroundRevalidation && typeof ttl === "number" && ttl < 0) {
+        span.addEvent("Discarding stale entry due to SWR background revalidation request", {
+          key,
+          blobKey,
+          ttl
+        });
+        getLogger().withFields({
+          ttl,
+          key
+        }).debug(
+          `[NetlifyCacheHandler.get] Discarding stale entry due to SWR background revalidation request: ${key}`
+        );
+        return null;
+      }
       const staleByTags = await this.checkCacheEntryStaleByTags(blob, ctx.tags, ctx.softTags);
       if (staleByTags) {
-        span.addEvent("Stale", { staleByTags });
+        span.addEvent("Stale", { staleByTags, key, blobKey, ttl });
         return null;
       }
       this.captureResponseCacheLastModified(blob, key, span);
       this.captureCacheTags(blob.value, key);
       switch (blob.value?.kind) {
         case "FETCH":
-          span.addEvent("FETCH", { lastModified: blob.lastModified, revalidate: ctx.revalidate });
+          span.addEvent("FETCH", {
+            lastModified: blob.lastModified,
+            revalidate: ctx.revalidate,
+            ttl
+          });
           return {
             lastModified: blob.lastModified,
             value: blob.value
@@ -1932,7 +1975,9 @@ var NetlifyCacheHandler = class {
         case "APP_ROUTE": {
           span.addEvent(blob.value?.kind, {
             lastModified: blob.lastModified,
-            status: blob.value.status
+            status: blob.value.status,
+            revalidate: blob.value.revalidate,
+            ttl
           });
           const valueWithoutRevalidate = this.captureRouteRevalidateAndRemoveFromObject(blob.value);
           return {
@@ -1945,18 +1990,22 @@ var NetlifyCacheHandler = class {
         }
         case "PAGE":
         case "PAGES": {
-          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified });
           const { revalidate, ...restOfPageValue } = blob.value;
-          await this.injectEntryToPrerenderManifest(key, revalidate);
+          const requestContext = getRequestContext();
+          if (requestContext) {
+            requestContext.pageHandlerRevalidate = revalidate;
+          }
+          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
+          await this.injectEntryToPrerenderManifest(key, blob.value);
           return {
             lastModified: blob.lastModified,
             value: restOfPageValue
           };
         }
         case "APP_PAGE": {
-          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified });
           const { revalidate, rscData, ...restOfPageValue } = blob.value;
-          await this.injectEntryToPrerenderManifest(key, revalidate);
+          span.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
+          await this.injectEntryToPrerenderManifest(key, blob.value);
           return {
             lastModified: blob.lastModified,
             value: {
@@ -1978,20 +2027,23 @@ var NetlifyCacheHandler = class {
     if (isCachedRouteValue(data)) {
       return {
         ...data,
-        revalidate: context2.revalidate,
+        revalidate: context2.revalidate ?? context2.cacheControl?.revalidate,
+        cacheControl: context2.cacheControl,
         body: data.body.toString("base64")
       };
     }
     if (isCachedPageValue(data)) {
       return {
         ...data,
-        revalidate: context2.revalidate
+        revalidate: context2.revalidate ?? context2.cacheControl?.revalidate,
+        cacheControl: context2.cacheControl
       };
     }
     if (data?.kind === "APP_PAGE") {
       return {
         ...data,
-        revalidate: context2.revalidate,
+        revalidate: context2.revalidate ?? context2.cacheControl?.revalidate,
+        cacheControl: context2.cacheControl,
         rscData: data.rscData?.toString("base64")
       };
     }

package/dist/run/handlers/request-context.cjs

@@ -123,7 +123,14 @@ init_internal();
 // src/run/handlers/request-context.cts
 function createRequestContext(request, context) {
   const backgroundWorkPromises = [];
+  const isDebugRequest = request?.headers.has("x-nf-debug-logging") || request?.headers.has("x-next-debug-logging");
+  const logger = systemLogger.withLogLevel(isDebugRequest ? LogLevel.Debug : LogLevel.Log);
+  const isBackgroundRevalidation = request?.headers.get("netlify-invocation-source") === "background-revalidation";
+  if (isBackgroundRevalidation) {
+    logger.debug("[NetlifyNextRuntime] Background revalidation request");
+  }
   return {
+    isBackgroundRevalidation,
     captureServerTiming: request?.headers.has("x-next-debug-logging") ?? false,
     trackBackgroundWork: (promise) => {
       if (context?.waitUntil) {
@@ -135,9 +142,7 @@ function createRequestContext(request, context) {
     get backgroundWorkPromise() {
       return Promise.allSettled(backgroundWorkPromises);
     },
-    logger: systemLogger.withLogLevel(
-      request?.headers.has("x-nf-debug-logging") || request?.headers.has("x-next-debug-logging") ? LogLevel.Debug : LogLevel.Log
-    )
+    logger
   };
 }
 var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");

package/dist/run/handlers/server.js

@@ -6,26 +6,25 @@
     
 import {
   getTracer
-} from "../../esm-chunks/chunk-NEZW7TGG.js";
-import {
-  createRequestContext,
-  getLogger,
-  getRequestContext
-} from "../../esm-chunks/chunk-LVXJQ2G2.js";
+} from "../../esm-chunks/chunk-WHUPSPWV.js";
 import {
   adjustDateHeader,
   setCacheControlHeaders,
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../../esm-chunks/chunk-BEIUVQZK.js";
-import "../../esm-chunks/chunk-K4RDUZYO.js";
+} from "../../esm-chunks/chunk-HXVWGXWM.js";
+import "../../esm-chunks/chunk-RYJYZQ4X.js";
+import {
+  getLogger,
+  getRequestContext
+} from "../../esm-chunks/chunk-SGXRYMYQ.js";
 import {
   nextResponseProxy
 } from "../../esm-chunks/chunk-XS27YRA5.js";
+import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5QSXBV7L.js";
 import "../../esm-chunks/chunk-GNGHTHMQ.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import {
   __commonJS,
   __toESM
@@ -3124,7 +3123,7 @@ function setupWaitUntil() {
 }
 
 // src/run/handlers/server.ts
-var nextImportPromise = import("../../esm-chunks/next-H2VMRX5P.js");
+var nextImportPromise = import("../../esm-chunks/next-LDOXJ7XH.js");
 setupWaitUntil();
 var nextHandler;
 var nextConfig;
@@ -3141,7 +3140,7 @@ var disableFaultyTransferEncodingHandling = (res) => {
     return originalStoreHeader.call(this, firstLine, headers);
   };
 };
-var server_default = async (request) => {
+var server_default = async (request, _context, topLevelSpan, requestContext) => {
   const tracer = getTracer();
   if (!nextHandler) {
     await tracer.withActiveSpan("initialize next server", async () => {
@@ -3171,7 +3170,6 @@ var server_default = async (request) => {
       }
     });
     disableFaultyTransferEncodingHandling(res);
-    const requestContext = getRequestContext() ?? createRequestContext();
     const resProxy = nextResponseProxy(res, requestContext);
     const nextHandlerPromise = nextHandler(req, resProxy).catch((error) => {
       getLogger().withError(error).error("next handler error");
@@ -3182,24 +3180,40 @@ var server_default = async (request) => {
     });
     const response = await toComputeResponse(resProxy);
     if (requestContext.responseCacheKey) {
-      span.setAttribute("responseCacheKey", requestContext.responseCacheKey);
+      topLevelSpan.setAttribute("responseCacheKey", requestContext.responseCacheKey);
+    }
+    const nextCache = response.headers.get("x-nextjs-cache");
+    const isServedFromNextCache = nextCache === "HIT" || nextCache === "STALE";
+    topLevelSpan.setAttributes({
+      "x-nextjs-cache": nextCache ?? void 0,
+      isServedFromNextCache
+    });
+    if (isServedFromNextCache) {
+      await adjustDateHeader({
+        headers: response.headers,
+        request,
+        span,
+        tracer,
+        requestContext
+      });
     }
-    await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext });
-    setCacheControlHeaders(response, request, requestContext);
+    setCacheControlHeaders(response, request, requestContext, nextConfig);
     setCacheTagsHeaders(response.headers, requestContext);
     setVaryHeaders(response.headers, request, nextConfig);
-    setCacheStatusHeader(response.headers);
-    if (response.status > 300 && response.status < 400 || response.status >= 500) {
-      const body = await response.text();
-      return new Response(body || null, response);
+    setCacheStatusHeader(response.headers, nextCache);
+    async function waitForBackgroundWork() {
+      await nextHandlerPromise;
+      res.emit("close");
+      await requestContext.backgroundWorkPromise;
     }
     const keepOpenUntilNextFullyRendered = new TransformStream({
       async flush() {
-        await nextHandlerPromise;
-        res.emit("close");
-        await requestContext.backgroundWorkPromise;
+        await waitForBackgroundWork();
       }
     });
+    if (!response.body) {
+      await waitForBackgroundWork();
+    }
     return new Response(response.body?.pipeThrough(keepOpenUntilNextFullyRendered), response);
   });
 };

package/dist/run/handlers/tracing.js

@@ -6,7 +6,7 @@
     
 import {
   getLogger
-} from "../../esm-chunks/chunk-LVXJQ2G2.js";
+} from "../../esm-chunks/chunk-SGXRYMYQ.js";
 import {
   esm_exports,
   init_esm
@@ -68868,7 +68868,7 @@ var import_sdk_trace_node = __toESM(require_src20(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-MI2MBCHL.js");
+} = await import("../../esm-chunks/package-F536DQ6H.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/dist/run/headers.js

@@ -10,8 +10,9 @@ import {
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../esm-chunks/chunk-BEIUVQZK.js";
-import "../esm-chunks/chunk-K4RDUZYO.js";
+} from "../esm-chunks/chunk-HXVWGXWM.js";
+import "../esm-chunks/chunk-RYJYZQ4X.js";
+import "../esm-chunks/chunk-SGXRYMYQ.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
 import "../esm-chunks/chunk-OEQOKJGE.js";
 export {

package/dist/run/next.cjs

@@ -2098,6 +2098,7 @@ var getDeployStore = (input = {}) => {
 // src/run/regional-blob-store.cts
 var fetchBeforeNextPatchedIt = globalThis.fetch;
 var getRegionalBlobStore = (args = {}) => {
+  console.log("Blob store fetch patched", fetchBeforeNextPatchedIt.__nextPatched);
   return getDeployStore({
     ...args,
     fetch: fetchBeforeNextPatchedIt,

package/dist/run/regional-blob-store.cjs

@@ -616,6 +616,7 @@ var getDeployStore = (input = {}) => {
 // src/run/regional-blob-store.cts
 var fetchBeforeNextPatchedIt = globalThis.fetch;
 var getRegionalBlobStore = (args = {}) => {
+  console.log("Blob store fetch patched", fetchBeforeNextPatchedIt.__nextPatched);
   return getDeployStore({
     ...args,
     fetch: fetchBeforeNextPatchedIt,

package/edge-runtime/vendor.ts

@@ -2,7 +2,6 @@
 // It acts as a seed that populates the `vendor/` directory and should not be
 // imported directly.
 
-import 'https://deno.land/std@0.175.0/encoding/base64.ts'
 import 'https://deno.land/std@0.175.0/http/cookie.ts'
 import 'https://deno.land/std@0.175.0/node/buffer.ts'
 import 'https://deno.land/std@0.175.0/node/events.ts'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/plugin-nextjs",
-  "version": "5.9.3",
+  "version": "5.10.0-fetch-patch-logs",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",