@netlify/plugin-nextjs 5.1.0 → 5.1.1

package/dist/esm-chunks/{chunk-57DK2TJ7.js → chunk-PMRBBOBY.js}

@@ -540,16 +540,35 @@ var getDeployStore = (options = {}) => {
 };
 
 // src/run/headers.ts
-var generateNetlifyVaryValues = ({ headers, languages, cookies }) => {
+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 (headers.length !== 0) {
-    values.push(`header=${headers.join(`|`)}`);
+  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 (languages.length !== 0) {
-    values.push(`language=${languages.join(`|`)}`);
+  if (language.length !== 0) {
+    values.push(`language=${language.join(`|`)}`);
   }
-  if (cookies.length !== 0) {
-    values.push(`cookie=${cookies.join(`|`)}`);
+  if (cookie.length !== 0) {
+    values.push(`cookie=${cookie.join(`|`)}`);
+  }
+  if (country.length !== 0) {
+    values.push(`country=${country.join(`|`)}`);
   }
   return values.join(",");
 };
@@ -570,19 +589,33 @@ var mapHeaderValues = (header, callback) => {
 };
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
-    headers: ["x-nextjs-data"],
-    languages: [],
-    cookies: ["__prerender_bypass", "__next_preview_data"]
+    header: ["x-nextjs-data"],
+    language: [],
+    cookie: ["__prerender_bypass", "__next_preview_data"],
+    query: [],
+    country: []
   };
   const vary = headers.get("vary");
   if (vary !== null) {
-    netlifyVaryValues.headers.push(...getHeaderValueArray(vary));
+    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.languages.push(...locales);
-    netlifyVaryValues.cookies.push(`NEXT_LOCALE`);
+    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));
 };
@@ -647,7 +680,7 @@ var adjustDateHeader = async ({
   headers.set("date", lastModifiedDate.toUTCString());
 };
 var setCacheControlHeaders = (headers, request, requestContext) => {
-  if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("netlify-cdn-cache-control")) {
+  if (typeof requestContext.routeHandlerRevalidate !== "undefined" && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     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" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000`

package/dist/esm-chunks/{package-RGWYJEMK.js → package-YB7ERSH4.js}

@@ -8,7 +8,7 @@ import "./chunk-5JVNISGM.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.1.0";
+var version = "5.1.1";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -59,7 +59,7 @@ var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.0.1",
   "@netlify/build": "^29.37.2",
-  "@netlify/edge-bundler": "^11.3.0",
+  "@netlify/edge-bundler": "^11.4.0",
   "@netlify/edge-functions": "^2.3.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.5.1",

package/dist/run/handlers/server.js

@@ -10,7 +10,7 @@ import {
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../../esm-chunks/chunk-57DK2TJ7.js";
+} from "../../esm-chunks/chunk-PMRBBOBY.js";
 import {
   nextResponseProxy
 } from "../../esm-chunks/chunk-RL4K4CVH.js";

package/dist/run/handlers/tracing.js

@@ -51202,7 +51202,7 @@ var import_sdk_trace_node = __toESM(require_src14(), 1);
 var import_semantic_conventions = __toESM(require_src(), 1);
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-RGWYJEMK.js");
+} = await import("../../esm-chunks/package-YB7ERSH4.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

@@ -10,7 +10,7 @@ import {
   setCacheStatusHeader,
   setCacheTagsHeaders,
   setVaryHeaders
-} from "../esm-chunks/chunk-57DK2TJ7.js";
+} from "../esm-chunks/chunk-PMRBBOBY.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {

package/package.json

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