@netlify/plugin-nextjs 5.1.0 → 5.1.2

package/dist/build/content/server.js

@@ -10,11 +10,11 @@ import {
   getPatchesToApply,
   verifyHandlerDirStructure,
   writeTagsManifest
-} from "../../esm-chunks/chunk-ZKJEJNSJ.js";
+} from "../../esm-chunks/chunk-4BNHE6TP.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-PH26UF2W.js";
+import "../../esm-chunks/chunk-K7BTUM7O.js";
 import "../../esm-chunks/chunk-PJG75HGC.js";
 import "../../esm-chunks/chunk-BG455SFE.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";

package/dist/build/content/static.js

@@ -10,7 +10,7 @@ import {
   copyStaticExport,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-74THQNRG.js";
+} from "../../esm-chunks/chunk-V2T6NUOM.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";

package/dist/build/functions/edge.js

@@ -6,9 +6,9 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-OBKVBMAL.js";
+} from "../../esm-chunks/chunk-UTQSBE5O.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-3NYX5FXN.js";
+import "../../esm-chunks/chunk-L6OM53B6.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createEdgeHandlers

package/dist/build/functions/server.js

@@ -6,13 +6,13 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-F5VQRN6L.js";
-import "../../esm-chunks/chunk-ZKJEJNSJ.js";
+} from "../../esm-chunks/chunk-HESS57SH.js";
+import "../../esm-chunks/chunk-4BNHE6TP.js";
 import "../../esm-chunks/chunk-PDPDW32D.js";
 import "../../esm-chunks/chunk-Y3K5Q6FP.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-3NYX5FXN.js";
-import "../../esm-chunks/chunk-PH26UF2W.js";
+import "../../esm-chunks/chunk-L6OM53B6.js";
+import "../../esm-chunks/chunk-K7BTUM7O.js";
 import "../../esm-chunks/chunk-PJG75HGC.js";
 import "../../esm-chunks/chunk-BG455SFE.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";

package/dist/build/plugin-context.js

@@ -8,7 +8,7 @@ import {
   EDGE_HANDLER_NAME,
   PluginContext,
   SERVER_HANDLER_NAME
-} from "../esm-chunks/chunk-3NYX5FXN.js";
+} from "../esm-chunks/chunk-L6OM53B6.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {
   EDGE_HANDLER_NAME,

package/dist/build/verification.js

@@ -9,7 +9,7 @@ import {
   verifyNextVersion,
   verifyNoAdvancedAPIRoutes,
   verifyPublishDir
-} from "../esm-chunks/chunk-PH26UF2W.js";
+} from "../esm-chunks/chunk-K7BTUM7O.js";
 import "../esm-chunks/chunk-PJG75HGC.js";
 import "../esm-chunks/chunk-BG455SFE.js";
 import "../esm-chunks/chunk-5JVNISGM.js";

package/dist/esm-chunks/{chunk-ZKJEJNSJ.js → chunk-4BNHE6TP.js}

@@ -16,7 +16,7 @@ import {
 } from "./chunk-VZNKO4OO.js";
 import {
   verifyNextVersion
-} from "./chunk-PH26UF2W.js";
+} from "./chunk-K7BTUM7O.js";
 import {
   require_semver
 } from "./chunk-PJG75HGC.js";

package/dist/esm-chunks/{chunk-F5VQRN6L.js → chunk-HESS57SH.js}

@@ -9,7 +9,7 @@ import {
   copyNextServerCode,
   verifyHandlerDirStructure,
   writeTagsManifest
-} from "./chunk-ZKJEJNSJ.js";
+} from "./chunk-4BNHE6TP.js";
 import {
   wrapTracer
 } from "./chunk-PDPDW32D.js";
@@ -22,7 +22,7 @@ import {
 } from "./chunk-VZNKO4OO.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-3NYX5FXN.js";
+} from "./chunk-L6OM53B6.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";

package/dist/esm-chunks/{chunk-PH26UF2W.js → chunk-K7BTUM7O.js}

@@ -17,36 +17,47 @@ import {
 // src/build/verification.ts
 var import_semver = __toESM(require_semver(), 1);
 import { existsSync } from "node:fs";
+import { join } from "node:path";
 var SUPPORTED_NEXT_VERSIONS = ">=13.5.0";
 function verifyPublishDir(ctx) {
   if (!existsSync(ctx.publishDir)) {
     ctx.failBuild(
-      `Your publish directory was not found at: ${ctx.publishDir}, please check your build settings`
+      `Your publish directory was not found at: ${ctx.publishDir}. Please check your build settings`
     );
   }
   if (ctx.publishDir === ctx.resolveFromPackagePath("")) {
     ctx.failBuild(
-      `Your publish directory cannot be the same as the base directory of your site, please check your build settings`
+      `Your publish directory cannot be the same as the base directory of your site. Please check your build settings`
     );
   }
   try {
     ctx.buildConfig;
   } catch {
     ctx.failBuild(
-      "Your publish directory does not contain expected Next.js build output, please check your build settings"
+      "Your publish directory does not contain expected Next.js build output. Please check your build settings"
     );
   }
-  if ((ctx.buildConfig.output === "standalone" || ctx.buildConfig.output === void 0) && !existsSync(ctx.standaloneRootDir)) {
-    ctx.failBuild(
-      `Your publish directory does not contain expected Next.js build output, please make sure you are using Next.js version (${SUPPORTED_NEXT_VERSIONS})`
-    );
+  if (ctx.buildConfig.output === "standalone" || ctx.buildConfig.output === void 0) {
+    if (!existsSync(join(ctx.publishDir, "BUILD_ID"))) {
+      ctx.failBuild(
+        "Your publish directory does not contain expected Next.js build output. Please check your build settings"
+      );
+    }
+    if (!existsSync(ctx.standaloneRootDir)) {
+      ctx.failBuild(
+        `Your publish directory does not contain expected Next.js build output. Please make sure you are using Next.js version (${SUPPORTED_NEXT_VERSIONS})`
+      );
+    }
   }
-  if (ctx.buildConfig.output === "export" && !existsSync(ctx.resolveFromSiteDir("out"))) {
-    ctx.failBuild(
-      `Your export directory was not found at: ${ctx.resolveFromSiteDir(
-        "out"
-      )}, please check your build settings`
-    );
+  if (ctx.buildConfig.output === "export") {
+    if (!ctx.exportDetail?.success) {
+      ctx.failBuild(`Your export failed to build. Please check your build settings`);
+    }
+    if (!existsSync(ctx.exportDetail?.outDirectory)) {
+      ctx.failBuild(
+        `Your export directory was not found at: ${ctx.exportDetail?.outDirectory}. Please check your build settings`
+      );
+    }
   }
 }
 function verifyNextVersion(ctx, nextVersion) {

package/dist/esm-chunks/{chunk-3NYX5FXN.js → chunk-L6OM53B6.js}

@@ -6,7 +6,7 @@
     
 
 // src/build/plugin-context.ts
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
@@ -146,6 +146,27 @@ var PluginContext = class {
   async getPrerenderManifest() {
     return JSON.parse(await readFile(join(this.publishDir, "prerender-manifest.json"), "utf-8"));
   }
+  /**
+   * Uses various heuristics to try to find the .next dir.
+   * Works by looking for BUILD_ID, so requires the site to have been built
+   */
+  findDotNext() {
+    for (const dir of [
+      // The publish directory
+      this.publishDir,
+      // In the root
+      resolve(DEFAULT_PUBLISH_DIR),
+      // The sibling of the publish directory
+      resolve(this.publishDir, "..", DEFAULT_PUBLISH_DIR),
+      // In the package dir
+      resolve(this.constants.PACKAGE_PATH || "", DEFAULT_PUBLISH_DIR)
+    ]) {
+      if (existsSync(join(dir, "BUILD_ID"))) {
+        return dir;
+      }
+    }
+    return false;
+  }
   /**
    * Get Next.js middleware config from the build output
    */
@@ -159,12 +180,41 @@ var PluginContext = class {
   /** Get RequiredServerFiles manifest from build output **/
   get requiredServerFiles() {
     if (!this._requiredServerFiles) {
+      let requiredServerFilesJson = join(this.publishDir, "required-server-files.json");
+      if (!existsSync(requiredServerFilesJson)) {
+        const dotNext = this.findDotNext();
+        if (dotNext) {
+          requiredServerFilesJson = join(dotNext, "required-server-files.json");
+        }
+      }
       this._requiredServerFiles = JSON.parse(
-        readFileSync(join(this.publishDir, "required-server-files.json"), "utf-8")
+        readFileSync(requiredServerFilesJson, "utf-8")
       );
     }
     return this._requiredServerFiles;
   }
+  #exportDetail = null;
+  /** Get metadata when output = export */
+  get exportDetail() {
+    if (this.buildConfig.output !== "export") {
+      return null;
+    }
+    if (!this.#exportDetail) {
+      const detailFile = join(
+        this.requiredServerFiles.appDir,
+        this.buildConfig.distDir,
+        "export-detail.json"
+      );
+      if (!existsSync(detailFile)) {
+        return null;
+      }
+      try {
+        this.#exportDetail = JSON.parse(readFileSync(detailFile, "utf-8"));
+      } catch {
+      }
+    }
+    return this.#exportDetail;
+  }
   /** Get Next Config from build output **/
   get buildConfig() {
     return this.requiredServerFiles.config;

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/{chunk-OBKVBMAL.js → chunk-UTQSBE5O.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-VZNKO4OO.js";
 import {
   EDGE_HANDLER_NAME
-} from "./chunk-3NYX5FXN.js";
+} from "./chunk-L6OM53B6.js";
 import {
   __commonJS,
   __toESM

package/dist/esm-chunks/{chunk-74THQNRG.js → chunk-V2T6NUOM.js}

@@ -73,9 +73,12 @@ var copyStaticAssets = async (ctx) => {
 };
 var copyStaticExport = async (ctx) => {
   await tracer.withActiveSpan("copyStaticExport", async () => {
+    if (!ctx.exportDetail?.outDirectory) {
+      ctx.failBuild("Export directory not found");
+    }
     try {
       await rm(ctx.staticDir, { recursive: true, force: true });
-      await cp(ctx.resolveFromSiteDir("out"), ctx.staticDir, { recursive: true });
+      await cp(ctx.exportDetail.outDirectory, ctx.staticDir, { recursive: true });
     } catch (error) {
       ctx.failBuild("Failed copying static export", error);
     }

package/dist/esm-chunks/{package-RGWYJEMK.js → package-RVJOBSMH.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.2";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -59,8 +59,8 @@ 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-functions": "^2.3.1",
+  "@netlify/edge-bundler": "^11.4.0",
+  "@netlify/edge-functions": "^2.5.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.5.1",
   "@netlify/serverless-functions-api": "^1.10.1",

package/dist/index.js

@@ -6,18 +6,18 @@
     
 import {
   createServerHandler
-} from "./esm-chunks/chunk-F5VQRN6L.js";
+} from "./esm-chunks/chunk-HESS57SH.js";
 import {
   copyPrerenderedContent
 } from "./esm-chunks/chunk-MRD3XSKD.js";
-import "./esm-chunks/chunk-ZKJEJNSJ.js";
+import "./esm-chunks/chunk-4BNHE6TP.js";
 import {
   copyStaticAssets,
   copyStaticContent,
   copyStaticExport,
   publishStaticDir,
   unpublishStaticDir
-} from "./esm-chunks/chunk-74THQNRG.js";
+} from "./esm-chunks/chunk-V2T6NUOM.js";
 import "./esm-chunks/chunk-TYCYFZ22.js";
 import {
   wrapTracer
@@ -28,7 +28,7 @@ import {
 } from "./esm-chunks/chunk-Y3K5Q6FP.js";
 import {
   createEdgeHandlers
-} from "./esm-chunks/chunk-OBKVBMAL.js";
+} from "./esm-chunks/chunk-UTQSBE5O.js";
 import "./esm-chunks/chunk-VZNKO4OO.js";
 import {
   restoreBuildCache,
@@ -39,12 +39,12 @@ import {
 } from "./esm-chunks/chunk-MCEOSJH6.js";
 import {
   PluginContext
-} from "./esm-chunks/chunk-3NYX5FXN.js";
+} from "./esm-chunks/chunk-L6OM53B6.js";
 import {
   verifyBuildConfig,
   verifyNoAdvancedAPIRoutes,
   verifyPublishDir
-} from "./esm-chunks/chunk-PH26UF2W.js";
+} from "./esm-chunks/chunk-K7BTUM7O.js";
 import "./esm-chunks/chunk-PJG75HGC.js";
 import "./esm-chunks/chunk-BG455SFE.js";
 import "./esm-chunks/chunk-UYKENJEU.js";

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-RVJOBSMH.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.2",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",