@netlify/plugin-nextjs 5.0.0-beta.5 → 5.0.0-beta.7

package/dist/build/content/prerendered.js

@@ -7,7 +7,7 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "../../esm-chunks/chunk-BPBL55OP.js";
+} from "../../esm-chunks/chunk-UDWVXRI2.js";
 import "../../esm-chunks/chunk-MFN4GH7U.js";
 import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {

package/dist/build/functions/edge.js

@@ -6,9 +6,9 @@
     
 import {
   createEdgeHandlers
-} from "../../esm-chunks/chunk-HFQPUU7P.js";
+} from "../../esm-chunks/chunk-PCJY2SS7.js";
 import "../../esm-chunks/chunk-MFN4GH7U.js";
-import "../../esm-chunks/chunk-5OSUYKC4.js";
+import "../../esm-chunks/chunk-IZ2AVCVF.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {

package/dist/build/functions/server.js

@@ -6,10 +6,10 @@
     
 import {
   createServerHandler
-} from "../../esm-chunks/chunk-CFYLTWDR.js";
+} from "../../esm-chunks/chunk-KDRFBPAR.js";
 import "../../esm-chunks/chunk-COJ526HO.js";
 import "../../esm-chunks/chunk-MFN4GH7U.js";
-import "../../esm-chunks/chunk-5OSUYKC4.js";
+import "../../esm-chunks/chunk-IZ2AVCVF.js";
 import "../../esm-chunks/chunk-TYCYFZ22.js";
 import "../../esm-chunks/chunk-WELZ7LFO.js";
 export {

package/dist/build/plugin-context.js

@@ -8,7 +8,7 @@ import {
   EDGE_HANDLER_NAME,
   PluginContext,
   SERVER_HANDLER_NAME
-} from "../esm-chunks/chunk-5OSUYKC4.js";
+} from "../esm-chunks/chunk-IZ2AVCVF.js";
 import "../esm-chunks/chunk-TYCYFZ22.js";
 import "../esm-chunks/chunk-WELZ7LFO.js";
 export {

package/dist/esm-chunks/{chunk-5OSUYKC4.js → chunk-IZ2AVCVF.js}

@@ -10,7 +10,7 @@ import {
 
 // src/build/plugin-context.ts
 import { readFileSync } from "node:fs";
-import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { mkdir, readFile, writeFile, stat } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 var MODULE_DIR = fileURLToPath(new URL(".", import.meta.url));
@@ -128,10 +128,11 @@ var PluginContext = class {
   /**
    * Write a cache entry to the blob upload directory.
    */
-  async writeCacheEntry(route, value) {
+  async writeCacheEntry(route, value, filePath) {
+    const { mtime } = await stat(filePath);
     const path = join(this.blobDir, await encodeBlobKey(route));
     const entry = JSON.stringify({
-      lastModified: Date.now(),
+      lastModified: mtime.getTime(),
       value
     });
     await mkdir(dirname(path), { recursive: true });

package/dist/esm-chunks/{chunk-CFYLTWDR.js → chunk-KDRFBPAR.js}

@@ -14,7 +14,7 @@ import {
 } from "./chunk-MFN4GH7U.js";
 import {
   SERVER_HANDLER_NAME
-} from "./chunk-5OSUYKC4.js";
+} from "./chunk-IZ2AVCVF.js";
 import {
   __toESM
 } from "./chunk-WELZ7LFO.js";

package/dist/esm-chunks/{chunk-HFQPUU7P.js → chunk-PCJY2SS7.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-MFN4GH7U.js";
 import {
   EDGE_HANDLER_NAME
-} from "./chunk-5OSUYKC4.js";
+} from "./chunk-IZ2AVCVF.js";
 import {
   __toESM
 } from "./chunk-WELZ7LFO.js";
@@ -17,7 +17,7 @@ import {
 // src/build/functions/edge.ts
 var import_fast_glob = __toESM(require_out(), 1);
 import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
-import { dirname, join } from "node:path";
+import { dirname, join, relative } from "node:path";
 var writeEdgeManifest = async (ctx, manifest) => {
   await mkdir(ctx.edgeFunctionsDir, { recursive: true });
   await writeFile(join(ctx.edgeFunctionsDir, "manifest.json"), JSON.stringify(manifest, null, 2));
@@ -60,36 +60,38 @@ var writeHandlerFile = async (ctx, { matchers, name }) => {
   );
 };
 var copyHandlerDependencies = async (ctx, { name, files, wasm }) => {
-  const edgeRuntimePath = join(ctx.pluginDir, "edge-runtime");
   const srcDir = join(ctx.standaloneDir, ".next");
-  const shimPath = join(edgeRuntimePath, "shim/index.js");
-  const shim = await readFile(shimPath, "utf8");
-  const imports = `import './edge-runtime-webpack.js';`;
-  const exports = `export default _ENTRIES["middleware_${name}"].default;`;
-  const parts = [shim, imports];
-  if (wasm?.length) {
-    parts.push(
-      `import { decode as _base64Decode } from "../edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts";`
-    );
-    for (const wasmChunk of wasm ?? []) {
-      const data = await readFile(join(srcDir, wasmChunk.filePath));
-      parts.push(
-        `const ${wasmChunk.name} = _base64Decode(${JSON.stringify(
-          data.toString("base64")
-        )}).buffer`
-      );
-    }
-  }
+  const destDir = join(ctx.edgeFunctionsDir, getHandlerName({ name }));
   await Promise.all(
     files.map(async (file) => {
-      const destDir = join(ctx.edgeFunctionsDir, getHandlerName({ name }));
       if (file === `server/${name}.js`) {
+        const edgeRuntimeDir = join(ctx.pluginDir, "edge-runtime");
+        const shimPath = join(edgeRuntimeDir, "shim/index.js");
+        const shim = await readFile(shimPath, "utf8");
+        const importsDir = relative(dirname(join(srcDir, file)), join(srcDir, "server"));
+        const importsSrc = `${importsDir || "."}/edge-runtime-webpack.js`;
+        const imports = `import '${importsSrc}';`;
+        const exports = `export default _ENTRIES["middleware_${name}"].default;`;
+        const parts = [shim, imports];
+        if (wasm?.length) {
+          parts.push(
+            `import { decode as _base64Decode } from "../edge-runtime/vendor/deno.land/std@0.175.0/encoding/base64.ts";`
+          );
+          for (const wasmChunk of wasm ?? []) {
+            const data = await readFile(join(srcDir, wasmChunk.filePath));
+            parts.push(
+              `const ${wasmChunk.name} = _base64Decode(${JSON.stringify(
+                data.toString("base64")
+              )}).buffer`
+            );
+          }
+        }
         const entrypoint = await readFile(join(srcDir, file), "utf8");
         await mkdir(dirname(join(destDir, file)), { recursive: true });
         await writeFile(join(destDir, file), [...parts, entrypoint, exports].join("\n;"));
-        return;
+      } else {
+        await cp(join(srcDir, file), join(destDir, file));
       }
-      await cp(join(srcDir, file), join(destDir, file));
     })
   );
 };
@@ -100,8 +102,8 @@ var createEdgeHandler = async (ctx, definition) => {
 var getHandlerName = ({ name }) => `${EDGE_HANDLER_NAME}-${name.replace(/\W/g, "-")}`;
 var buildHandlerDefinition = (ctx, { name, matchers, page }) => {
   const fun = getHandlerName({ name });
-  const funName = name === "middleware" ? "Next.js Middleware Handler" : `Next.js Edge Handler: ${page}`;
-  const cache = name === "middleware" ? void 0 : "manual";
+  const funName = name.endsWith("middleware") ? "Next.js Middleware Handler" : `Next.js Edge Handler: ${page}`;
+  const cache = name.endsWith("middleware") ? void 0 : "manual";
   const generator = `${ctx.pluginName}@${ctx.pluginVersion}`;
   return matchers.map((matcher) => ({
     function: fun,

package/dist/esm-chunks/{chunk-BPBL55OP.js → chunk-UDWVXRI2.js}

@@ -44,28 +44,37 @@ var copyPrerenderedContent = async (ctx) => {
       Object.entries(manifest.routes).map(async ([route, meta]) => {
         const key = routeToFilePath(route);
         let value;
+        let path;
         switch (true) {
           case (meta.dataRoute?.endsWith("/default.rsc") && !existsSync(join(ctx.publishDir, "server/app", `${key}.html`))):
             return;
           case meta.dataRoute?.endsWith(".json"):
-            value = await buildPagesCacheValue(join(ctx.publishDir, "server/pages", key));
+            path = join(ctx.publishDir, "server/pages", key);
+            value = await buildPagesCacheValue(path);
             break;
           case meta.dataRoute?.endsWith(".rsc"):
-            value = await buildAppCacheValue(join(ctx.publishDir, "server/app", key));
+            path = join(ctx.publishDir, "server/app", key);
+            value = await buildAppCacheValue(path);
             break;
           case meta.dataRoute === null:
-            value = await buildRouteCacheValue(join(ctx.publishDir, "server/app", key));
+            path = join(ctx.publishDir, "server/app", key);
+            value = await buildRouteCacheValue(path);
             break;
           default:
             throw new Error(`Unrecognized content: ${route}`);
         }
-        await ctx.writeCacheEntry(key, value);
+        await ctx.writeCacheEntry(
+          key,
+          value,
+          meta.dataRoute === null ? `${path}.body` : `${path}.html`
+        );
       })
     );
     if (existsSync(join(ctx.publishDir, `server/app/_not-found.html`))) {
       const key = "/404";
-      const value = await buildAppCacheValue(join(ctx.publishDir, "server/app/_not-found"));
-      await ctx.writeCacheEntry(key, value);
+      const path = join(ctx.publishDir, "server/app/_not-found");
+      const value = await buildAppCacheValue(path);
+      await ctx.writeCacheEntry(key, value, `${path}.html`);
     }
   } catch (error) {
     ctx.failBuild("Failed assembling prerendered content for upload", error);
@@ -79,8 +88,9 @@ var copyFetchContent = async (ctx) => {
     });
     await Promise.all(
       paths.map(async (key) => {
-        const value = await buildFetchCacheValue(join(ctx.publishDir, "cache/fetch-cache", key));
-        await ctx.writeCacheEntry(key, value);
+        const path = join(ctx.publishDir, "cache/fetch-cache", key);
+        const value = await buildFetchCacheValue(path);
+        await ctx.writeCacheEntry(key, value, path);
       })
     );
   } catch (error) {

package/dist/index.js

@@ -7,7 +7,7 @@
 import {
   copyFetchContent,
   copyPrerenderedContent
-} from "./esm-chunks/chunk-BPBL55OP.js";
+} from "./esm-chunks/chunk-UDWVXRI2.js";
 import {
   copyStaticAssets,
   copyStaticContent,
@@ -16,10 +16,10 @@ import {
 } from "./esm-chunks/chunk-AMJYZZKR.js";
 import {
   createEdgeHandlers
-} from "./esm-chunks/chunk-HFQPUU7P.js";
+} from "./esm-chunks/chunk-PCJY2SS7.js";
 import {
   createServerHandler
-} from "./esm-chunks/chunk-CFYLTWDR.js";
+} from "./esm-chunks/chunk-KDRFBPAR.js";
 import "./esm-chunks/chunk-COJ526HO.js";
 import "./esm-chunks/chunk-MFN4GH7U.js";
 import {
@@ -31,7 +31,7 @@ import {
 } from "./esm-chunks/chunk-EPSI5TTB.js";
 import {
   PluginContext
-} from "./esm-chunks/chunk-5OSUYKC4.js";
+} from "./esm-chunks/chunk-IZ2AVCVF.js";
 import "./esm-chunks/chunk-TYCYFZ22.js";
 import "./esm-chunks/chunk-WELZ7LFO.js";
 

package/edge-runtime/lib/headers.ts

@@ -12,20 +12,34 @@ export const InternalHeaders = {
 // * https://github.com/vercel/next.js/blob/43c9d8940dc42337dd2f7d66aa90e6abf952278e/packages/next/server/web/spec-extension/response.ts#L10-L27
 export function updateModifiedHeaders(requestHeaders: Headers, responseHeaders: Headers) {
   const overriddenHeaders = responseHeaders.get('x-middleware-override-headers')
-
   if (!overriddenHeaders) {
     return
   }
 
-  const headersToUpdate = overriddenHeaders.split(',').map((header) => header.trim())
+  const headersToUpdate = new Set(overriddenHeaders.split(',').map((header) => header.trim()))
+
+  // We can't iterate this directly, because we modify the headers in the loop.
+  // This was causing values to be skipped. By spreading them first we avoid that.
+  for (const key of [...requestHeaders.keys()]) {
+    if (!headersToUpdate.has(key)) {
+      requestHeaders.delete(key)
+    }
+  }
 
   for (const header of headersToUpdate) {
     const oldHeaderKey = 'x-middleware-request-' + header
     const headerValue = responseHeaders.get(oldHeaderKey) || ''
 
-    requestHeaders.set(header, headerValue)
+    const oldValue = requestHeaders.get(header) || ''
+
+    if (oldValue !== headerValue) {
+      if (headerValue) {
+        requestHeaders.set(header, headerValue)
+      } else {
+        requestHeaders.delete(header)
+      }
+    }
     responseHeaders.delete(oldHeaderKey)
   }
-
   responseHeaders.delete('x-middleware-override-headers')
 }

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

@@ -1,6 +1,6 @@
 import type { Context } from '@netlify/edge-functions'
 
-import { normalizeDataUrl, removeBasePath, normalizeLocalePath } from './util.ts'
+import { normalizeDataUrl, removeBasePath, normalizeLocalePath, addBasePath } from './util.ts'
 
 interface I18NConfig {
   defaultLocale: string
@@ -41,6 +41,7 @@ const normalizeRequestURL = (
   const url = new URL(originalURL)
 
   url.pathname = removeBasePath(url.pathname, nextConfig?.basePath)
+  const didRemoveBasePath = url.toString() !== originalURL
 
   let detectedLocale: string | undefined
 
@@ -64,6 +65,10 @@ const normalizeRequestURL = (
     url.pathname = `${url.pathname}/`
   }
 
+  if (didRemoveBasePath) {
+    url.pathname = addBasePath(url.pathname, nextConfig?.basePath)
+  }
+
   return {
     url: url.toString(),
     detectedLocale,

package/edge-runtime/lib/response.ts

@@ -3,7 +3,13 @@ import { HTMLRewriter } from '../vendor/deno.land/x/html_rewriter@v0.1.0-pre.17/
 
 import { updateModifiedHeaders } from './headers.ts'
 import type { StructuredLogger } from './logging.ts'
-import { normalizeDataUrl, normalizeLocalePath, relativizeURL, rewriteDataPath } from './util.ts'
+import {
+  addBasePath,
+  normalizeDataUrl,
+  normalizeLocalePath,
+  relativizeURL,
+  rewriteDataPath,
+} from './util.ts'
 import { addMiddlewareHeaders, isMiddlewareRequest, isMiddlewareResponse } from './middleware.ts'
 import { RequestData } from './next-request.ts'
 
@@ -164,27 +170,33 @@ export const buildResponse = async ({
         newRoute: rewriteUrl.pathname,
         basePath: nextConfig?.basePath,
       })
+      if (rewriteUrl.toString() === request.url) {
+        logger.withFields({ rewrite_url: rewrite }).debug('Rewrite url is same as original url')
+        return
+      }
+      res.headers.set('x-middleware-rewrite', relativeUrl)
+      return addMiddlewareHeaders(fetch(new Request(rewriteUrl, request)), res)
+    }
+    const target = normalizeLocalizedTarget({ target: rewrite, request, nextConfig })
+    if (target === request.url) {
+      logger.withFields({ rewrite_url: rewrite }).debug('Rewrite url is same as original url')
+      return
     }
     res.headers.set('x-middleware-rewrite', relativeUrl)
-    request.headers.set('x-middleware-rewrite', rewrite)
-    return addMiddlewareHeaders(fetch(new Request(rewriteUrl, request)), res)
+    request.headers.set('x-middleware-rewrite', target)
+    return addMiddlewareHeaders(fetch(new Request(target, request)), res)
   }
 
   let redirect = res.headers.get('location')
 
   // If we are redirecting a request that had a locale in the URL, we need to add it back in
   if (redirect && requestLocale) {
-    const redirectUrl = new URL(redirect, request.url)
-
-    const normalizedRedirect = normalizeLocalePath(redirectUrl.pathname, nextConfig?.i18n?.locales)
-
-    const locale = normalizedRedirect.detectedLocale ?? requestLocale
-    // Pages router API routes don't have a locale in the URL
-    if (locale && !redirectUrl.pathname.startsWith(`/api/`)) {
-      redirectUrl.pathname = `/${locale}${normalizedRedirect.pathname}`
-      redirect = redirectUrl.toString()
-      res.headers.set('location', redirect)
+    redirect = normalizeLocalizedTarget({ target: redirect, request, nextConfig })
+    if (redirect === request.url) {
+      logger.withFields({ rewrite_url: rewrite }).debug('Rewrite url is same as original url')
+      return
     }
+    res.headers.set('location', redirect)
   }
 
   // Data requests shouldn't automatically redirect in the browser (they might be HTML pages): they're handled by the router
@@ -206,3 +218,34 @@ export const buildResponse = async ({
 
   return res
 }
+
+/**
+ * Normalizes the locale in a URL.
+ */
+function normalizeLocalizedTarget({
+  target,
+  request,
+  nextConfig,
+  requestLocale,
+}: {
+  target: string
+  request: Request
+  nextConfig?: RequestData['nextConfig']
+  requestLocale?: string
+}) {
+  const targetUrl = new URL(target, request.url)
+
+  const normalizedTarget = normalizeLocalePath(targetUrl.pathname, nextConfig?.i18n?.locales)
+
+  const locale = normalizedTarget.detectedLocale ?? requestLocale
+  if (
+    locale &&
+    !normalizedTarget.pathname.startsWith(`/api/`) &&
+    !normalizedTarget.pathname.startsWith(`/_next/static/`)
+  ) {
+    targetUrl.pathname = addBasePath(`/${locale}${normalizedTarget.pathname}`, nextConfig?.basePath)
+  } else {
+    targetUrl.pathname = addBasePath(normalizedTarget.pathname, nextConfig?.basePath)
+  }
+  return targetUrl.toString()
+}

package/edge-runtime/lib/util.ts

@@ -24,6 +24,13 @@ export const removeBasePath = (path: string, basePath?: string) => {
   return path
 }
 
+export const addBasePath = (path: string, basePath?: string) => {
+  if (basePath && !path.startsWith(basePath)) {
+    return `${basePath}${path}`
+  }
+  return path
+}
+
 // https://github.com/vercel/next.js/blob/canary/packages/next/src/shared/lib/i18n/normalize-locale-path.ts
 
 export interface PathLocale {
@@ -91,8 +98,11 @@ export function rewriteDataPath({
 }) {
   const normalizedDataUrl = normalizeDataUrl(removeBasePath(dataUrl, basePath))
 
-  return dataUrl.replace(
-    normalizeIndex(normalizedDataUrl),
-    stripTrailingSlash(normalizeIndex(newRoute)),
+  return addBasePath(
+    dataUrl.replace(
+      normalizeIndex(normalizedDataUrl),
+      stripTrailingSlash(normalizeIndex(newRoute)),
+    ),
+    basePath,
   )
 }

package/edge-runtime/middleware.ts

@@ -59,6 +59,7 @@ export async function handleMiddleware(
       request,
       result,
       requestLocale: nextRequest.detectedLocale,
+      nextConfig,
     })
 
     return response

package/package.json

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