fix: parsedUrl check for i18n

Author: taty2010

packages/runtime/src/templates/handlerUtils.ts

@@ -271,3 +271,29 @@ export const localizeDataRoute = (dataRoute: string, localizedRoute: string): st
     .replace(new RegExp(`/_next/data/(.+?)/(${locale}/)?`), `/_next/data/$1/${locale}/`)
     .replace(/\/index\.json$/, '.json')
 }
+
+interface Routes {
+  page?: string
+  regex?: string
+  routeKeys?: object
+  namedRegex?: string
+  dataRouteRegex?: string
+}
+
+export const getMatchedRoute = (
+  paths: string,
+  routes: Array<Routes>,
+  parsedUrl?: string,
+  basePath?: string,
+): Routes => {
+  const matchedRoute = routes?.find((route) => {
+    // Some internationalized routes are automatically removing the locale prefix making the path not match the route
+    // we can use the parsedURL, which has the locale included '/en' and will match the route
+    if (!basePath && parsedUrl) {
+      return new RegExp(route.regex).test(new URL(parsedUrl, 'http://n').pathname)
+    }
+    // Default to the original path
+    return new RegExp(route.regex).test(new URL(paths, 'http://n').pathname)
+  })
+  return matchedRoute
+}

packages/runtime/src/templates/server.ts

@@ -12,6 +12,7 @@ import {
   localizeRoute,
   localizeDataRoute,
   unlocalizeRoute,
+  getMatchedRoute,
 } from './handlerUtils'
 
 interface NetlifyConfig {
@@ -50,7 +51,7 @@ const getNetlifyNextServer = (NextServer: NextServerType) => {
         const { url, headers } = req
 
         // conditionally use the prebundled React module
-        this.netlifyPrebundleReact(url)
+        this.netlifyPrebundleReact(url, parsedUrl)
 
         // intercept on-demand revalidation requests and handle with the Netlify API
         if (headers['x-prerender-revalidate'] && this.netlifyConfig.revalidateToken) {
@@ -79,12 +80,12 @@ const getNetlifyNextServer = (NextServer: NextServerType) => {
     }
 
     // doing what they do in https://github.com/vercel/vercel/blob/1663db7ca34d3dd99b57994f801fb30b72fbd2f3/packages/next/src/server-build.ts#L576-L580
-    private netlifyPrebundleReact(path: string) {
+    private netlifyPrebundleReact(path: string, parsedUrl?) {
       const routesManifest = this.getRoutesManifest?.()
       const appPathsRoutes = this.getAppPathRoutes?.()
 
       const routes = routesManifest && [...routesManifest.staticRoutes, ...routesManifest.dynamicRoutes]
-      const matchedRoute = routes?.find((route) => new RegExp(route.regex).test(new URL(path, 'http://n').pathname))
+      const matchedRoute = getMatchedRoute(path, routes, parsedUrl, this.nextConfig.basePath)
       const isAppRoute = appPathsRoutes && matchedRoute ? appPathsRoutes[matchedRoute.page] : false
 
       if (isAppRoute) {