@netlify/plugin-nextjs 5.10.2 → 5.10.4

package/dist/esm-chunks/{package-7HACW4PO.js → package-GF3YXDC5.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.10.2";
+var version = "5.10.4";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,7 +58,7 @@ var homepage = "https://opennext.js.org/netlify";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.5",
   "@netlify/blobs": "^8.1.2",
-  "@netlify/build": "^30.1.0",
+  "@netlify/build": "^30.1.1",
   "@netlify/edge-bundler": "^12.4.0",
   "@netlify/edge-functions": "^2.11.1",
   "@netlify/eslint-config-node": "^7.0.1",
@@ -88,7 +88,7 @@ var devDependencies = {
   memfs: "^4.9.2",
   "mock-require": "^3.0.3",
   msw: "^2.0.7",
-  "netlify-cli": "^19.1.4",
+  "netlify-cli": "^19.1.5",
   next: "^15.0.0-canary.28",
   os: "^0.1.2",
   outdent: "^0.8.0",

package/dist/run/handlers/cache.cjs

@@ -195,7 +195,7 @@ var import_constants = require("next/dist/lib/constants.js");
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.10.2";
+var version = "5.10.4";
 
 // src/run/handlers/cache.cts
 var import_cache_types = require("../../shared/cache-types.cjs");
@@ -259,9 +259,6 @@ var NetlifyCacheHandler = class {
     return restOfRouteValue;
   }
   captureCacheTags(cacheValue, key) {
-    if (!cacheValue) {
-      return;
-    }
     const requestContext = (0, import_request_context.getRequestContext)();
     if (!requestContext) {
       return;
@@ -269,6 +266,11 @@ var NetlifyCacheHandler = class {
     if (requestContext.responseCacheTags) {
       return;
     }
+    if (!cacheValue) {
+      const cacheTags = [`_N_T_${key === "/index" ? "/" : encodeURI(key)}`];
+      requestContext.responseCacheTags = cacheTags;
+      return;
+    }
     if (cacheValue.kind === "PAGE" || cacheValue.kind === "PAGES" || cacheValue.kind === "APP_PAGE" || cacheValue.kind === "ROUTE" || cacheValue.kind === "APP_ROUTE") {
       if (cacheValue.headers?.[import_constants.NEXT_CACHE_TAGS_HEADER]) {
         const cacheTags = cacheValue.headers[import_constants.NEXT_CACHE_TAGS_HEADER].split(/,|%2c/gi);
@@ -318,7 +320,7 @@ var NetlifyCacheHandler = class {
   }
   async get(...args) {
     return this.tracer.withActiveSpan("get cache key", async (span) => {
-      const [key, ctx = {}] = args;
+      const [key, context = {}] = args;
       (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.get]: ${key}`);
       span.setAttributes({ key });
       const blob = await this.cacheStore.get(key, "blobStore.get");
@@ -340,18 +342,25 @@ var NetlifyCacheHandler = class {
         );
         return null;
       }
-      const staleByTags = await this.checkCacheEntryStaleByTags(blob, ctx.tags, ctx.softTags);
+      const staleByTags = await this.checkCacheEntryStaleByTags(
+        blob,
+        context.tags,
+        context.softTags
+      );
       if (staleByTags) {
         span.addEvent("Stale", { staleByTags, key, ttl });
         return null;
       }
       this.captureResponseCacheLastModified(blob, key, span);
-      this.captureCacheTags(blob.value, key);
+      const isDataRequest = Boolean(context.fetchUrl);
+      if (!isDataRequest) {
+        this.captureCacheTags(blob.value, key);
+      }
       switch (blob.value?.kind) {
         case "FETCH":
           span.addEvent("FETCH", {
             lastModified: blob.lastModified,
-            revalidate: ctx.revalidate,
+            revalidate: context.revalidate,
             ttl
           });
           return {
@@ -390,6 +399,10 @@ var NetlifyCacheHandler = class {
           };
         }
         case "APP_PAGE": {
+          const requestContext = (0, import_request_context.getRequestContext)();
+          if (requestContext && blob.value?.kind === "APP_PAGE") {
+            requestContext.isCacheableAppPage = true;
+          }
           const { revalidate, rscData, ...restOfPageValue } = blob.value;
           span.addEvent(blob.value?.kind, { lastModified: blob.lastModified, revalidate, ttl });
           await this.injectEntryToPrerenderManifest(key, blob.value);
@@ -443,9 +456,18 @@ var NetlifyCacheHandler = class {
       span.setAttributes({ key, lastModified });
       (0, import_request_context.getLogger)().debug(`[NetlifyCacheHandler.set]: ${key}`);
       const value = this.transformToStorableObject(data, context);
-      this.captureCacheTags(value, key);
+      const isDataReq = Boolean(context.fetchUrl);
+      if (!isDataReq) {
+        this.captureCacheTags(value, key);
+      }
       await this.cacheStore.set(key, { lastModified, value }, "blobStore.set");
-      if (data?.kind === "PAGE" || data?.kind === "PAGES") {
+      if (data?.kind === "APP_PAGE") {
+        const requestContext = (0, import_request_context.getRequestContext)();
+        if (requestContext) {
+          requestContext.isCacheableAppPage = true;
+        }
+      }
+      if (!data && !isDataReq || data?.kind === "PAGE" || data?.kind === "PAGES") {
         const requestContext = (0, import_request_context.getRequestContext)();
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : encodeURI(key)}`;

package/dist/run/handlers/server.js

@@ -3101,7 +3101,7 @@ import {
 import { nextResponseProxy } from "../revalidate.js";
 import { setFetchBeforeNextPatchedIt } from "../storage/storage.cjs";
 import { getLogger } from "./request-context.cjs";
-import { getTracer } from "./tracer.cjs";
+import { getTracer, recordWarning } from "./tracer.cjs";
 import { setupWaitUntil } from "./wait-until.cjs";
 setFetchBeforeNextPatchedIt(globalThis.fetch);
 var nextImportPromise = import("../next.cjs");
@@ -3165,10 +3165,6 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
     }
     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,
@@ -3177,10 +3173,37 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
         requestContext
       });
     }
-    setCacheControlHeaders(response, request, requestContext, nextConfig);
+    setCacheControlHeaders(response, request, requestContext);
     setCacheTagsHeaders(response.headers, requestContext);
     setVaryHeaders(response.headers, request, nextConfig);
     setCacheStatusHeader(response.headers, nextCache);
+    const netlifyVary = response.headers.get("netlify-vary") ?? void 0;
+    const netlifyCdnCacheControl = response.headers.get("netlify-cdn-cache-control") ?? void 0;
+    topLevelSpan.setAttributes({
+      "x-nextjs-cache": nextCache ?? void 0,
+      isServedFromNextCache,
+      netlifyVary,
+      netlifyCdnCacheControl
+    });
+    if (requestContext.isCacheableAppPage) {
+      const isRSCRequest = request.headers.get("rsc") === "1";
+      const contentType = response.headers.get("content-type") ?? void 0;
+      const isExpectedContentType = (isRSCRequest && contentType?.includes("text/x-component") || !isRSCRequest && contentType?.includes("text/html")) ?? false;
+      topLevelSpan.setAttributes({
+        isRSCRequest,
+        isCacheableAppPage: true,
+        contentType,
+        isExpectedContentType
+      });
+      if (!isExpectedContentType) {
+        recordWarning(
+          new Error(
+            `Unexpected content type was produced for App Router page response (isRSCRequest: ${isRSCRequest}, contentType: ${contentType})`
+          ),
+          topLevelSpan
+        );
+      }
+    }
     async function waitForBackgroundWork() {
       await nextHandlerPromise;
       res.emit("close");

package/dist/run/handlers/tracing.js

@@ -68866,7 +68866,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-7HACW4PO.js");
+} = await import("../../esm-chunks/package-GF3YXDC5.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

@@ -7,7 +7,6 @@
 import "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/run/headers.ts
-import { getLogger } from "./handlers/request-context.cjs";
 import { recordWarning } from "./handlers/tracer.cjs";
 import { getMemoizedKeyValueStoreBackedByRegionalBlobStore } from "./storage/storage.cjs";
 var ALL_VARIATIONS = Symbol.for("ALL_VARIATIONS");
@@ -126,15 +125,11 @@ function setCacheControlFromRequestContext(headers, revalidate) {
   );
   headers.set("netlify-cdn-cache-control", cdnCacheControl);
 }
-var setCacheControlHeaders = ({ headers, status }, request, requestContext, nextConfig) => {
+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")) {
     setCacheControlFromRequestContext(headers, requestContext.routeHandlerRevalidate);
     return;
   }
-  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");
@@ -146,6 +141,7 @@ var setCacheControlHeaders = ({ headers, status }, request, requestContext, next
       return;
     }
   }
+  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")) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
       "s-maxage",
@@ -164,13 +160,16 @@ var setCacheControlHeaders = ({ headers, status }, request, requestContext, next
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
   }
-  if (cacheControl === null && ["GET", "HEAD"].includes(request.method) && !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 && !requestContext.didPagesRouterOnDemandRevalidate) {
     headers.set("cache-control", "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
   }
 };
 var setCacheTagsHeaders = (headers, requestContext) => {
-  if (requestContext.responseCacheTags && (headers.has("cache-control") || headers.has("netlify-cdn-cache-control"))) {
+  if (!headers.has("cache-control") && !headers.has("netlify-cdn-cache-control")) {
+    return;
+  }
+  if (requestContext.responseCacheTags) {
     headers.set("netlify-cache-tag", requestContext.responseCacheTags.join(","));
   }
 };

package/dist/run/revalidate.js

@@ -11,8 +11,8 @@ import { isPromise } from "node:util/types";
 function isRevalidateMethod(key, nextResponseField) {
   return key === "revalidate" && typeof nextResponseField === "function";
 }
-var nextResponseProxy = (res, requestContext) => {
-  return new Proxy(res, {
+var nextResponseProxy = (response, requestContext) => {
+  return new Proxy(response, {
     get(target, key) {
       const originalValue = Reflect.get(target, key);
       if (isRevalidateMethod(key, originalValue)) {

package/dist/run/storage/request-scoped-in-memory-cache.cjs

@@ -1409,36 +1409,49 @@ function setInMemoryCacheMaxSizeFromNextConfig(size) {
     extendedGlobalThis[IN_MEMORY_CACHE_MAX_SIZE] = size;
   }
 }
-var estimateBlobSize = (valueToStore) => {
+var isPositiveNumber = (value) => {
+  return typeof value === "number" && value > 0;
+};
+var BASE_BLOB_SIZE = 25;
+var estimateBlobKnownTypeSize = (valueToStore) => {
   if (valueToStore === null || (0, import_types.isPromise)(valueToStore) || (0, import_blob_types.isTagManifest)(valueToStore)) {
-    return 25;
+    return BASE_BLOB_SIZE;
   }
   if ((0, import_blob_types.isHtmlBlob)(valueToStore)) {
-    return valueToStore.html.length;
+    return BASE_BLOB_SIZE + valueToStore.html.length;
+  }
+  if (valueToStore.value?.kind === "FETCH") {
+    return BASE_BLOB_SIZE + valueToStore.value.data.body.length;
+  }
+  if (valueToStore.value?.kind === "APP_PAGE") {
+    return BASE_BLOB_SIZE + valueToStore.value.html.length + (valueToStore.value.rscData?.length ?? 0);
   }
-  let knownKindFailed = false;
+  if (valueToStore.value?.kind === "PAGE" || valueToStore.value?.kind === "PAGES") {
+    return BASE_BLOB_SIZE + valueToStore.value.html.length + JSON.stringify(valueToStore.value.pageData).length;
+  }
+  if (valueToStore.value?.kind === "ROUTE" || valueToStore.value?.kind === "APP_ROUTE") {
+    return BASE_BLOB_SIZE + valueToStore.value.body.length;
+  }
+};
+var estimateBlobSize = (valueToStore) => {
+  let estimatedKnownTypeSize;
+  let estimateBlobKnownTypeSizeError;
   try {
-    if (valueToStore.value?.kind === "FETCH") {
-      return valueToStore.value.data.body.length;
-    }
-    if (valueToStore.value?.kind === "APP_PAGE") {
-      return valueToStore.value.html.length + (valueToStore.value.rscData?.length ?? 0);
-    }
-    if (valueToStore.value?.kind === "PAGE" || valueToStore.value?.kind === "PAGES") {
-      return valueToStore.value.html.length + JSON.stringify(valueToStore.value.pageData).length;
+    estimatedKnownTypeSize = estimateBlobKnownTypeSize(valueToStore);
+    if (isPositiveNumber(estimatedKnownTypeSize)) {
+      return estimatedKnownTypeSize;
     }
-    if (valueToStore.value?.kind === "ROUTE" || valueToStore.value?.kind === "APP_ROUTE") {
-      return valueToStore.value.body.length;
-    }
-  } catch {
-    knownKindFailed = true;
+  } catch (error) {
+    estimateBlobKnownTypeSizeError = error;
   }
+  const calculatedSize = JSON.stringify(valueToStore).length;
   (0, import_tracer.recordWarning)(
     new Error(
-      `Blob size calculation did fallback to JSON.stringify. Kind: KnownKindFailed: ${knownKindFailed}, ${valueToStore.value?.kind ?? "undefined"}`
+      `Blob size calculation did fallback to JSON.stringify. EstimatedKnownTypeSize: ${estimatedKnownTypeSize}, CalculatedSize: ${calculatedSize}, ValueToStore: ${JSON.stringify(valueToStore)}`,
+      estimateBlobKnownTypeSizeError ? { cause: estimateBlobKnownTypeSizeError } : void 0
     )
   );
-  return JSON.stringify(valueToStore).length;
+  return isPositiveNumber(calculatedSize) ? calculatedSize : BASE_BLOB_SIZE;
 };
 function getInMemoryLRUCache() {
   if (typeof extendedGlobalThis[IN_MEMORY_LRU_CACHE] === "undefined") {
@@ -1459,12 +1472,20 @@ var getRequestScopedInMemoryCache = () => {
   return {
     get(key) {
       if (!requestContext) return;
-      const value = inMemoryLRUCache?.get(`${requestContext.requestID}:${key}`);
-      return value === NullValue ? null : value;
+      try {
+        const value = inMemoryLRUCache?.get(`${requestContext.requestID}:${key}`);
+        return value === NullValue ? null : value;
+      } catch (error) {
+        (0, import_tracer.recordWarning)(new Error("Failed to get value from memory cache", { cause: error }));
+      }
     },
     set(key, value) {
       if (!requestContext) return;
-      inMemoryLRUCache?.set(`${requestContext?.requestID}:${key}`, value ?? NullValue);
+      try {
+        inMemoryLRUCache?.set(`${requestContext?.requestID}:${key}`, value ?? NullValue);
+      } catch (error) {
+        (0, import_tracer.recordWarning)(new Error("Failed to store value in memory cache", { cause: error }));
+      }
     }
   };
 };

package/package.json

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