@netlify/plugin-nextjs 5.10.7 → 5.11.1

package/dist/esm-chunks/{chunk-NFOLXH6F.js → chunk-YUXQHOYO.js}

@@ -7,7 +7,7 @@
 import {
   __commonJS,
   __require
-} from "./chunk-OEQOKJGE.js";
+} from "./chunk-6BT4RYQJ.js";
 
 // node_modules/fast-glob/out/utils/array.js
 var require_array = __commonJS({

package/dist/index.js

@@ -5,16 +5,12 @@
       })();
     
 import {
+  trace,
   wrapTracer
-} from "./esm-chunks/chunk-5QSXBV7L.js";
-import {
-  init_esm,
-  trace
-} from "./esm-chunks/chunk-GNGHTHMQ.js";
-import "./esm-chunks/chunk-OEQOKJGE.js";
+} from "./esm-chunks/chunk-FKDTZJRV.js";
+import "./esm-chunks/chunk-6BT4RYQJ.js";
 
 // src/index.ts
-init_esm();
 import { rm } from "fs/promises";
 import { restoreBuildCache, saveBuildCache } from "./build/cache.js";
 import { copyPrerenderedContent } from "./build/content/prerendered.js";

package/dist/run/config.js

@@ -4,16 +4,16 @@
         return createRequire(import.meta.url);
       })();
     
-import "../esm-chunks/chunk-OEQOKJGE.js";
+import "../esm-chunks/chunk-6BT4RYQJ.js";
 
 // src/run/config.ts
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { PLUGIN_DIR, RUN_CONFIG } from "./constants.js";
+import { PLUGIN_DIR, RUN_CONFIG_FILE } from "./constants.js";
 import { setInMemoryCacheMaxSizeFromNextConfig } from "./storage/storage.cjs";
 var getRunConfig = async () => {
-  return JSON.parse(await readFile(resolve(PLUGIN_DIR, RUN_CONFIG), "utf-8"));
+  return JSON.parse(await readFile(resolve(PLUGIN_DIR, RUN_CONFIG_FILE), "utf-8"));
 };
 var setRunConfig = (config) => {
   const cacheHandler = join(PLUGIN_DIR, ".netlify/dist/run/handlers/cache.cjs");

package/dist/run/constants.js

@@ -4,16 +4,16 @@
         return createRequire(import.meta.url);
       })();
     
-import "../esm-chunks/chunk-OEQOKJGE.js";
+import "../esm-chunks/chunk-6BT4RYQJ.js";
 
 // src/run/constants.ts
 import { resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
 var PLUGIN_DIR = resolve(`${MODULE_DIR}../../..`);
-var RUN_CONFIG = "run-config.json";
+var RUN_CONFIG_FILE = "run-config.json";
 export {
   MODULE_DIR,
   PLUGIN_DIR,
-  RUN_CONFIG
+  RUN_CONFIG_FILE
 };

package/dist/run/handlers/cache.cjs

@@ -6,8 +6,8 @@ var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name2 in all)
-    __defProp(target, name2, { get: all[name2], enumerable: true });
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -37,172 +37,13 @@ module.exports = __toCommonJS(cache_exports);
 var import_node_buffer = require("node:buffer");
 var import_node_path = require("node:path");
 var import_posix = require("node:path/posix");
-
-// 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-7VFCQORF.mjs
-var BUILDER_FUNCTIONS_FLAG;
-var HTTP_STATUS_METHOD_NOT_ALLOWED;
-var HTTP_STATUS_OK;
-var METADATA_VERSION;
-var init_consts = __esm({
-  "src/lib/consts.ts"() {
-    BUILDER_FUNCTIONS_FLAG = true;
-    HTTP_STATUS_METHOD_NOT_ALLOWED = 405;
-    HTTP_STATUS_OK = 200;
-    METADATA_VERSION = 1;
-  }
-});
-
-// node_modules/@netlify/functions/dist/chunk-6V4VUZWK.mjs
-var augmentResponse;
-var wrapHandler;
-var init_builder = __esm({
-  "src/lib/builder.ts"() {
-    init_consts();
-    augmentResponse = (response) => {
-      if (!response) {
-        return response;
-      }
-      const metadata = { version: METADATA_VERSION, builder_function: BUILDER_FUNCTIONS_FLAG, ttl: response.ttl || 0 };
-      return {
-        ...response,
-        metadata
-      };
-    };
-    wrapHandler = (handler) => (
-      // eslint-disable-next-line promise/prefer-await-to-callbacks
-      (event, context, callback) => {
-        if (event.httpMethod !== "GET" && event.httpMethod !== "HEAD") {
-          return Promise.resolve({
-            body: "Method Not Allowed",
-            statusCode: HTTP_STATUS_METHOD_NOT_ALLOWED
-          });
-        }
-        const modifiedEvent = {
-          ...event,
-          multiValueQueryStringParameters: {},
-          queryStringParameters: {}
-        };
-        const wrappedCallback = (error, response) => (
-          // eslint-disable-next-line promise/prefer-await-to-callbacks
-          callback ? callback(error, augmentResponse(response)) : null
-        );
-        const execution = handler(modifiedEvent, context, wrappedCallback);
-        if (typeof execution === "object" && typeof execution.then === "function") {
-          return execution.then(augmentResponse);
-        }
-        return execution;
-      }
-    );
-  }
-});
-
-// node_modules/@netlify/functions/dist/chunk-EZL2F32K.mjs
-var import_process = require("process");
-var purgeCache;
-var init_purge_cache = __esm({
-  "src/lib/purge_cache.ts"() {
-    purgeCache = async (options = {}) => {
-      if (globalThis.fetch === void 0) {
-        throw new Error(
-          "`fetch` is not available. Please ensure you're using Node.js version 18.0.0 or above. Refer to https://ntl.fyi/functions-runtime for more information."
-        );
-      }
-      const { siteID } = options;
-      const { siteSlug } = options;
-      const { domain } = options;
-      if (siteID && siteSlug || siteID && domain || siteSlug && domain) {
-        throw new Error('Can only pass one of either "siteID", "siteSlug", or "domain"');
-      }
-      const payload = {
-        cache_tags: options.tags
-      };
-      if ("deployAlias" in options) {
-        payload.deploy_alias = options.deployAlias;
-      } else if (!import_process.env.NETLIFY_LOCAL) {
-        payload.deploy_alias = import_process.env.NETLIFY_BRANCH;
-      }
-      const token = import_process.env.NETLIFY_PURGE_API_TOKEN || options.token;
-      if (import_process.env.NETLIFY_LOCAL && !token) {
-        const scope = options.tags?.length ? ` for tags ${options.tags?.join(", ")}` : "";
-        console.log(`Skipping purgeCache${scope} in local development.`);
-        return;
-      }
-      if (siteSlug) {
-        payload.site_slug = siteSlug;
-      } else if (domain) {
-        payload.domain = domain;
-      } else {
-        payload.site_id = siteID || import_process.env.SITE_ID;
-        if (!payload.site_id) {
-          throw new Error(
-            "The Netlify site ID was not found in the execution environment. Please supply it manually using the `siteID` property."
-          );
-        }
-      }
-      if (!token) {
-        throw new Error(
-          "The cache purge API token was not found in the execution environment. Please supply it manually using the `token` property."
-        );
-      }
-      const headers = {
-        "Content-Type": "application/json; charset=utf8",
-        Authorization: `Bearer ${token}`
-      };
-      if (options.userAgent) {
-        headers["user-agent"] = options.userAgent;
-      }
-      const apiURL = options.apiURL || "https://api.netlify.com";
-      const response = await fetch(`${apiURL}/api/v1/purge`, {
-        method: "POST",
-        headers,
-        body: JSON.stringify(payload)
-      });
-      if (!response.ok) {
-        let text;
-        try {
-          text = await response.text();
-        } catch {
-        }
-        if (text) {
-          throw new Error(`Cache purge API call was unsuccessful.
-Status: ${response.status}
-Body: ${text}`);
-        }
-        throw new Error(`Cache purge API call was unsuccessful.
-Status: ${response.status}`);
-      }
-    };
-  }
-});
-
-// node_modules/@netlify/functions/dist/chunk-MMCOWF6U.mjs
-var import_node_stream = require("node:stream");
-var import_node_util = require("node:util");
-var pipeline = (0, import_node_util.promisify)(import_node_stream.pipeline);
-
-// node_modules/@netlify/functions/dist/main.mjs
-init_builder();
-init_purge_cache();
-
-// src/run/handlers/cache.cts
 var import_constants = require("next/dist/lib/constants.js");
-
-// package.json
-var name = "@netlify/plugin-nextjs";
-var version = "5.10.7";
-
-// src/run/handlers/cache.cts
 var import_cache_types = require("../../shared/cache-types.cjs");
 var import_storage = require("../storage/storage.cjs");
 var import_request_context = require("./request-context.cjs");
+var import_tags_handler = require("./tags-handler.cjs");
 var import_tracer = require("./tracer.cjs");
-var purgeCacheUserAgent = `${name}@${version}`;
+var memoizedPrerenderManifest;
 var NetlifyCacheHandler = class {
   options;
   revalidatedTags;
@@ -281,13 +122,24 @@ var NetlifyCacheHandler = class {
       }
     }
   }
+  async getPrerenderManifest(serverDistDir) {
+    if (memoizedPrerenderManifest) {
+      return memoizedPrerenderManifest;
+    }
+    const prerenderManifestPath = (0, import_node_path.join)(serverDistDir, "..", "prerender-manifest.json");
+    try {
+      const { loadManifest } = await import("next/dist/server/load-manifest.external.js");
+      memoizedPrerenderManifest = loadManifest(prerenderManifestPath);
+    } catch {
+      const { loadManifest } = await import("next/dist/server/load-manifest.js");
+      memoizedPrerenderManifest = loadManifest(prerenderManifestPath);
+    }
+    return memoizedPrerenderManifest;
+  }
   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")
-        );
+        const prerenderManifest = await this.getPrerenderManifest(this.options.serverDistDir);
         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
@@ -471,58 +323,20 @@ var NetlifyCacheHandler = class {
         const requestContext = (0, import_request_context.getRequestContext)();
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : encodeURI(key)}`;
-          const tags = tag.split(/,|%2c/gi).filter(Boolean);
-          if (tags.length === 0) {
-            return;
-          }
-          (0, import_request_context.getLogger)().debug(`Purging CDN cache for: [${tag}]`);
-          requestContext.trackBackgroundWork(
-            purgeCache({ tags, userAgent: purgeCacheUserAgent }).catch((error) => {
-              (0, import_request_context.getLogger)().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`);
-            })
-          );
+          requestContext?.trackBackgroundWork((0, import_tags_handler.purgeEdgeCache)(tag));
         }
       }
     });
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async revalidateTag(tagOrTags, ...args) {
-    const revalidateTagPromise = this.doRevalidateTag(tagOrTags, ...args);
-    const requestContext = (0, import_request_context.getRequestContext)();
-    if (requestContext) {
-      requestContext.trackBackgroundWork(revalidateTagPromise);
-    }
-    return revalidateTagPromise;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async doRevalidateTag(tagOrTags, ...args) {
-    (0, import_request_context.getLogger)().withFields({ tagOrTags, args }).debug("NetlifyCacheHandler.revalidateTag");
-    const tags = (Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags]).flatMap((tag) => tag.split(/,|%2c/gi)).filter(Boolean);
-    if (tags.length === 0) {
-      return;
-    }
-    const data = {
-      revalidatedAt: Date.now()
-    };
-    await Promise.all(
-      tags.map(async (tag) => {
-        try {
-          await this.cacheStore.set(tag, data, "tagManifest.set");
-        } catch (error) {
-          (0, import_request_context.getLogger)().withError(error).log(`Failed to update tag manifest for ${tag}`);
-        }
-      })
-    );
-    await purgeCache({ tags, userAgent: purgeCacheUserAgent }).catch((error) => {
-      (0, import_request_context.getLogger)().withError(error).error(`[NetlifyCacheHandler]: Purging the cache for tags ${tags.join(", ")} failed`);
-    });
+  async revalidateTag(tagOrTags) {
+    return (0, import_tags_handler.markTagsAsStaleAndPurgeEdgeCache)(tagOrTags);
   }
   resetRequestCache() {
   }
   /**
    * Checks if a cache entry is stale through on demand revalidated tags
    */
-  async checkCacheEntryStaleByTags(cacheEntry, tags = [], softTags = []) {
+  checkCacheEntryStaleByTags(cacheEntry, tags = [], softTags = []) {
     let cacheTags = [];
     if (cacheEntry.value?.kind === "FETCH") {
       cacheTags = [...tags, ...softTags];
@@ -538,31 +352,7 @@ var NetlifyCacheHandler = class {
         }
       }
     }
-    return new Promise((resolve, reject) => {
-      const tagManifestPromises = [];
-      for (const tag of cacheTags) {
-        const tagManifestPromise = this.cacheStore.get(
-          tag,
-          "tagManifest.get"
-        );
-        tagManifestPromises.push(
-          tagManifestPromise.then((tagManifest) => {
-            if (!tagManifest) {
-              return false;
-            }
-            const isStale = tagManifest.revalidatedAt >= (cacheEntry.lastModified || Date.now());
-            if (isStale) {
-              resolve(true);
-              return true;
-            }
-            return false;
-          })
-        );
-      }
-      Promise.all(tagManifestPromises).then((tagManifestAreStale) => {
-        resolve(tagManifestAreStale.some((tagIsStale) => tagIsStale));
-      }).catch(reject);
-    });
+    return (0, import_tags_handler.isAnyTagStale)(cacheTags, cacheEntry.lastModified);
   }
 };
 var cache_default = NetlifyCacheHandler;

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

@@ -28,97 +28,72 @@ __export(request_context_exports, {
 module.exports = __toCommonJS(request_context_exports);
 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
+// node_modules/@netlify/functions/dist/internal.js
 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();
+var systemLogTag = "__nfSystemLog";
+var serializeError = (error) => {
+  const cause = error?.cause instanceof Error ? serializeError(error.cause) : error.cause;
+  return {
+    error: error.message,
+    error_cause: cause,
+    error_stack: error.stack
+  };
+};
+var LogLevel = /* @__PURE__ */ ((LogLevel2) => {
+  LogLevel2[LogLevel2["Debug"] = 1] = "Debug";
+  LogLevel2[LogLevel2["Log"] = 2] = "Log";
+  LogLevel2[LogLevel2["Error"] = 3] = "Error";
+  return LogLevel2;
+})(LogLevel || {});
+var SystemLogger = class _SystemLogger {
+  fields;
+  logLevel;
+  constructor(fields = {}, logLevel = 2) {
+    this.fields = fields;
+    this.logLevel = logLevel;
   }
-});
-
-// node_modules/@netlify/functions/dist/chunk-7ANA32NV.mjs
-var init_internal = __esm({
-  "src/internal.ts"() {
-    init_system_logger();
+  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 }));
   }
-});
-
-// node_modules/@netlify/functions/dist/internal.mjs
-init_internal();
+  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);
+  }
+};
+var systemLogger = new SystemLogger();
 
 // src/run/handlers/request-context.cts
 var REQUEST_CONTEXT_GLOBAL_KEY = Symbol.for("nf-request-context-async-local-storage");

package/dist/run/handlers/server.js

@@ -7,7 +7,7 @@
 import {
   __commonJS,
   __toESM
-} from "../../esm-chunks/chunk-OEQOKJGE.js";
+} from "../../esm-chunks/chunk-6BT4RYQJ.js";
 
 // node_modules/node-inspect-extracted/dist/inspect.js
 var require_inspect = __commonJS({
@@ -3091,6 +3091,7 @@ function toComputeResponse(res) {
 }
 
 // src/run/handlers/server.ts
+import { getRunConfig, setRunConfig } from "../config.js";
 import {
   adjustDateHeader,
   setCacheControlHeaders,
@@ -3102,12 +3103,17 @@ import { nextResponseProxy } from "../revalidate.js";
 import { setFetchBeforeNextPatchedIt } from "../storage/storage.cjs";
 import { getLogger } from "./request-context.cjs";
 import { getTracer, recordWarning } from "./tracer.cjs";
+import { configureUseCacheHandlers } from "./use-cache-handler.js";
 import { setupWaitUntil } from "./wait-until.cjs";
 setFetchBeforeNextPatchedIt(globalThis.fetch);
-var nextImportPromise = import("../next.cjs");
+var { nextConfig, enableUseCacheHandler } = await getRunConfig();
+if (enableUseCacheHandler) {
+  configureUseCacheHandlers();
+}
+setRunConfig(nextConfig);
 setupWaitUntil();
+var nextImportPromise = import("../next.cjs");
 var nextHandler;
-var nextConfig;
 var disableFaultyTransferEncodingHandling = (res) => {
   const originalStoreHeader = res._storeHeader;
   res._storeHeader = function _storeHeader(firstLine, headers) {
@@ -3125,9 +3131,6 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
   const tracer = getTracer();
   if (!nextHandler) {
     await tracer.withActiveSpan("initialize next server", async () => {
-      const { getRunConfig, setRunConfig } = await import("../config.js");
-      nextConfig = await getRunConfig();
-      setRunConfig(nextConfig);
       const { getMockedRequestHandler } = await nextImportPromise;
       const url = new URL(request.url);
       nextHandler = await getMockedRequestHandler({