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

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.6",
+  "version": "5.0.0-beta.7",
   "description": "Run Next.js seamlessly on Netlify",
   "main": "./dist/index.js",
   "type": "module",