@netlify/plugin-nextjs 5.2.0 → 5.2.2

package/dist/build/content/prerendered.js

@@ -78,6 +78,7 @@ var Queue = class {
 };
 
 // node_modules/p-limit/index.js
+import { AsyncResource } from "async_hooks";
 function pLimit(concurrency) {
   if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) {
     throw new TypeError("Expected `concurrency` to be a number from 1 and up");
@@ -90,9 +91,9 @@ function pLimit(concurrency) {
       queue.dequeue()();
     }
   };
-  const run = async (fn, resolve, args) => {
+  const run = async (function_, resolve, arguments_) => {
     activeCount++;
-    const result = (async () => fn(...args))();
+    const result = (async () => function_(...arguments_))();
     resolve(result);
     try {
       await result;
@@ -100,8 +101,10 @@ function pLimit(concurrency) {
     }
     next();
   };
-  const enqueue = (fn, resolve, args) => {
-    queue.enqueue(run.bind(void 0, fn, resolve, args));
+  const enqueue = (function_, resolve, arguments_) => {
+    queue.enqueue(
+      AsyncResource.bind(run.bind(void 0, function_, resolve, arguments_))
+    );
     (async () => {
       await Promise.resolve();
       if (activeCount < concurrency && queue.size > 0) {
@@ -109,8 +112,8 @@ function pLimit(concurrency) {
       }
     })();
   };
-  const generator = (fn, ...args) => new Promise((resolve) => {
-    enqueue(fn, resolve, args);
+  const generator = (function_, ...arguments_) => new Promise((resolve) => {
+    enqueue(function_, resolve, arguments_);
   });
   Object.defineProperties(generator, {
     activeCount: {
@@ -120,7 +123,7 @@ function pLimit(concurrency) {
       get: () => queue.size
     },
     clearQueue: {
-      value: () => {
+      value() {
         queue.clear();
       }
     }

package/dist/build/image-cdn.js

@@ -6,7 +6,6 @@
     
 import {
   __commonJS,
-  __require,
   __toESM
 } from "../esm-chunks/chunk-5JVNISGM.js";
 
@@ -223,20 +222,21 @@ var require_utils = __commonJS({
     exports.isRegexChar = (str) => str.length === 1 && exports.hasRegexChars(str);
     exports.escapeRegex = (str) => str.replace(REGEX_SPECIAL_CHARS_GLOBAL, "\\$1");
     exports.toPosixSlashes = (str) => str.replace(REGEX_BACKSLASH, "/");
+    exports.isWindows = () => {
+      if (typeof navigator !== "undefined" && navigator.platform) {
+        const platform = navigator.platform.toLowerCase();
+        return platform === "win32" || platform === "windows";
+      }
+      if (typeof process !== "undefined" && process.platform) {
+        return process.platform === "win32";
+      }
+      return false;
+    };
     exports.removeBackslashes = (str) => {
       return str.replace(REGEX_REMOVE_BACKSLASH, (match) => {
         return match === "\\" ? "" : match;
       });
     };
-    exports.supportsLookbehinds = () => {
-      if (typeof process !== "undefined") {
-        const segs = process.version.slice(1).split(".").map(Number);
-        if (segs.length === 3 && segs[0] >= 9 || segs[0] === 8 && segs[1] >= 10) {
-          return true;
-        }
-      }
-      return false;
-    };
     exports.escapeLast = (input, char, lastIdx) => {
       const idx = input.lastIndexOf(char, lastIdx);
       if (idx === -1)
@@ -753,8 +753,8 @@ var require_parse = __commonJS({
         if (tok.value || tok.output)
           append(tok);
         if (prev && prev.type === "text" && tok.type === "text") {
+          prev.output = (prev.output || prev.value) + tok.value;
           prev.value += tok.value;
-          prev.output = (prev.output || "") + tok.value;
           return;
         }
         tok.prev = prev;
@@ -1091,9 +1091,6 @@ var require_parse = __commonJS({
           if (prev && prev.type === "paren") {
             const next = peek();
             let output = value;
-            if (next === "<" && !utils.supportsLookbehinds()) {
-              throw new Error("Node.js v10 or higher is required for regex lookbehinds");
-            }
             if (prev.value === "(" && !/[!=<:]/.test(next) || next === "<" && !/<([!=]|\w+>)/.test(remaining())) {
               output = `\\${value}`;
             }
@@ -1532,24 +1529,16 @@ var require_picomatch = __commonJS({
 var require_picomatch2 = __commonJS({
   "node_modules/picomatch/index.js"(exports, module) {
     "use strict";
-    var os = __require("os");
     var pico = require_picomatch();
-    var isWindows = os.platform() === "win32";
+    var utils = require_utils();
     function picomatch(glob, options, returnState = false) {
       if (options && (options.windows === null || options.windows === void 0)) {
-        options = { ...options, windows: isWindows };
+        options = { ...options, windows: utils.isWindows() };
       }
       return pico(glob, options, returnState);
     }
+    Object.assign(picomatch, pico);
     module.exports = picomatch;
-    module.exports.test = pico.test;
-    module.exports.matchBase = pico.matchBase;
-    module.exports.isMatch = pico.isMatch;
-    module.exports.parse = pico.parse;
-    module.exports.scan = pico.scan;
-    module.exports.compileRe = pico.compileRe;
-    module.exports.toRegex = pico.toRegex;
-    module.exports.makeRe = pico.makeRe;
   }
 });
 

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

@@ -16,9 +16,7 @@ export default async function (req, context) {
     tracing.start()
   }
 
-  const requestContext = createRequestContext(
-    req.headers.get('x-nf-debug-logging') || req.headers.get('x-next-debug-logging'),
-  )
+  const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {

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

@@ -13,9 +13,7 @@ export default async function handler(req, context) {
   if (process.env.NETLIFY_OTLP_TRACE_EXPORTER_URL) {
     tracing.start()
   }
-  const requestContext = createRequestContext(
-    req.headers.get('x-nf-debug-logging') || req.headers.get('x-next-debug-logging'),
-  )
+  const requestContext = createRequestContext(req.headers.get('x-next-debug-logging'))
   const tracer = getTracer()
 
   const handlerResponse = await runWithRequestContext(requestContext, () => {

package/dist/esm-chunks/{package-ZBRSUKN7.js → package-YOCAX5OR.js}

@@ -8,7 +8,7 @@ import "./chunk-5JVNISGM.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.2.0";
+var version = "5.2.2";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,21 +58,21 @@ var homepage = "https://github.com/netlify/next-runtime-minimal#readme";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.3.0",
-  "@netlify/build": "^29.41.0",
+  "@netlify/build": "^29.41.2",
   "@netlify/edge-bundler": "^12.0.0",
-  "@netlify/edge-functions": "^2.5.1",
+  "@netlify/edge-functions": "^2.6.1",
   "@netlify/eslint-config-node": "^7.0.1",
-  "@netlify/functions": "^2.5.1",
-  "@netlify/serverless-functions-api": "^1.10.1",
-  "@netlify/zip-it-and-ship-it": "^9.32.0",
+  "@netlify/functions": "^2.6.3",
+  "@netlify/serverless-functions-api": "^1.18.1",
+  "@netlify/zip-it-and-ship-it": "^9.32.2",
   "@opentelemetry/api": "^1.8.0",
-  "@opentelemetry/exporter-trace-otlp-http": "^0.49.0",
-  "@opentelemetry/resources": "^1.21.0",
-  "@opentelemetry/sdk-node": "^0.49.0",
-  "@opentelemetry/sdk-trace-node": "^1.21.0",
-  "@opentelemetry/semantic-conventions": "^1.21.0",
-  "@playwright/test": "^1.40.0",
-  "@types/node": "^20.9.2",
+  "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
+  "@opentelemetry/resources": "^1.24.0",
+  "@opentelemetry/sdk-node": "^0.51.0",
+  "@opentelemetry/sdk-trace-node": "^1.24.0",
+  "@opentelemetry/semantic-conventions": "^1.24.0",
+  "@playwright/test": "^1.43.1",
+  "@types/node": "^20.12.7",
   "@types/picomatch": "^2.3.3",
   "@types/uuid": "^9.0.6",
   "@vercel/nft": "^0.26.0",
@@ -81,24 +81,24 @@ var devDependencies = {
   esbuild: "^0.20.0",
   execa: "^8.0.1",
   "fast-glob": "^3.3.2",
-  "fs-monkey": "^1.0.5",
-  "get-port": "^7.0.0",
-  "lambda-local": "^2.1.2",
-  memfs: "^4.6.0",
+  "fs-monkey": "^1.0.6",
+  "get-port": "^7.1.0",
+  "lambda-local": "^2.2.0",
+  memfs: "^4.9.2",
   "mock-require": "^3.0.3",
   msw: "^2.0.7",
   next: "^14.0.4",
   os: "^0.1.2",
   outdent: "^0.8.0",
-  "p-limit": "^4.0.0",
+  "p-limit": "^5.0.0",
   "path-to-regexp": "^6.2.1",
-  picomatch: "^3.0.1",
+  picomatch: "^4.0.2",
   prettier: "^3.2.5",
   semver: "^7.6.0",
-  typescript: "^5.1.6",
-  unionfs: "^4.5.1",
+  typescript: "^5.4.5",
+  unionfs: "^4.5.4",
   uuid: "^9.0.1",
-  vitest: "^1.4.0"
+  vitest: "^1.5.3"
 };
 var clean_package = {
   indent: 2,

package/dist/run/handlers/cache.cjs

@@ -5,9 +5,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -30,230 +27,71 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// node_modules/is-promise/index.js
-var require_is_promise = __commonJS({
-  "node_modules/is-promise/index.js"(exports2, module2) {
-    module2.exports = isPromise;
-    module2.exports.default = isPromise;
-    function isPromise(obj) {
-      return !!obj && (typeof obj === "object" || typeof obj === "function") && typeof obj.then === "function";
-    }
-  }
-});
-
-// node_modules/@netlify/functions/dist/lib/consts.js
-var require_consts = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/consts.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.METADATA_VERSION = exports2.HTTP_STATUS_OK = exports2.HTTP_STATUS_METHOD_NOT_ALLOWED = exports2.BUILDER_FUNCTIONS_FLAG = void 0;
-    var BUILDER_FUNCTIONS_FLAG = true;
-    exports2.BUILDER_FUNCTIONS_FLAG = BUILDER_FUNCTIONS_FLAG;
-    var HTTP_STATUS_METHOD_NOT_ALLOWED = 405;
-    exports2.HTTP_STATUS_METHOD_NOT_ALLOWED = HTTP_STATUS_METHOD_NOT_ALLOWED;
-    var HTTP_STATUS_OK = 200;
-    exports2.HTTP_STATUS_OK = HTTP_STATUS_OK;
-    var METADATA_VERSION = 1;
-    exports2.METADATA_VERSION = METADATA_VERSION;
-  }
+// src/run/handlers/cache.cts
+var cache_exports = {};
+__export(cache_exports, {
+  NetlifyCacheHandler: () => NetlifyCacheHandler,
+  default: () => cache_default
 });
+module.exports = __toCommonJS(cache_exports);
+var import_node_buffer = require("node:buffer");
 
-// node_modules/@netlify/functions/dist/lib/builder.js
-var require_builder = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/builder.js"(exports2) {
-    "use strict";
-    var __importDefault = exports2 && exports2.__importDefault || function(mod) {
-      return mod && mod.__esModule ? mod : { "default": mod };
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.builder = void 0;
-    var is_promise_1 = __importDefault(require_is_promise());
-    var consts_js_1 = require_consts();
-    var augmentResponse = (response) => {
-      if (!response) {
-        return response;
-      }
-      const metadata = { version: consts_js_1.METADATA_VERSION, builder_function: consts_js_1.BUILDER_FUNCTIONS_FLAG, ttl: response.ttl || 0 };
-      return {
-        ...response,
-        metadata
-      };
-    };
-    var 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: consts_js_1.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 ((0, is_promise_1.default)(execution)) {
-          return execution.then(augmentResponse);
-        }
-        return execution;
-      }
+// node_modules/@netlify/functions/dist/chunk-COIAWFHF.mjs
+var import_process = require("process");
+var 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."
     );
-    exports2.builder = wrapHandler;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/purge_cache.js
-var require_purge_cache = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/purge_cache.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.purgeCache = void 0;
-    var process_1 = require("process");
-    var purgeCache2 = 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 payload = {
-        cache_tags: options.tags,
-        deploy_alias: options.deployAlias
-      };
-      const token = process_1.env.NETLIFY_PURGE_API_TOKEN || options.token;
-      if ("siteSlug" in options) {
-        payload.site_slug = options.siteSlug;
-      } else if ("domain" in options) {
-        payload.domain = options.domain;
-      } else {
-        const siteID = options.siteID || process_1.env.SITE_ID;
-        if (!siteID) {
-          throw new Error("The Netlify site ID was not found in the execution environment. Please supply it manually using the `siteID` property.");
-        }
-        payload.site_id = siteID;
-      }
-      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 apiURL = options.apiURL || "https://api.netlify.com";
-      const response = await fetch(`${apiURL}/api/v1/purge`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json; charset=utf8",
-          Authorization: `Bearer ${token}`
-        },
-        body: JSON.stringify(payload)
-      });
-      if (!response.ok) {
-        throw new Error(`Cache purge API call returned an unexpected status code: ${response.status}`);
-      }
-    };
-    exports2.purgeCache = purgeCache2;
+  const payload = {
+    cache_tags: options.tags,
+    deploy_alias: options.deployAlias
+  };
+  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;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/schedule.js
-var require_schedule = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/schedule.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.schedule = void 0;
-    var schedule = (cron, handler) => handler;
-    exports2.schedule = schedule;
+  if ("siteSlug" in options) {
+    payload.site_slug = options.siteSlug;
+  } else if ("domain" in options) {
+    payload.domain = options.domain;
+  } else {
+    const siteID = options.siteID || import_process.env.SITE_ID;
+    if (!siteID) {
+      throw new Error(
+        "The Netlify site ID was not found in the execution environment. Please supply it manually using the `siteID` property."
+      );
+    }
+    payload.site_id = siteID;
   }
-});
-
-// node_modules/@netlify/functions/dist/lib/stream.js
-var require_stream = __commonJS({
-  "node_modules/@netlify/functions/dist/lib/stream.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.stream = void 0;
-    var node_stream_1 = require("node:stream");
-    var node_util_1 = require("node:util");
-    var pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
-    var stream = (handler) => awslambda.streamifyResponse(async (event, responseStream, context) => {
-      const { body, ...httpResponseMetadata } = await handler(event, context);
-      const responseBody = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
-      if (typeof body === "undefined") {
-        responseBody.end();
-      } else if (typeof body === "string") {
-        responseBody.write(body);
-        responseBody.end();
-      } else {
-        await pipeline(body, responseBody);
-      }
-    });
-    exports2.stream = stream;
+  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."
+    );
   }
-});
-
-// node_modules/@netlify/functions/dist/function/index.js
-var require_function = __commonJS({
-  "node_modules/@netlify/functions/dist/function/index.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
+  const apiURL = options.apiURL || "https://api.netlify.com";
+  const response = await fetch(`${apiURL}/api/v1/purge`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json; charset=utf8",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify(payload)
+  });
+  if (!response.ok) {
+    throw new Error(`Cache purge API call returned an unexpected status code: ${response.status}`);
   }
-});
+};
 
-// node_modules/@netlify/functions/dist/main.js
-var require_main = __commonJS({
-  "node_modules/@netlify/functions/dist/main.js"(exports2) {
-    "use strict";
-    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      var desc = Object.getOwnPropertyDescriptor(m, k);
-      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-        desc = { enumerable: true, get: function() {
-          return m[k];
-        } };
-      }
-      Object.defineProperty(o, k2, desc);
-    } : function(o, m, k, k2) {
-      if (k2 === void 0)
-        k2 = k;
-      o[k2] = m[k];
-    });
-    var __exportStar = exports2 && exports2.__exportStar || function(m, exports3) {
-      for (var p in m)
-        if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports3, p))
-          __createBinding(exports3, m, p);
-    };
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.stream = exports2.schedule = exports2.purgeCache = exports2.builder = void 0;
-    var builder_js_1 = require_builder();
-    Object.defineProperty(exports2, "builder", { enumerable: true, get: function() {
-      return builder_js_1.builder;
-    } });
-    var purge_cache_js_1 = require_purge_cache();
-    Object.defineProperty(exports2, "purgeCache", { enumerable: true, get: function() {
-      return purge_cache_js_1.purgeCache;
-    } });
-    var schedule_js_1 = require_schedule();
-    Object.defineProperty(exports2, "schedule", { enumerable: true, get: function() {
-      return schedule_js_1.schedule;
-    } });
-    var stream_js_1 = require_stream();
-    Object.defineProperty(exports2, "stream", { enumerable: true, get: function() {
-      return stream_js_1.stream;
-    } });
-    __exportStar(require_function(), exports2);
-  }
-});
+// node_modules/@netlify/functions/dist/chunk-XSZVKDJB.mjs
+var import_stream = require("stream");
+var import_util = require("util");
+var pipeline = (0, import_util.promisify)(import_stream.pipeline);
 
 // src/run/handlers/cache.cts
-var cache_exports = {};
-__export(cache_exports, {
-  NetlifyCacheHandler: () => NetlifyCacheHandler,
-  default: () => cache_default
-});
-module.exports = __toCommonJS(cache_exports);
-var import_node_buffer = require("node:buffer");
-var import_functions = __toESM(require_main());
 var import_constants = require("next/dist/lib/constants.js");
 var import_regional_blob_store = require("../regional-blob-store.cjs");
 var import_request_context = require("./request-context.cjs");
@@ -391,7 +229,7 @@ var NetlifyCacheHandler = class {
         if (requestContext?.didPagesRouterOnDemandRevalidate) {
           const tag = `_N_T_${key === "/index" ? "/" : key}`;
           console.debug("Purging CDN cache for:", [tag]);
-          (0, import_functions.purgeCache)({ tags: [tag] }).catch((error) => {
+          purgeCache({ tags: [tag] }).catch((error) => {
             console.error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`, error);
           });
         }
@@ -399,18 +237,26 @@ var NetlifyCacheHandler = class {
     });
   }
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  async revalidateTag(tag, ...args) {
-    console.debug("NetlifyCacheHandler.revalidateTag", tag, args);
+  async revalidateTag(tagOrTags, ...args) {
+    console.debug("NetlifyCacheHandler.revalidateTag", tagOrTags, args);
+    const tags = Array.isArray(tagOrTags) ? tagOrTags : [tagOrTags];
     const data = {
       revalidatedAt: Date.now()
     };
-    try {
-      await this.blobStore.setJSON(await this.encodeBlobKey(tag), data);
-    } catch (error) {
-      console.warn(`Failed to update tag manifest for ${tag}`, error);
-    }
-    (0, import_functions.purgeCache)({ tags: [tag] }).catch((error) => {
-      console.error(`[NetlifyCacheHandler]: Purging the cache for tag ${tag} failed`, error);
+    await Promise.all(
+      tags.map(async (tag) => {
+        try {
+          await this.blobStore.setJSON(await this.encodeBlobKey(tag), data);
+        } catch (error) {
+          console.warn(`Failed to update tag manifest for ${tag}`, error);
+        }
+      })
+    );
+    purgeCache({ tags }).catch((error) => {
+      console.error(
+        `[NetlifyCacheHandler]: Purging the cache for tags ${tags.join(", ")} failed`,
+        error
+      );
     });
   }
   resetRequestCache() {