fix: skip BC route resolution for 404 path

Author: jorgemoya

core/middlewares/with-routes.ts

@@ -290,6 +290,19 @@ export const withRoutes: MiddlewareFactory = () => {
   return async (request, event) => {
     const locale = request.headers.get('x-bc-locale') ?? '';
 
+    const { pathname } = new URL(request.url);
+    const cleanPathName = clearLocaleFromPath(pathname, locale);
+
+    // This path should be handled by Next.js's not-found page via the catch-all route
+    if (cleanPathName === '/404' || cleanPathName === '/404/') {
+      // Avoid redeclaring rewriteUrl if already declared in upper scope
+      const url404 = new URL(`/${locale}/404`, request.url);
+
+      url404.search = request.nextUrl.search;
+
+      return NextResponse.rewrite(url404);
+    }
+
     const { route, status } = await getRouteInfo(request, event);
 
     if (status === 'MAINTENANCE') {
@@ -403,10 +416,6 @@ export const withRoutes: MiddlewareFactory = () => {
       }
 
       default: {
-        const { pathname } = new URL(request.url);
-
-        const cleanPathName = clearLocaleFromPath(pathname, locale);
-
         url = `/${locale}${cleanPathName}`;
       }
     }