@netlify/plugin-nextjs 5.5.1 → 5.7.0-canary.0

package/dist/build/content/server.js

@@ -169,7 +169,7 @@ var copyNextDependencies = async (ctx) => {
   await tracer.withActiveSpan("copyNextDependencies", async () => {
     const entries = await readdir(ctx.standaloneDir);
     const promises = entries.map(async (entry) => {
-      if (entry === "package.json" || entry === ctx.nextDistDir) {
+      if (entry === ctx.nextDistDir) {
         return;
       }
       const src = join(ctx.standaloneDir, entry);

package/dist/build/functions/edge.js

@@ -431,10 +431,7 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
   const handlerDirectory = join(ctx.edgeFunctionsDir, handlerName);
   const handlerRuntimeDirectory = join(handlerDirectory, "edge-runtime");
   await copyRuntime(ctx, handlerDirectory);
-  await writeFile(
-    join(handlerRuntimeDirectory, "matchers.json"),
-    JSON.stringify(augmentMatchers(matchers, ctx))
-  );
+  await writeFile(join(handlerRuntimeDirectory, "matchers.json"), JSON.stringify(matchers));
   const minimalNextConfig = {
     basePath: nextConfig.basePath,
     i18n: nextConfig.i18n,
@@ -479,7 +476,7 @@ var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
     parts.push(`;// Concatenated file: ${file} 
 `, entrypoint);
   }
-  const exports = `export default _ENTRIES["middleware_${name}"].default;`;
+  const exports = `const middlewareEntryKey = Object.keys(_ENTRIES).find(entryKey => entryKey.startsWith("middleware_${name}")); export default _ENTRIES[middlewareEntryKey].default;`;
   await mkdir(dirname(join(destDir, `server/${name}.js`)), { recursive: true });
   await writeFile(join(destDir, `server/${name}.js`), [...parts, exports].join("\n"));
 };

package/dist/build/functions/server.js

@@ -61,10 +61,16 @@ var copyHandlerDependencies = async (ctx) => {
         )
       );
     }
+    promises.push(
+      writeFile(
+        join(ctx.serverHandlerRuntimeModulesDir, "package.json"),
+        JSON.stringify({ type: "module" })
+      )
+    );
     const fileList = await (0, import_fast_glob.glob)("dist/**/*", { cwd: ctx.pluginDir });
     for (const filePath of fileList) {
       promises.push(
-        cp(join(ctx.pluginDir, filePath), join(ctx.serverHandlerDir, ".netlify", filePath), {
+        cp(join(ctx.pluginDir, filePath), join(ctx.serverHandlerRuntimeModulesDir, filePath), {
           recursive: true,
           force: true
         })
@@ -90,12 +96,6 @@ var writeHandlerManifest = async (ctx) => {
     "utf-8"
   );
 };
-var writePackageMetadata = async (ctx) => {
-  await writeFile(
-    join(ctx.serverHandlerRootDir, "package.json"),
-    JSON.stringify({ type: "module" })
-  );
-};
 var applyTemplateVariables = (template, variables) => {
   return Object.entries(variables).reduce((acc, [key, value]) => {
     return acc.replaceAll(key, value);
@@ -126,12 +126,11 @@ var clearStaleServerHandlers = async (ctx) => {
 };
 var createServerHandler = async (ctx) => {
   await tracer.withActiveSpan("createServerHandler", async () => {
-    await mkdir(join(ctx.serverHandlerDir, ".netlify"), { recursive: true });
+    await mkdir(join(ctx.serverHandlerRuntimeModulesDir), { recursive: true });
     await copyNextServerCode(ctx);
     await copyNextDependencies(ctx);
     await copyHandlerDependencies(ctx);
     await writeHandlerManifest(ctx);
-    await writePackageMetadata(ctx);
     await writeHandlerFile(ctx);
     await verifyHandlerDirStructure(ctx);
   });

package/dist/build/plugin-context.js

@@ -133,6 +133,9 @@ var PluginContext = class {
     }
     return join(this.serverHandlerRootDir, this.distDirParent);
   }
+  get serverHandlerRuntimeModulesDir() {
+    return join(this.serverHandlerDir, ".netlify");
+  }
   get nextServerHandler() {
     if (this.relativeAppDir.length !== 0) {
       return join(this.lambdaWorkingDirectory, ".netlify/dist/run/handlers/server.js");

package/dist/build/verification.js

@@ -103,11 +103,10 @@ async function verifyNetlifyFormsWorkaround(ctx) {
   }
 }
 function verifyNetlifyForms(ctx, html) {
-  if (!verifications.has("netlifyForms") && !verifications.has("netlifyFormsWorkaround") && formDetectionRegex.test(html)) {
-    console.warn(
+  if (process.env.NETLIFY_NEXT_VERIFY_FORMS !== "0" && process.env.NETLIFY_NEXT_VERIFY_FORMS?.toUpperCase() !== "FALSE" && !verifications.has("netlifyFormsWorkaround") && formDetectionRegex.test(html)) {
+    ctx.failBuild(
       "@netlify/plugin-nextjs@5 requires migration steps to support Netlify Forms. Refer to https://ntl.fyi/next-runtime-forms-migration for migration example."
     );
-    verifications.add("netlifyForms");
   }
 }
 export {

package/dist/esm-chunks/{package-SHOGGUO3.js → package-SRGJOMMG.js}

@@ -8,7 +8,7 @@ import "./chunk-OEQOKJGE.js";
 
 // package.json
 var name = "@netlify/plugin-nextjs";
-var version = "5.5.1";
+var version = "5.7.0-canary.0";
 var description = "Run Next.js seamlessly on Netlify";
 var main = "./dist/index.js";
 var type = "module";
@@ -60,10 +60,10 @@ var devDependencies = {
   "@netlify/blobs": "^7.3.0",
   "@netlify/build": "^29.50.2",
   "@netlify/edge-bundler": "^12.1.1",
-  "@netlify/edge-functions": "^2.8.1",
+  "@netlify/edge-functions": "^2.10.0",
   "@netlify/eslint-config-node": "^7.0.1",
   "@netlify/functions": "^2.8.1",
-  "@netlify/serverless-functions-api": "^1.19.1",
+  "@netlify/serverless-functions-api": "^1.22.0",
   "@netlify/zip-it-and-ship-it": "^9.37.3",
   "@opentelemetry/api": "^1.8.0",
   "@opentelemetry/exporter-trace-otlp-http": "^0.51.0",

package/dist/index.js

@@ -62,7 +62,7 @@ var onBuild = async (options) => {
       await saveBuildCache(ctx);
     }
     if (ctx.buildConfig.output === "export") {
-      return copyStaticExport(ctx);
+      return Promise.all([copyStaticExport(ctx), setImageConfig(ctx)]);
     }
     await verifyAdvancedAPIRoutes(ctx);
     await verifyNetlifyFormsWorkaround(ctx);

package/dist/run/handlers/server.js

@@ -3161,8 +3161,7 @@ var server_default = async (request, context) => {
       span.setAttribute("responseCacheKey", requestContext.responseCacheKey);
     }
     await adjustDateHeader({ headers: response.headers, request, span, tracer, requestContext });
-    const useDurableCache = context.flags.get("serverless_functions_nextjs_durable_cache_disable") !== true;
-    setCacheControlHeaders(response.headers, request, requestContext, useDurableCache);
+    setCacheControlHeaders(response.headers, request, requestContext);
     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-SHOGGUO3.js");
+} = await import("../../esm-chunks/package-SRGJOMMG.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

@@ -142,12 +142,11 @@ var adjustDateHeader = async ({
   headers.set("x-nextjs-date", headers.get("date") ?? lastModifiedDate.toUTCString());
   headers.set("date", lastModifiedDate.toUTCString());
 };
-var setCacheControlHeaders = (headers, request, requestContext, useDurableCache) => {
-  const durableCacheDirective = useDurableCache ? ", durable" : "";
+var setCacheControlHeaders = (headers, request, requestContext) => {
   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${durableCacheDirective}`
+      headers.get("x-nextjs-cache") === "STALE" ? "public, max-age=0, must-revalidate" : `s-maxage=${requestContext.routeHandlerRevalidate === false ? 31536e3 : requestContext.routeHandlerRevalidate}, stale-while-revalidate=31536000, durable`
     );
     headers.set("netlify-cdn-cache-control", cdnCacheControl);
     return;
@@ -164,7 +163,7 @@ var setCacheControlHeaders = (headers, request, requestContext, useDurableCache)
         ...getHeaderValueArray(cacheControl).map(
           (value) => value === "stale-while-revalidate" ? "stale-while-revalidate=31536000" : value
         ),
-        ...useDurableCache ? ["durable"] : []
+        "durable"
       ].join(", ")
     );
     headers.set("cache-control", browserCacheControl || "public, max-age=0, must-revalidate");
@@ -173,7 +172,7 @@ var setCacheControlHeaders = (headers, request, requestContext, useDurableCache)
   }
   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${durableCacheDirective}`);
+    headers.set("netlify-cdn-cache-control", `max-age=31536000, durable`);
   }
 };
 var setCacheTagsHeaders = (headers, requestContext) => {

package/edge-runtime/lib/next-request.ts

@@ -2,6 +2,7 @@ import type { Context } from '@netlify/edge-functions'
 
 import {
   addBasePath,
+  addLocale,
   addTrailingSlash,
   normalizeDataUrl,
   normalizeLocalePath,
@@ -73,6 +74,33 @@ const normalizeRequestURL = (
   }
 }
 
+export const localizeRequest = (
+  url: URL,
+  nextConfig?: {
+    basePath?: string
+    i18n?: I18NConfig | null
+  },
+): { localizedUrl: URL; locale?: string } => {
+  const localizedUrl = new URL(url)
+  localizedUrl.pathname = removeBasePath(localizedUrl.pathname, nextConfig?.basePath)
+
+  // Detect the locale from the URL
+  const { detectedLocale } = normalizeLocalePath(localizedUrl.pathname, nextConfig?.i18n?.locales)
+
+  // Add the locale to the URL if not already present
+  localizedUrl.pathname = addLocale(
+    localizedUrl.pathname,
+    detectedLocale ?? nextConfig?.i18n?.defaultLocale,
+  )
+
+  localizedUrl.pathname = addBasePath(localizedUrl.pathname, nextConfig?.basePath)
+
+  return {
+    localizedUrl,
+    locale: detectedLocale,
+  }
+}
+
 export const buildNextRequest = (
   request: Request,
   context: Context,

package/edge-runtime/lib/response.ts

@@ -116,9 +116,10 @@ export const buildResponse = async ({
   const res = new Response(result.response.body, result.response)
   request.headers.set('x-nf-next-middleware', 'skip')
 
-  let rewrite = res.headers.get('x-middleware-rewrite')
   let redirect = res.headers.get('location')
   let nextRedirect = res.headers.get('x-nextjs-redirect')
+  // If we have both a redirect and a rewrite, the redirect must take precedence
+  let rewrite = !redirect && !nextRedirect ? res.headers.get('x-middleware-rewrite') : false
 
   // Data requests (i.e. requests for /_next/data ) need special handling
   const isDataReq = request.headers.has('x-nextjs-data')

package/edge-runtime/lib/util.ts

@@ -29,6 +29,20 @@ export const addBasePath = (path: string, basePath?: string) => {
   return path
 }
 
+// add locale prefix if not present, allowing for locale fallbacks
+export const addLocale = (path: string, locale?: string) => {
+  if (
+    locale &&
+    path.toLowerCase() !== `/${locale.toLowerCase()}` &&
+    !path.toLowerCase().startsWith(`/${locale.toLowerCase()}/`) &&
+    !path.startsWith(`/api/`) &&
+    !path.startsWith(`/_next/`)
+  ) {
+    return `/${locale}${path}`
+  }
+  return path
+}
+
 // https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/i18n/normalize-locale-path.ts
 
 export interface PathLocale {

package/edge-runtime/middleware.ts

@@ -5,7 +5,7 @@ import nextConfig from './next.config.json' with { type: 'json' }
 
 import { InternalHeaders } from './lib/headers.ts'
 import { logger, LogLevel } from './lib/logging.ts'
-import { buildNextRequest, RequestData } from './lib/next-request.ts'
+import { buildNextRequest, localizeRequest, RequestData } from './lib/next-request.ts'
 import { buildResponse, FetchEventResult } from './lib/response.ts'
 import {
   getMiddlewareRouteMatcher,
@@ -31,8 +31,8 @@ export async function handleMiddleware(
   context: Context,
   nextHandler: NextHandler,
 ) {
-  const nextRequest = buildNextRequest(request, context, nextConfig)
   const url = new URL(request.url)
+
   const reqLogger = logger
     .withLogLevel(
       request.headers.has(InternalHeaders.NFDebugLogging) ? LogLevel.Debug : LogLevel.Log,
@@ -40,16 +40,20 @@ export async function handleMiddleware(
     .withFields({ url_path: url.pathname })
     .withRequestID(request.headers.get(InternalHeaders.NFRequestID))
 
+  const { localizedUrl } = localizeRequest(url, nextConfig)
   // While we have already checked the path when mapping to the edge function,
   // Next.js supports extra rules that we need to check here too, because we
   // might be running an edge function for a path we should not. If we find
   // that's the case, short-circuit the execution.
-  if (!matchesMiddleware(url.pathname, request, searchParamsToUrlQuery(url.searchParams))) {
+  if (
+    !matchesMiddleware(localizedUrl.pathname, request, searchParamsToUrlQuery(url.searchParams))
+  ) {
     reqLogger.debug('Aborting middleware due to runtime rules')
 
     return
   }
 
+  const nextRequest = buildNextRequest(request, context, nextConfig)
   try {
     const result = await nextHandler({ request: nextRequest })
     const response = await buildResponse({

package/package.json

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