@netlify/plugin-nextjs 5.10.0 → 5.10.2

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

@@ -121,6 +121,14 @@ var init_internal = __esm({
 init_internal();
 
 // src/run/handlers/request-context.cts
+var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
+var REQUEST_COUNTER_KEY = Symbol.for("nf-request-counter");
+var extendedGlobalThis = globalThis;
+function getFallbackRequestID() {
+  const requestNumber = extendedGlobalThis[REQUEST_COUNTER_KEY] ?? 0;
+  extendedGlobalThis[REQUEST_COUNTER_KEY] = requestNumber + 1;
+  return `#${requestNumber}`;
+}
 function createRequestContext(request, context) {
   const backgroundWorkPromises = [];
   const isDebugRequest = request?.headers.has("x-nf-debug-logging") || request?.headers.has("x-next-debug-logging");
@@ -142,16 +150,15 @@ function createRequestContext(request, context) {
     get backgroundWorkPromise() {
       return Promise.allSettled(backgroundWorkPromises);
     },
-    logger
+    logger,
+    requestID: request?.headers.get("x-nf-request-id") ?? getFallbackRequestID()
   };
 }
-var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
 var requestContextAsyncLocalStorage;
 function getRequestContextAsyncLocalStorage() {
   if (requestContextAsyncLocalStorage) {
     return requestContextAsyncLocalStorage;
   }
-  const extendedGlobalThis = globalThis;
   if (extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY]) {
     return extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY];
   }

package/dist/run/handlers/server.js

@@ -4,27 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  getTracer
-} from "../../esm-chunks/chunk-WHUPSPWV.js";
-import {
-  adjustDateHeader,
-  setCacheControlHeaders,
-  setCacheStatusHeader,
-  setCacheTagsHeaders,
-  setVaryHeaders
-} from "../../esm-chunks/chunk-YMNWVS6T.js";
-import "../../esm-chunks/chunk-K4RDUZYO.js";
-import {
-  getLogger,
-  getRequestContext
-} from "../../esm-chunks/chunk-SGXRYMYQ.js";
-import {
-  nextResponseProxy
-} from "../../esm-chunks/chunk-XS27YRA5.js";
-import "../../esm-chunks/chunk-5QSXBV7L.js";
-import "../../esm-chunks/chunk-GNGHTHMQ.js";
-import "../../esm-chunks/chunk-TYCYFZ22.js";
 import {
   __commonJS,
   __toESM
@@ -3111,19 +3090,21 @@ function toComputeResponse(res) {
   return res.computeResponse;
 }
 
-// src/run/handlers/wait-until.cts
-var NEXT_REQUEST_CONTEXT_SYMBOL = Symbol.for("@next/request-context");
-function setupWaitUntil() {
-  ;
-  globalThis[NEXT_REQUEST_CONTEXT_SYMBOL] = {
-    get() {
-      return { waitUntil: getRequestContext()?.trackBackgroundWork };
-    }
-  };
-}
-
 // src/run/handlers/server.ts
-var nextImportPromise = import("../../esm-chunks/next-7JK63CHT.js");
+import {
+  adjustDateHeader,
+  setCacheControlHeaders,
+  setCacheStatusHeader,
+  setCacheTagsHeaders,
+  setVaryHeaders
+} from "../headers.js";
+import { nextResponseProxy } from "../revalidate.js";
+import { setFetchBeforeNextPatchedIt } from "../storage/storage.cjs";
+import { getLogger } from "./request-context.cjs";
+import { getTracer } from "./tracer.cjs";
+import { setupWaitUntil } from "./wait-until.cjs";
+setFetchBeforeNextPatchedIt(globalThis.fetch);
+var nextImportPromise = import("../next.cjs");
 setupWaitUntil();
 var nextHandler;
 var nextConfig;
@@ -3193,7 +3174,6 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
         headers: response.headers,
         request,
         span,
-        tracer,
         requestContext
       });
     }

package/dist/run/handlers/tracer.cjs

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/run/handlers/tracer.cts
 var tracer_exports = {};
 __export(tracer_exports, {
-  getTracer: () => getTracer
+  getTracer: () => getTracer,
+  recordWarning: () => recordWarning
 });
 module.exports = __toCommonJS(tracer_exports);
 
@@ -845,120 +846,8 @@ function handleFn(span, opts, fn) {
   }
 }
 
-// src/run/handlers/request-context.cts
-var import_node_async_hooks = require("node:async_hooks");
-
-// node_modules/@netlify/functions/dist/chunk-C6P2IO65.mjs
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
-};
-
-// node_modules/@netlify/functions/dist/chunk-ATZ7N7EG.mjs
-var import_process = require("process");
-var systemLogTag;
-var serializeError;
-var LogLevel;
-var SystemLogger;
-var systemLogger;
-var init_system_logger = __esm({
-  "src/lib/system_logger.ts"() {
-    systemLogTag = "__nfSystemLog";
-    serializeError = (error) => {
-      const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
-      return {
-        error: error.message,
-        error_cause: cause,
-        error_stack: error.stack
-      };
-    };
-    LogLevel = /* @__PURE__ */ ((LogLevel2) => {
-      LogLevel2[LogLevel2["Debug"] = 1] = "Debug";
-      LogLevel2[LogLevel2["Log"] = 2] = "Log";
-      LogLevel2[LogLevel2["Error"] = 3] = "Error";
-      return LogLevel2;
-    })(LogLevel || {});
-    SystemLogger = class _SystemLogger {
-      fields;
-      logLevel;
-      constructor(fields = {}, logLevel = 2) {
-        this.fields = fields;
-        this.logLevel = logLevel;
-      }
-      doLog(logger, message) {
-        if (import_process.env.NETLIFY_DEV && !import_process.env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
-          return;
-        }
-        logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
-      }
-      log(message) {
-        if (this.logLevel > 2) {
-          return;
-        }
-        this.doLog(console.log, message);
-      }
-      debug(message) {
-        if (this.logLevel > 1) {
-          return;
-        }
-        this.doLog(console.debug, message);
-      }
-      error(message) {
-        if (this.logLevel > 3) {
-          return;
-        }
-        this.doLog(console.error, message);
-      }
-      withLogLevel(level) {
-        return new _SystemLogger(this.fields, level);
-      }
-      withFields(fields) {
-        return new _SystemLogger(
-          {
-            ...this.fields,
-            ...fields
-          },
-          this.logLevel
-        );
-      }
-      withError(error) {
-        const fields = error instanceof Error ? serializeError(error) : { error };
-        return this.withFields(fields);
-      }
-    };
-    systemLogger = new SystemLogger();
-  }
-});
-
-// node_modules/@netlify/functions/dist/chunk-7ANA32NV.mjs
-var init_internal = __esm({
-  "src/internal.ts"() {
-    init_system_logger();
-  }
-});
-
-// node_modules/@netlify/functions/dist/internal.mjs
-init_internal();
-
-// src/run/handlers/request-context.cts
-var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
-var requestContextAsyncLocalStorage;
-function getRequestContextAsyncLocalStorage() {
-  if (requestContextAsyncLocalStorage) {
-    return requestContextAsyncLocalStorage;
-  }
-  const extendedGlobalThis = globalThis;
-  if (extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY]) {
-    return extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY];
-  }
-  const storage = new import_node_async_hooks.AsyncLocalStorage();
-  requestContextAsyncLocalStorage = storage;
-  extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY] = storage;
-  return storage;
-}
-var getRequestContext = () => getRequestContextAsyncLocalStorage().getStore();
-
 // src/run/handlers/tracer.cts
+var import_request_context = require("./request-context.cjs");
 var spanMeta = /* @__PURE__ */ new WeakMap();
 var spanCounter = /* @__PURE__ */ new WeakMap();
 function spanHook(span) {
@@ -967,7 +856,7 @@ function spanHook(span) {
     originalEnd(endTime);
     const meta = spanMeta.get(span);
     if (meta) {
-      const requestContext = getRequestContext();
+      const requestContext = (0, import_request_context.getRequestContext)();
       if (requestContext?.captureServerTiming) {
         const duration = (typeof endTime === "number" ? endTime : performance.now()) - meta.start;
         const serverTiming = requestContext.serverTiming ?? "";
@@ -1009,7 +898,19 @@ function getTracer() {
   }
   return tracer;
 }
+function recordWarning(warning, span) {
+  const spanToRecordWarningOn = span ?? trace.getActiveSpan();
+  if (!spanToRecordWarningOn) {
+    return;
+  }
+  spanToRecordWarningOn.recordException(warning);
+  spanToRecordWarningOn.setAttributes({
+    severity: "alert",
+    warning: true
+  });
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getTracer
+  getTracer,
+  recordWarning
 });

package/dist/run/handlers/tracing.js

@@ -4,9 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  getLogger
-} from "../../esm-chunks/chunk-SGXRYMYQ.js";
 import {
   esm_exports,
   init_esm
@@ -68866,9 +68863,10 @@ var import_resources = __toESM(require_src5(), 1);
 var import_sdk_node = __toESM(require_src36(), 1);
 var import_sdk_trace_node = __toESM(require_src20(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
+import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-F536DQ6H.js");
+} = await import("../../esm-chunks/package-7HACW4PO.js");
 var sdk = new import_sdk_node.NodeSDK({
   resource: new import_resources.Resource({
     [import_semantic_conventions.SEMRESATTRS_SERVICE_NAME]: name,

package/dist/run/handlers/wait-until.cjs

@@ -23,127 +23,13 @@ __export(wait_until_exports, {
   setupWaitUntil: () => setupWaitUntil
 });
 module.exports = __toCommonJS(wait_until_exports);
-
-// src/run/handlers/request-context.cts
-var import_node_async_hooks = require("node:async_hooks");
-
-// node_modules/@netlify/functions/dist/chunk-C6P2IO65.mjs
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
-};
-
-// node_modules/@netlify/functions/dist/chunk-ATZ7N7EG.mjs
-var import_process = require("process");
-var systemLogTag;
-var serializeError;
-var LogLevel;
-var SystemLogger;
-var systemLogger;
-var init_system_logger = __esm({
-  "src/lib/system_logger.ts"() {
-    systemLogTag = "__nfSystemLog";
-    serializeError = (error) => {
-      const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
-      return {
-        error: error.message,
-        error_cause: cause,
-        error_stack: error.stack
-      };
-    };
-    LogLevel = /* @__PURE__ */ ((LogLevel2) => {
-      LogLevel2[LogLevel2["Debug"] = 1] = "Debug";
-      LogLevel2[LogLevel2["Log"] = 2] = "Log";
-      LogLevel2[LogLevel2["Error"] = 3] = "Error";
-      return LogLevel2;
-    })(LogLevel || {});
-    SystemLogger = class _SystemLogger {
-      fields;
-      logLevel;
-      constructor(fields = {}, logLevel = 2) {
-        this.fields = fields;
-        this.logLevel = logLevel;
-      }
-      doLog(logger, message) {
-        if (import_process.env.NETLIFY_DEV && !import_process.env.NETLIFY_ENABLE_SYSTEM_LOGGING) {
-          return;
-        }
-        logger(systemLogTag, JSON.stringify({ msg: message, fields: this.fields }));
-      }
-      log(message) {
-        if (this.logLevel > 2) {
-          return;
-        }
-        this.doLog(console.log, message);
-      }
-      debug(message) {
-        if (this.logLevel > 1) {
-          return;
-        }
-        this.doLog(console.debug, message);
-      }
-      error(message) {
-        if (this.logLevel > 3) {
-          return;
-        }
-        this.doLog(console.error, message);
-      }
-      withLogLevel(level) {
-        return new _SystemLogger(this.fields, level);
-      }
-      withFields(fields) {
-        return new _SystemLogger(
-          {
-            ...this.fields,
-            ...fields
-          },
-          this.logLevel
-        );
-      }
-      withError(error) {
-        const fields = error instanceof Error ? serializeError(error) : { error };
-        return this.withFields(fields);
-      }
-    };
-    systemLogger = new SystemLogger();
-  }
-});
-
-// node_modules/@netlify/functions/dist/chunk-7ANA32NV.mjs
-var init_internal = __esm({
-  "src/internal.ts"() {
-    init_system_logger();
-  }
-});
-
-// node_modules/@netlify/functions/dist/internal.mjs
-init_internal();
-
-// src/run/handlers/request-context.cts
-var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");
-var requestContextAsyncLocalStorage;
-function getRequestContextAsyncLocalStorage() {
-  if (requestContextAsyncLocalStorage) {
-    return requestContextAsyncLocalStorage;
-  }
-  const extendedGlobalThis = globalThis;
-  if (extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY]) {
-    return extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY];
-  }
-  const storage = new import_node_async_hooks.AsyncLocalStorage();
-  requestContextAsyncLocalStorage = storage;
-  extendedGlobalThis[REQUEST_CONTEXT_GLOBAL_KEY] = storage;
-  return storage;
-}
-var getRequestContext = () => getRequestContextAsyncLocalStorage().getStore();
-
-// src/run/handlers/wait-until.cts
+var import_request_context = require("./request-context.cjs");
 var NEXT_REQUEST_CONTEXT_SYMBOL = Symbol.for("@next/request-context");
 function setupWaitUntil() {
   ;
   globalThis[NEXT_REQUEST_CONTEXT_SYMBOL] = {
     get() {
-      return { waitUntil: getRequestContext()?.trackBackgroundWork };
+      return { waitUntil: (0, import_request_context.getRequestContext)()?.trackBackgroundWork };
     }
   };
 }

package/dist/run/headers.js

@@ -4,17 +4,190 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  adjustDateHeader,
-  setCacheControlHeaders,
-  setCacheStatusHeader,
-  setCacheTagsHeaders,
-  setVaryHeaders
-} from "../esm-chunks/chunk-YMNWVS6T.js";
-import "../esm-chunks/chunk-K4RDUZYO.js";
-import "../esm-chunks/chunk-SGXRYMYQ.js";
-import "../esm-chunks/chunk-TYCYFZ22.js";
 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");
+var NetlifyVaryKeys = /* @__PURE__ */ new Set(["header", "language", "cookie", "query", "country"]);
+var isNetlifyVaryKey = (key) => NetlifyVaryKeys.has(key);
+var generateNetlifyVaryValues = ({
+  header,
+  language,
+  cookie,
+  query,
+  country
+}) => {
+  const values = [];
+  if (query.length !== 0) {
+    if (query.includes(ALL_VARIATIONS)) {
+      values.push(`query`);
+    } else {
+      values.push(`query=${query.join(`|`)}`);
+    }
+  }
+  if (header.length !== 0) {
+    values.push(`header=${header.join(`|`)}`);
+  }
+  if (language.length !== 0) {
+    values.push(`language=${language.join(`|`)}`);
+  }
+  if (cookie.length !== 0) {
+    values.push(`cookie=${cookie.join(`|`)}`);
+  }
+  if (country.length !== 0) {
+    values.push(`country=${country.join(`|`)}`);
+  }
+  return values.join(",");
+};
+var getHeaderValueArray = (header) => {
+  return header.split(",").map((value) => value.trim()).filter(Boolean);
+};
+var omitHeaderValues = (header, values) => {
+  const headerValues = getHeaderValueArray(header);
+  const filteredValues = headerValues.filter(
+    (value) => !values.some((val) => value.startsWith(val))
+  );
+  return filteredValues.join(", ");
+};
+var setVaryHeaders = (headers, request, { basePath, i18n }) => {
+  const netlifyVaryValues = {
+    header: ["x-nextjs-data", "x-next-debug-logging"],
+    language: [],
+    cookie: ["__prerender_bypass", "__next_preview_data"],
+    query: ["__nextDataReq"],
+    country: []
+  };
+  const vary = headers.get("vary");
+  if (vary !== null) {
+    netlifyVaryValues.header.push(...getHeaderValueArray(vary));
+  }
+  const path = new URL(request.url).pathname;
+  const locales = i18n && i18n.localeDetection !== false ? i18n.locales : [];
+  if (locales.length > 1 && (path === "/" || path === basePath)) {
+    netlifyVaryValues.language.push(...locales);
+    netlifyVaryValues.cookie.push(`NEXT_LOCALE`);
+  }
+  const userNetlifyVary = headers.get("netlify-vary");
+  if (userNetlifyVary) {
+    const directives = getHeaderValueArray(userNetlifyVary);
+    for (const directive of directives) {
+      const [key, value] = directive.split("=");
+      if (key === "query" && !value) {
+        netlifyVaryValues.query.push(ALL_VARIATIONS);
+      } else if (value && isNetlifyVaryKey(key)) {
+        netlifyVaryValues[key].push(...value.split("|"));
+      }
+    }
+  }
+  headers.set(`netlify-vary`, generateNetlifyVaryValues(netlifyVaryValues));
+};
+var adjustDateHeader = async ({
+  headers,
+  request,
+  span,
+  requestContext
+}) => {
+  const key = new URL(request.url).pathname;
+  let lastModified;
+  if (requestContext.responseCacheGetLastModified) {
+    lastModified = requestContext.responseCacheGetLastModified;
+  } else {
+    recordWarning(
+      new Error("lastModified not found in requestContext, falling back to trying blobs"),
+      span
+    );
+    const cacheStore = getMemoizedKeyValueStoreBackedByRegionalBlobStore({ consistency: "strong" });
+    const cacheEntry = await cacheStore.get(
+      key,
+      "get cache to calculate date header"
+    );
+    lastModified = cacheEntry?.lastModified;
+  }
+  if (!lastModified) {
+    recordWarning(
+      new Error(
+        "lastModified not found in either requestContext or blobs, date header for cached response is not set"
+      ),
+      span
+    );
+    return;
+  }
+  const lastModifiedDate = new Date(lastModified);
+  headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
+  headers.set("date", lastModifiedDate.toUTCString());
+};
+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")) {
+    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");
+      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",
+      "stale-while-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" : [
+        ...getHeaderValueArray(cacheControl).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.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) {
+    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"))) {
+    headers.set("netlify-cache-tag", requestContext.responseCacheTags.join(","));
+  }
+};
+var NEXT_CACHE_TO_CACHE_STATUS = {
+  HIT: `hit`,
+  MISS: `fwd=miss`,
+  STALE: `hit; fwd=stale`
+};
+var setCacheStatusHeader = (headers, nextCache) => {
+  if (typeof nextCache === "string") {
+    if (nextCache in NEXT_CACHE_TO_CACHE_STATUS) {
+      const cacheStatus = NEXT_CACHE_TO_CACHE_STATUS[nextCache];
+      headers.set("cache-status", `"Next.js"; ${cacheStatus}`);
+    }
+    headers.delete("x-nextjs-cache");
+  }
+};
 export {
   adjustDateHeader,
   setCacheControlHeaders,