@netlify/plugin-nextjs 5.0.0-beta.9 → 5.0.0-rc.1

package/dist/build/content/static.js

@@ -9,7 +9,7 @@ import {
   copyStaticContent,
   publishStaticDir,
   unpublishStaticDir
-} from "../../esm-chunks/chunk-ZWFKLYLH.js";
+} from "../../esm-chunks/chunk-WQIG4U66.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";

package/dist/build/functions/edge.js

@@ -6,9 +6,9 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-YIE34LVX.js";
+} from "../../esm-chunks/chunk-ZZOGIP2V.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-DWC6JSN7.js";
+import "../../esm-chunks/chunk-655Y7ISI.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {
   createEdgeHandlers

package/dist/build/functions/server.js

@@ -6,10 +6,10 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-T6AZTXZF.js";
+} from "../../esm-chunks/chunk-GAZUUVZW.js";
 import "../../esm-chunks/chunk-4J4A5OE2.js";
 import "../../esm-chunks/chunk-VZNKO4OO.js";
-import "../../esm-chunks/chunk-DWC6JSN7.js";
+import "../../esm-chunks/chunk-655Y7ISI.js";
 import "../../esm-chunks/chunk-UYKENJEU.js";
 import "../../esm-chunks/chunk-5JVNISGM.js";
 export {

package/dist/build/image-cdn.js

@@ -5,9 +5,11 @@
       })();
     
 import {
+  generateRegexFromPattern,
   setImageConfig
-} from "../esm-chunks/chunk-TOK7TKP3.js";
+} from "../esm-chunks/chunk-XXBTIYSL.js";
 import "../esm-chunks/chunk-5JVNISGM.js";
 export {
+  generateRegexFromPattern,
   setImageConfig
 };

package/dist/build/plugin-context.js

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

package/dist/esm-chunks/{chunk-NL5YH5N6.js → chunk-3SUDZQ7L.js}

@@ -14,7 +14,7 @@ import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { join, resolve } from "node:path";
 var getRunConfig = async () => {
-  return JSON.parse(await readFile(resolve(RUN_CONFIG), "utf-8"));
+  return JSON.parse(await readFile(resolve(PLUGIN_DIR, RUN_CONFIG), "utf-8"));
 };
 var setRunConfig = (config) => {
   const cacheHandler = join(PLUGIN_DIR, ".netlify/dist/run/handlers/cache.cjs");

package/dist/esm-chunks/{chunk-DWC6JSN7.js → chunk-655Y7ISI.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";
@@ -27,6 +27,10 @@ var PluginContext = class {
   get relPublishDir() {
     return this.constants.PUBLISH_DIR ?? join(this.packagePath, DEFAULT_PUBLISH_DIR);
   }
+  /** Temporary directory for stashing the build output */
+  get tempPublishDir() {
+    return this.resolve(".netlify/.next");
+  }
   /** Absolute path of the publish directory */
   get publishDir() {
     return resolve(this.relPublishDir);
@@ -43,7 +47,7 @@ var PluginContext = class {
    * The working directory inside the lambda that is used for monorepos to execute the serverless function
    */
   get lambdaWorkingDirectory() {
-    return join("/var/task", this.distFolder);
+    return join("/var/task", this.distDirParent);
   }
   /**
    * Retrieves the root of the `.next/standalone` directory
@@ -60,17 +64,17 @@ var PluginContext = class {
     const dir = this.buildConfig.distDir ?? DEFAULT_PUBLISH_DIR;
     return relative(process.cwd(), resolve(this.packagePath, dir));
   }
-  /** The dist folder represents the parent directory of the .next folder or custom distDir */
-  get distFolder() {
+  /** Represents the parent directory of the .next folder or custom distDir */
+  get distDirParent() {
     return join(this.distDir, "..");
   }
   /** The `.next` folder or what the custom dist dir is set to */
   get nextDistDir() {
-    return relative(this.distFolder, this.distDir);
+    return relative(this.distDirParent, this.distDir);
   }
   /** Retrieves the `.next/standalone/` directory monorepo aware */
   get standaloneDir() {
-    return join(this.standaloneRootDir, this.distFolder);
+    return join(this.standaloneRootDir, this.distDirParent);
   }
   /**
    * Absolute path of the directory that is published and deployed to the Netlify CDN
@@ -102,7 +106,7 @@ var PluginContext = class {
     if (this.packagePath.length === 0) {
       return this.serverHandlerRootDir;
     }
-    return join(this.serverHandlerRootDir, this.distFolder);
+    return join(this.serverHandlerRootDir, this.distDirParent);
   }
   get nextServerHandler() {
     if (this.packagePath.length !== 0) {
@@ -166,6 +170,18 @@ var PluginContext = class {
   failBuild(message, error) {
     return this.utils.build.failBuild(message, error instanceof Error ? { error } : void 0);
   }
+  verifyPublishDir() {
+    if (!existsSync(this.publishDir)) {
+      this.failBuild(
+        `Your publish directory was not found at: ${this.publishDir}, please check your build settings`
+      );
+    }
+    if (this.publishDir === this.resolve(this.packagePath)) {
+      this.failBuild(
+        `Your publish directory cannot be the same as the base directory of your site, please check your build settings`
+      );
+    }
+  }
 };
 
 export {

package/dist/esm-chunks/{chunk-T6AZTXZF.js → chunk-GAZUUVZW.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-VZNKO4OO.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-DWC6JSN7.js";
+} from "./chunk-655Y7ISI.js";
 import {
   __toESM
 } from "./chunk-5JVNISGM.js";

package/dist/esm-chunks/chunk-RL4K4CVH.js

@@ -0,0 +1,27 @@
+
+      var require = await (async () => {
+        var { createRequire } = await import("node:module");
+        return createRequire(import.meta.url);
+      })();
+    
+
+// src/run/revalidate.ts
+var nextResponseProxy = (res, requestContext) => {
+  return new Proxy(res, {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    get(target, key) {
+      const originalValue = target[key];
+      if (key === "revalidate") {
+        return async function newRevalidate(...args) {
+          requestContext.didPagesRouterOnDemandRevalidate = true;
+          return originalValue?.apply(target, args);
+        };
+      }
+      return originalValue;
+    }
+  });
+};
+
+export {
+  nextResponseProxy
+};

package/dist/esm-chunks/{chunk-AU7XDLZH.js → chunk-UTCWWUFW.js}

@@ -613,7 +613,7 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = (headers, request) => {
+var setCacheControlHeaders = (headers, request, requestContext) => {
   const cacheControl = headers.get("cache-control");
   if (cacheControl !== null && ["GET", "HEAD"].includes(request.method) && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control")) {
     const browserCacheControl = omitHeaderValues(cacheControl, [
@@ -630,9 +630,16 @@ var setCacheControlHeaders = (headers, request) => {
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
   }
+  if (cacheControl === null && !headers.has("cdn-cache-control") && !headers.has("netlify-cdn-cache-control") && requestContext.usedFsRead) {
+    headers.set("cache-control", "public, max-age=0, must-revalidate");
+    headers.set("netlify-cdn-cache-control", `max-age=31536000`);
+  }
 };
-var setCacheTagsHeaders = (headers, request, manifest) => {
-  const path = new URL(request.url).pathname;
+function getCanonicalPathFromCacheKey(cacheKey) {
+  return cacheKey === "/index" ? "/" : cacheKey;
+}
+var setCacheTagsHeaders = (headers, request, manifest, requestContext) => {
+  const path = getCanonicalPathFromCacheKey(requestContext.responseCacheKey) ?? new URL(request.url).pathname;
   const tags = manifest[path];
   if (tags !== void 0) {
     headers.set("netlify-cache-tag", tags);

package/dist/esm-chunks/{chunk-ZWFKLYLH.js → chunk-WQIG4U66.js}

@@ -57,8 +57,9 @@ var copyStaticAssets = async (ctx) => {
 };
 var publishStaticDir = async (ctx) => {
   try {
-    await mkdir(ctx.resolve(".netlify/.next"), { recursive: true });
-    await rename(ctx.publishDir, ctx.resolve(".netlify/.next"));
+    await rm(ctx.tempPublishDir, { recursive: true, force: true });
+    await mkdir(ctx.tempPublishDir, { recursive: true });
+    await rename(ctx.publishDir, ctx.tempPublishDir);
     await rename(ctx.staticDir, ctx.publishDir);
   } catch (error) {
     ctx.failBuild("Failed publishing static content", error instanceof Error ? { error } : {});
@@ -66,9 +67,9 @@ var publishStaticDir = async (ctx) => {
 };
 var unpublishStaticDir = async (ctx) => {
   try {
-    if (existsSync(ctx.resolve(".netlify/.next"))) {
+    if (existsSync(ctx.tempPublishDir)) {
       await rename(ctx.publishDir, ctx.staticDir);
-      await rename(ctx.resolve(".netlify/.next"), ctx.publishDir);
+      await rename(ctx.tempPublishDir, ctx.publishDir);
     }
   } catch {
   }