fix: honor skipMiddlewareUrlNormalize (#287)

* fix: honor skipMiddlewareUrlNormalize

* fix: preserve no trailing slash for localized index routes

* chore: whitespaces

Author: pieh

edge-runtime/lib/next-request.ts

@@ -24,6 +24,7 @@ export interface RequestData {
     basePath?: string
     i18n?: I18NConfig | null
     trailingSlash?: boolean
+    skipMiddlewareUrlNormalize?: boolean
   }
   page?: {
     name?: string
@@ -50,19 +51,23 @@ const normalizeRequestURL = (
       url.pathname,
       nextConfig?.i18n?.locales,
     )
-    url.pathname = pathname
+    if (!nextConfig?.skipMiddlewareUrlNormalize) {
+      url.pathname = pathname || '/'
+    }
     detectedLocale = detected
   }
 
-  // We want to run middleware for data requests and expose the URL of the
-  // corresponding pages, so we have to normalize the URLs before running
-  // the handler.
-  url.pathname = normalizeDataUrl(url.pathname)
+  if (!nextConfig?.skipMiddlewareUrlNormalize) {
+    // We want to run middleware for data requests and expose the URL of the
+    // corresponding pages, so we have to normalize the URLs before running
+    // the handler.
+    url.pathname = normalizeDataUrl(url.pathname)
 
-  // Normalizing the trailing slash based on the `trailingSlash` configuration
-  // property from the Next.js config.
-  if (nextConfig?.trailingSlash && url.pathname !== '/' && !url.pathname.endsWith('/')) {
-    url.pathname = `${url.pathname}/`
+    // Normalizing the trailing slash based on the `trailingSlash` configuration
+    // property from the Next.js config.
+    if (nextConfig?.trailingSlash && url.pathname !== '/' && !url.pathname.endsWith('/')) {
+      url.pathname = `${url.pathname}/`
+    }
   }
 
   if (didRemoveBasePath) {

edge-runtime/lib/response.ts

@@ -247,9 +247,10 @@ function normalizeLocalizedTarget({
     !normalizedTarget.pathname.startsWith(`/api/`) &&
     !normalizedTarget.pathname.startsWith(`/_next/static/`)
   ) {
-    targetUrl.pathname = addBasePath(`/${locale}${normalizedTarget.pathname}`, nextConfig?.basePath)
+    targetUrl.pathname =
+      addBasePath(`/${locale}${normalizedTarget.pathname}`, nextConfig?.basePath) || `/`
   } else {
-    targetUrl.pathname = addBasePath(normalizedTarget.pathname, nextConfig?.basePath)
+    targetUrl.pathname = addBasePath(normalizedTarget.pathname, nextConfig?.basePath) || `/`
   }
   return targetUrl.toString()
 }

edge-runtime/lib/util.ts

@@ -56,7 +56,7 @@ export function normalizeLocalePath(pathname: string, locales?: string[]): PathL
     if (pathnameParts[1] && pathnameParts[1].toLowerCase() === locale.toLowerCase()) {
       detectedLocale = locale
       pathnameParts.splice(1, 1)
-      pathname = pathnameParts.join('/') || '/'
+      pathname = pathnameParts.join('/')
       return true
     }
     return false

src/build/functions/edge.ts

@@ -89,6 +89,7 @@ const writeHandlerFile = async (ctx: PluginContext, { matchers, name }: NextDefi
     basePath: nextConfig.basePath,
     i18n: nextConfig.i18n,
     trailingSlash: nextConfig.trailingSlash,
+    skipMiddlewareUrlNormalize: nextConfig.skipMiddlewareUrlNormalize,
   }
 
   await writeFile(