@netlify/plugin-nextjs 5.10.4 → 5.10.6

package/dist/build/content/prerendered.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
 import {
   require_out
-} from "../../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../../esm-chunks/chunk-NFOLXH6F.js";
 import {
   require_semver
 } from "../../esm-chunks/chunk-APO262HE.js";

package/dist/build/content/server.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
 import {
   require_out
-} from "../../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../../esm-chunks/chunk-NFOLXH6F.js";
 import {
   require_semver
 } from "../../esm-chunks/chunk-APO262HE.js";

package/dist/build/content/static.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
 import {
   require_out
-} from "../../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../../esm-chunks/chunk-NFOLXH6F.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-OEQOKJGE.js";

package/dist/build/functions/edge.js

@@ -6,7 +6,7 @@
     
 import {
   require_out
-} from "../../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../../esm-chunks/chunk-NFOLXH6F.js";
 import {
   __commonJS,
   __toESM

package/dist/build/functions/server.js

@@ -13,7 +13,7 @@ import {
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
 import {
   require_out
-} from "../../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../../esm-chunks/chunk-NFOLXH6F.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-OEQOKJGE.js";

package/dist/build/verification.js

@@ -6,7 +6,7 @@
     
 import {
   require_out
-} from "../esm-chunks/chunk-KGYJQ2U2.js";
+} from "../esm-chunks/chunk-NFOLXH6F.js";
 import {
   require_semver
 } from "../esm-chunks/chunk-APO262HE.js";

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

@@ -3062,7 +3062,7 @@ var require_pattern = __commonJS({
   "node_modules/fast-glob/out/utils/pattern.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.removeDuplicateSlashes = exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
+    exports.isAbsolute = exports.partitionAbsoluteAndRelative = exports.removeDuplicateSlashes = exports.matchAny = exports.convertPatternsToRe = exports.makeRe = exports.getPatternParts = exports.expandBraceExpansion = exports.expandPatternsWithBraceExpansion = exports.isAffectDepthOfReadingPattern = exports.endsWithSlashGlobStar = exports.hasGlobStar = exports.getBaseDirectory = exports.isPatternRelatedToParentDirectory = exports.getPatternsOutsideCurrentDirectory = exports.getPatternsInsideCurrentDirectory = exports.getPositivePatterns = exports.getNegativePatterns = exports.isPositivePattern = exports.isNegativePattern = exports.convertToNegativePattern = exports.convertToPositivePattern = exports.isDynamicPattern = exports.isStaticPattern = void 0;
     var path = __require("path");
     var globParent = require_glob_parent();
     var micromatch = require_micromatch();
@@ -3202,6 +3202,23 @@ var require_pattern = __commonJS({
       return pattern.replace(DOUBLE_SLASH_RE, "/");
     }
     exports.removeDuplicateSlashes = removeDuplicateSlashes;
+    function partitionAbsoluteAndRelative(patterns) {
+      const absolute = [];
+      const relative = [];
+      for (const pattern of patterns) {
+        if (isAbsolute(pattern)) {
+          absolute.push(pattern);
+        } else {
+          relative.push(pattern);
+        }
+      }
+      return [absolute, relative];
+    }
+    exports.partitionAbsoluteAndRelative = partitionAbsoluteAndRelative;
+    function isAbsolute(pattern) {
+      return path.isAbsolute(pattern);
+    }
+    exports.isAbsolute = isAbsolute;
   }
 });
 
@@ -4977,11 +4994,19 @@ var require_entry = __commonJS({
         this.index = /* @__PURE__ */ new Map();
       }
       getFilter(positive, negative) {
-        const positiveRe = utils.pattern.convertPatternsToRe(positive, this._micromatchOptions);
-        const negativeRe = utils.pattern.convertPatternsToRe(negative, Object.assign(Object.assign({}, this._micromatchOptions), { dot: true }));
-        return (entry) => this._filter(entry, positiveRe, negativeRe);
+        const [absoluteNegative, relativeNegative] = utils.pattern.partitionAbsoluteAndRelative(negative);
+        const patterns = {
+          positive: {
+            all: utils.pattern.convertPatternsToRe(positive, this._micromatchOptions)
+          },
+          negative: {
+            absolute: utils.pattern.convertPatternsToRe(absoluteNegative, Object.assign(Object.assign({}, this._micromatchOptions), { dot: true })),
+            relative: utils.pattern.convertPatternsToRe(relativeNegative, Object.assign(Object.assign({}, this._micromatchOptions), { dot: true }))
+          }
+        };
+        return (entry) => this._filter(entry, patterns);
       }
-      _filter(entry, positiveRe, negativeRe) {
+      _filter(entry, patterns) {
         const filepath = utils.path.removeLeadingDotSegment(entry.path);
         if (this._settings.unique && this._isDuplicateEntry(filepath)) {
           return false;
@@ -4989,11 +5014,7 @@ var require_entry = __commonJS({
         if (this._onlyFileFilter(entry) || this._onlyDirectoryFilter(entry)) {
           return false;
         }
-        if (this._isSkippedByAbsoluteNegativePatterns(filepath, negativeRe)) {
-          return false;
-        }
-        const isDirectory = entry.dirent.isDirectory();
-        const isMatched = this._isMatchToPatterns(filepath, positiveRe, isDirectory) && !this._isMatchToPatterns(filepath, negativeRe, isDirectory);
+        const isMatched = this._isMatchToPatternsSet(filepath, patterns, entry.dirent.isDirectory());
         if (this._settings.unique && isMatched) {
           this._createIndexRecord(filepath);
         }
@@ -5011,14 +5032,32 @@ var require_entry = __commonJS({
       _onlyDirectoryFilter(entry) {
         return this._settings.onlyDirectories && !entry.dirent.isDirectory();
       }
-      _isSkippedByAbsoluteNegativePatterns(entryPath, patternsRe) {
-        if (!this._settings.absolute) {
+      _isMatchToPatternsSet(filepath, patterns, isDirectory) {
+        const isMatched = this._isMatchToPatterns(filepath, patterns.positive.all, isDirectory);
+        if (!isMatched) {
           return false;
         }
-        const fullpath = utils.path.makeAbsolute(this._settings.cwd, entryPath);
-        return utils.pattern.matchAny(fullpath, patternsRe);
+        const isMatchedByRelativeNegative = this._isMatchToPatterns(filepath, patterns.negative.relative, isDirectory);
+        if (isMatchedByRelativeNegative) {
+          return false;
+        }
+        const isMatchedByAbsoluteNegative = this._isMatchToAbsoluteNegative(filepath, patterns.negative.absolute, isDirectory);
+        if (isMatchedByAbsoluteNegative) {
+          return false;
+        }
+        return true;
+      }
+      _isMatchToAbsoluteNegative(filepath, patternsRe, isDirectory) {
+        if (patternsRe.length === 0) {
+          return false;
+        }
+        const fullpath = utils.path.makeAbsolute(this._settings.cwd, filepath);
+        return this._isMatchToPatterns(fullpath, patternsRe, isDirectory);
       }
       _isMatchToPatterns(filepath, patternsRe, isDirectory) {
+        if (patternsRe.length === 0) {
+          return false;
+        }
         const isMatched = utils.pattern.matchAny(filepath, patternsRe);
         if (!isMatched && isDirectory) {
           return utils.pattern.matchAny(filepath + "/", patternsRe);

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

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.10.4";
+var version = "5.10.6";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,13 +58,13 @@ 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.1",
-  "@netlify/edge-bundler": "^12.4.0",
+  "@netlify/build": "^32.0.0",
+  "@netlify/edge-bundler": "^13.0.2",
   "@netlify/edge-functions": "^2.11.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^3.0.4",
-  "@netlify/serverless-functions-api": "^1.36.0",
-  "@netlify/zip-it-and-ship-it": "^10.0.4",
+  "@netlify/serverless-functions-api": "^1.37.0",
+  "@netlify/zip-it-and-ship-it": "^10.0.6",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",
@@ -88,7 +88,7 @@ var devDependencies = {
   memfs: "^4.9.2",
   "mock-require": "^3.0.3",
   msw: "^2.0.7",
-  "netlify-cli": "^19.1.5",
+  "netlify-cli": "^20.0.0",
   next: "^15.0.0-canary.28",
   os: "^0.1.2",
   outdent: "^0.8.0",
@@ -100,7 +100,7 @@ var devDependencies = {
   typescript: "^5.4.5",
   unionfs: "^4.5.4",
   uuid: "^10.0.0",
-  vitest: "^1.5.3"
+  vitest: "^3.0.0"
 };
 var clean_package = {
   indent: 2,

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.4";
+var version = "5.10.6";
 
 // src/run/handlers/cache.cts
 var import_cache_types = require("../../shared/cache-types.cjs");

package/dist/run/handlers/server.js

@@ -3185,7 +3185,7 @@ var server_default = async (request, _context, topLevelSpan, requestContext) =>
       netlifyVary,
       netlifyCdnCacheControl
     });
-    if (requestContext.isCacheableAppPage) {
+    if (requestContext.isCacheableAppPage && response.status !== 304) {
       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;

package/dist/run/handlers/tracing.js

@@ -26995,50 +26995,64 @@ var require_common3 = __commonJS({
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        let i;
-        const split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-        const len = split.length;
-        for (i = 0; i < len; i++) {
-          if (!split[i]) {
-            continue;
+        const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        for (const ns of split) {
+          if (ns[0] === "-") {
+            createDebug.skips.push(ns.slice(1));
+          } else {
+            createDebug.names.push(ns);
           }
-          namespaces = split[i].replace(/\*/g, ".*?");
-          if (namespaces[0] === "-") {
-            createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+        }
+      }
+      function matchesTemplate(search, template) {
+        let searchIndex = 0;
+        let templateIndex = 0;
+        let starIndex = -1;
+        let matchIndex = 0;
+        while (searchIndex < search.length) {
+          if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+            if (template[templateIndex] === "*") {
+              starIndex = templateIndex;
+              matchIndex = searchIndex;
+              templateIndex++;
+            } else {
+              searchIndex++;
+              templateIndex++;
+            }
+          } else if (starIndex !== -1) {
+            templateIndex = starIndex + 1;
+            matchIndex++;
+            searchIndex = matchIndex;
           } else {
-            createDebug.names.push(new RegExp("^" + namespaces + "$"));
+            return false;
           }
         }
+        while (templateIndex < template.length && template[templateIndex] === "*") {
+          templateIndex++;
+        }
+        return templateIndex === template.length;
       }
       function disable() {
         const namespaces = [
-          ...createDebug.names.map(toNamespace),
-          ...createDebug.skips.map(toNamespace).map((namespace) => "-" + namespace)
+          ...createDebug.names,
+          ...createDebug.skips.map((namespace) => "-" + namespace)
         ].join(",");
         createDebug.enable("");
         return namespaces;
       }
       function enabled(name2) {
-        if (name2[name2.length - 1] === "*") {
-          return true;
-        }
-        let i;
-        let len;
-        for (i = 0, len = createDebug.skips.length; i < len; i++) {
-          if (createDebug.skips[i].test(name2)) {
+        for (const skip of createDebug.skips) {
+          if (matchesTemplate(name2, skip)) {
             return false;
           }
         }
-        for (i = 0, len = createDebug.names.length; i < len; i++) {
-          if (createDebug.names[i].test(name2)) {
+        for (const ns of createDebug.names) {
+          if (matchesTemplate(name2, ns)) {
             return true;
           }
         }
         return false;
       }
-      function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-      }
       function coerce(val) {
         if (val instanceof Error) {
           return val.stack || val.message;
@@ -27157,10 +27171,11 @@ var require_browser2 = __commonJS({
       if (typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
         return false;
       }
+      let m;
       return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || // Is firebug? http://stackoverflow.com/a/398120/376773
       typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || // Is firefox >= v31?
       // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-      typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 || // Double check webkit in userAgent just in case we are in a worker
+      typeof navigator !== "undefined" && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31 || // Double check webkit in userAgent just in case we are in a worker
       typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
     }
     function formatArgs(args) {
@@ -27501,7 +27516,7 @@ var require_node16 = __commonJS({
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
     function log(...args) {
-      return process.stderr.write(util.format(...args) + "\n");
+      return process.stderr.write(util.formatWithOptions(exports2.inspectOpts, ...args) + "\n");
     }
     function save(namespaces) {
       if (namespaces) {
@@ -68866,7 +68881,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-GF3YXDC5.js");
+} = await import("../../esm-chunks/package-GOVVBALR.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

@@ -28,7 +28,17 @@ var generateNetlifyVaryValues = ({
     }
   }
   if (header.length !== 0) {
-    values.push(`header=${header.join(`|`)}`);
+    const uniqueHeaderNames = [
+      ...new Set(
+        header.map(
+          (headerName) => (
+            // header names are case insensitive
+            headerName.toLowerCase()
+          )
+        )
+      )
+    ];
+    values.push(`header=${uniqueHeaderNames.join(`|`)}`);
   }
   if (language.length !== 0) {
     values.push(`language=${language.join(`|`)}`);
@@ -53,10 +63,22 @@ var omitHeaderValues = (header, values) => {
 };
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
-    header: ["x-nextjs-data", "x-next-debug-logging"],
+    header: [
+      "x-nextjs-data",
+      "x-next-debug-logging",
+      // using _rsc query param might not be enough because it is stripped for middleware redirect and rewrites
+      // so adding all request headers that are used to produce the _rsc query param
+      // https://github.com/vercel/next.js/blob/e5fe535ed17cee5e1d5576ccc33e4c49b5da1273/packages/next/src/client/components/router-reducer/set-cache-busting-search-param.ts#L32-L39
+      "Next-Router-Prefetch",
+      "Next-Router-Segment-Prefetch",
+      "Next-Router-State-Tree",
+      "Next-Url",
+      // and exact header that actually instruct Next.js to produce RSC response
+      "RSC"
+    ],
     language: [],
     cookie: ["__prerender_bypass", "__next_preview_data"],
-    query: ["__nextDataReq"],
+    query: ["__nextDataReq", "_rsc"],
     country: []
   };
   const vary = headers.get("vary");

package/package.json

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