@netlify/plugin-nextjs 5.15.4 → 5.15.5

package/dist/run/handlers/tags-handler.cjs

@@ -86,7 +86,7 @@ var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.15.4";
+var version = "5.15.5";
 
 // src/run/handlers/tags-handler.cts
 var import_storage = require("../storage/storage.cjs");

package/dist/run/headers.js

@@ -148,7 +148,7 @@ function setCacheControlFromRequestContext(headers, revalidate) {
   headers.set("netlify-cdn-cache-control", cdnCacheControl);
 }
 var setCacheControlHeaders = ({ headers, status }, request, requestContext) => {
-  if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
+  if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && (headers.has("x-nextjs-cache") || !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control"))) {
     setCacheControlFromRequestContext(headers, requestContext.routeHandlerRevalidate);
     return;
   }
@@ -164,21 +164,23 @@ var setCacheControlHeaders = ({ headers, status }, request, requestContext) => {
     }
   }
   const cacheControl = headers.get("cache-control");
-  if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
+  if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && (headers.has("x-nextjs-cache") || !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control"))) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
       "s-maxage",
       "stale-while-revalidate"
     ]);
+    const cacheControlForCdnFromNext = headers.get("cdn-cache-control") ?? cacheControl;
     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" : [
-        ...getHeaderValueArray(cacheControl).map(
+        ...getHeaderValueArray(cacheControlForCdnFromNext).map(
           (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
         ),
         "durable"
       ].join(", ")
     );
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
+    headers.delete("cdn-cache-control");
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
   }

package/package.json

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