@netlify/plugin-nextjs 5.4.0 → 5.5.0

package/dist/build/content/prerendered.js

@@ -4,9 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  require_out
-} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   wrapTracer
 } from "../../esm-chunks/chunk-5QSXBV7L.js";
@@ -14,6 +11,9 @@ import {
   init_esm,
   trace
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
+import {
+  require_out
+} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   require_semver
 } from "../../esm-chunks/chunk-EFGWM7RS.js";
@@ -137,7 +137,7 @@ function pLimit(concurrency) {
 // src/build/content/prerendered.ts
 var import_semver = __toESM(require_semver(), 1);
 import { encodeBlobKey } from "../../shared/blobkey.js";
-import { verifyNoNetlifyForms } from "../verification.js";
+import { verifyNetlifyForms } from "../verification.js";
 var tracer = wrapTracer(trace.getTracer("Next runtime"));
 var writeCacheEntry = async (route, value, lastModified, ctx) => {
   const path = join(ctx.blobDir, await encodeBlobKey(route));
@@ -231,7 +231,7 @@ var copyPrerenderedContent = async (ctx) => {
                 throw new Error(`Unrecognized content: ${route}`);
             }
             if (value.kind === "PAGE" || value.kind === "APP_PAGE") {
-              verifyNoNetlifyForms(ctx, value.html);
+              verifyNetlifyForms(ctx, value.html);
             }
             await writeCacheEntry(key, value, lastModified, ctx);
           })

package/dist/build/content/server.js

@@ -4,9 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  require_out
-} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   wrapTracer
 } from "../../esm-chunks/chunk-5QSXBV7L.js";
@@ -14,6 +11,9 @@ import {
   init_esm,
   trace
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
+import {
+  require_out
+} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   require_semver
 } from "../../esm-chunks/chunk-EFGWM7RS.js";

package/dist/build/content/static.js

@@ -4,9 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  require_out
-} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   wrapTracer
 } from "../../esm-chunks/chunk-5QSXBV7L.js";
@@ -14,6 +11,9 @@ import {
   init_esm,
   trace
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
+import {
+  require_out
+} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-OEQOKJGE.js";
@@ -25,7 +25,7 @@ import { cp, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { basename, join } from "node:path";
 var import_fast_glob = __toESM(require_out(), 1);
 import { encodeBlobKey } from "../../shared/blobkey.js";
-import { verifyNoNetlifyForms } from "../verification.js";
+import { verifyNetlifyForms } from "../verification.js";
 var tracer = wrapTracer(trace.getTracer("Next runtime"));
 var copyStaticContent = async (ctx) => {
   return tracer.withActiveSpan("copyStaticContent", async () => {
@@ -40,7 +40,7 @@ var copyStaticContent = async (ctx) => {
       await Promise.all(
         paths.filter((path) => !paths.includes(`${path.slice(0, -5)}.json`)).map(async (path) => {
           const html = await readFile(join(srcDir, path), "utf-8");
-          verifyNoNetlifyForms(ctx, html);
+          verifyNetlifyForms(ctx, html);
           await writeFile(join(destDir, await encodeBlobKey(path)), html, "utf-8");
         })
       );

package/dist/build/functions/server.js

@@ -4,9 +4,6 @@
         return createRequire(import.meta.url);
       })();
     
-import {
-  require_out
-} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   wrapTracer
 } from "../../esm-chunks/chunk-5QSXBV7L.js";
@@ -14,6 +11,9 @@ import {
   init_esm,
   trace
 } from "../../esm-chunks/chunk-GNGHTHMQ.js";
+import {
+  require_out
+} from "../../esm-chunks/chunk-FHR56UHE.js";
 import {
   __toESM
 } from "../../esm-chunks/chunk-OEQOKJGE.js";

package/dist/build/verification.js

@@ -4,6 +4,9 @@
         return createRequire(import.meta.url);
       })();
     
+import {
+  require_out
+} from "../esm-chunks/chunk-FHR56UHE.js";
 import {
   require_semver
 } from "../esm-chunks/chunk-EFGWM7RS.js";
@@ -12,12 +15,14 @@ import {
 } from "../esm-chunks/chunk-OEQOKJGE.js";
 
 // src/build/verification.ts
+var import_fast_glob = __toESM(require_out(), 1);
 var import_semver = __toESM(require_semver(), 1);
 import { existsSync } from "node:fs";
+import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { ApiRouteType, getAPIRoutesConfigs } from "./advanced-api-routes.js";
 var SUPPORTED_NEXT_VERSIONS = ">=13.5.0";
-var warnings = /* @__PURE__ */ new Set();
+var verifications = /* @__PURE__ */ new Set();
 function verifyPublishDir(ctx) {
   if (!existsSync(ctx.publishDir)) {
     ctx.failBuild(
@@ -49,7 +54,7 @@ function verifyPublishDir(ctx) {
     }
     if (ctx.nextVersion && !(0, import_semver.satisfies)(ctx.nextVersion, SUPPORTED_NEXT_VERSIONS, { includePrerelease: true })) {
       ctx.failBuild(
-        `@netlify/plugin-next@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${ctx.nextVersion}. Please upgrade your project's Next.js version.`
+        `@netlify/plugin-nextjs@5 requires Next.js version ${SUPPORTED_NEXT_VERSIONS}, but found ${ctx.nextVersion}. Please upgrade your project's Next.js version.`
       );
     }
   }
@@ -64,30 +69,50 @@ function verifyPublishDir(ctx) {
     }
   }
 }
-async function verifyNoAdvancedAPIRoutes(ctx) {
+async function verifyAdvancedAPIRoutes(ctx) {
   const apiRoutesConfigs = await getAPIRoutesConfigs(ctx);
   const unsupportedAPIRoutes = apiRoutesConfigs.filter((apiRouteConfig) => {
     return apiRouteConfig.config.type === ApiRouteType.BACKGROUND || apiRouteConfig.config.type === ApiRouteType.SCHEDULED;
   });
   if (unsupportedAPIRoutes.length !== 0) {
     ctx.failBuild(
-      `@netlify/plugin-next@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:
+      `@netlify/plugin-nextjs@5 does not support advanced API routes. The following API routes should be migrated to Netlify background or scheduled functions:
 ${unsupportedAPIRoutes.map((apiRouteConfig) => ` - ${apiRouteConfig.apiRoute} (type: "${apiRouteConfig.config.type}")`).join("\n")}
 
 Refer to https://ntl.fyi/next-scheduled-bg-function-migration as migration example.`
     );
   }
 }
-function verifyNoNetlifyForms(ctx, html) {
-  if (!warnings.has("netlifyForms") && /<form[^>]*?\s(netlify|data-netlify)[=>\s]/.test(html)) {
+var formDetectionRegex = /<form[^>]*?\s(netlify|data-netlify)[=>\s]/;
+async function verifyNetlifyFormsWorkaround(ctx) {
+  const srcDir = ctx.resolveFromSiteDir("public");
+  const paths = await (0, import_fast_glob.glob)("**/*.html", {
+    cwd: srcDir,
+    dot: true
+  });
+  try {
+    for (const path of paths) {
+      const html = await readFile(join(srcDir, path), "utf-8");
+      if (formDetectionRegex.test(html)) {
+        verifications.add("netlifyFormsWorkaround");
+        return;
+      }
+    }
+  } catch (error) {
+    ctx.failBuild("Failed verifying public files", error);
+  }
+}
+function verifyNetlifyForms(ctx, html) {
+  if (!verifications.has("netlifyForms") && !verifications.has("netlifyFormsWorkaround") && formDetectionRegex.test(html)) {
     console.warn(
-      "@netlify/plugin-next@5 does not support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example."
+      "@netlify/plugin-nextjs@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example."
     );
-    warnings.add("netlifyForms");
+    verifications.add("netlifyForms");
   }
 }
 export {
-  verifyNoAdvancedAPIRoutes,
-  verifyNoNetlifyForms,
+  verifyAdvancedAPIRoutes,
+  verifyNetlifyForms,
+  verifyNetlifyFormsWorkaround,
   verifyPublishDir
 };

package/dist/esm-chunks/{package-7DG4KM7X.js → package-C5ZXMRQF.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.4.0";
+var version = "5.5.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -58,13 +58,13 @@ var homepage = "https://github.com/netlify/next-runtime#readme";
 var devDependencies = {
   "@fastly/http-compute-js": "1.1.4",
   "@netlify/blobs": "^7.3.0",
-  "@netlify/build": "^29.50.1",
+  "@netlify/build": "^29.50.2",
   "@netlify/edge-bundler": "^12.1.1",
   "@netlify/edge-functions": "^2.8.1",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.8.0",
   "@netlify/serverless-functions-api": "^1.18.5",
-  "@netlify/zip-it-and-ship-it": "^9.37.2",
+  "@netlify/zip-it-and-ship-it": "^9.37.3",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",
   "@opentelemetry/resources": "^1.24.0",

package/dist/index.js

@@ -29,7 +29,11 @@ import { createEdgeHandlers } from "./build/functions/edge.js";
 import { createServerHandler } from "./build/functions/server.js";
 import { setImageConfig } from "./build/image-cdn.js";
 import { PluginContext } from "./build/plugin-context.js";
-import { verifyNoAdvancedAPIRoutes, verifyPublishDir } from "./build/verification.js";
+import {
+  verifyAdvancedAPIRoutes,
+  verifyNetlifyFormsWorkaround,
+  verifyPublishDir
+} from "./build/verification.js";
 var tracer = wrapTracer(trace.getTracer("Next.js runtime"));
 var onPreDev = async (options) => {
   await tracer.withActiveSpan("onPreDev", async () => {
@@ -56,7 +60,8 @@ var onBuild = async (options) => {
     if (ctx.buildConfig.output === "export") {
       return copyStaticExport(ctx);
     }
-    await verifyNoAdvancedAPIRoutes(ctx);
+    await verifyAdvancedAPIRoutes(ctx);
+    await verifyNetlifyFormsWorkaround(ctx);
     await Promise.all([
       copyStaticAssets(ctx),
       copyStaticContent(ctx),

package/dist/run/handlers/server.js

@@ -3161,7 +3161,8 @@ var server_default = async (request, context) => {
       span.setAttribute("responseCacheKey", requestContext.responseCacheKey);
     }
     await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext });
-    setCacheControlHeaders(response.headers, request, requestContext);
+    const useDurableCache = context.flags.get("serverless_functions_nextjs_durable_cache_disable") !== true;
+    setCacheControlHeaders(response.headers, request, requestContext, useDurableCache);
     setCacheTagsHeaders(response.headers, requestContext);
     setVaryHeaders(response.headers, request, nextConfig);
     setCacheStatusHeader(response.headers);

package/dist/run/handlers/tracing.js

@@ -67385,7 +67385,7 @@ var import_semantic_conventions = __toESM(require_src(), 1);
 import { getLogger } from "./request-context.cjs";
 var {
   default: { version, name }
-} = await import("../../esm-chunks/package-7DG4KM7X.js");
+} = await import("../../esm-chunks/package-C5ZXMRQF.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

@@ -51,11 +51,6 @@ var omitHeaderValues = (header, values) => {
   );
   return filteredValues.join(", ");
 };
-var mapHeaderValues = (header, callback) => {
-  const headerValues = getHeaderValueArray(header);
-  const mappedValues = headerValues.map(callback);
-  return mappedValues.join(", ");
-};
 var setVaryHeaders = (headers, request, { basePath, i18n }) => {
   const netlifyVaryValues = {
     header: ["x-nextjs-data", "x-next-debug-logging"],
@@ -147,11 +142,12 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = (headers, request, requestContext) => {
+var setCacheControlHeaders = (headers, request, requestContext, useDurableCache) => {
+  const durableCacheDirective = useDurableCache ? ", durable" : "";
   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`
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000${durableCacheDirective}`
     );
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
@@ -164,10 +160,12 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
     ]);
     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" : mapHeaderValues(
-        cacheControl,
-        (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
-      )
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : [
+        ...getHeaderValueArray(cacheControl).map(
+          (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
+        ),
+        ...useDurableCache ? ["durable"] : []
+      ].join(", ")
     );
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
@@ -175,7 +173,7 @@ var setCacheControlHeaders = (headers, request, requestContext) => {
   }
   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`);
+    headers.set("netlify-cdn-cache-control", `max-age=31536000${durableCacheDirective}`);
   }
 };
 var setCacheTagsHeaders = (headers, requestContext) => {

package/package.json

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