what happens if we delete this...

Author: ztanner

packages/next/src/server/lib/router-utils/resolve-routes.ts

@@ -9,7 +9,6 @@ import type { UnwrapPromise } from '../../../lib/coalesced-function'
 import type { NextUrlWithParsedQuery } from '../../request-meta'
 
 import url from 'url'
-import path from 'node:path'
 import setupDebug from 'next/dist/compiled/debug'
 import { getCloneableBody } from '../../body-streams'
 import { filterReqHeaders, ipcForbiddenHeaders } from '../server-ipc/utils'
@@ -26,9 +25,6 @@ import { pathHasPrefix } from '../../../shared/lib/router/utils/path-has-prefix'
 import { detectDomainLocale } from '../../../shared/lib/i18n/detect-domain-locale'
 import { normalizeLocalePath } from '../../../shared/lib/i18n/normalize-locale-path'
 import { removePathPrefix } from '../../../shared/lib/router/utils/remove-path-prefix'
-import { NextDataPathnameNormalizer } from '../../normalizers/request/next-data'
-import { BasePathPathnameNormalizer } from '../../normalizers/request/base-path'
-import { PostponedPathnameNormalizer } from '../../normalizers/request/postponed'
 
 import { addRequestMeta } from '../../request-meta'
 import {
@@ -65,9 +61,6 @@ export function getResolveRoutes(
     Partial<Redirect>
 
   const routes: Route[] = [
-    // _next/data with middleware handling
-    { match: () => ({}), name: 'middleware_next_data' },
-
     ...(opts.minimalMode ? [] : fsChecker.headers),
     ...(opts.minimalMode ? [] : fsChecker.redirects),
 
@@ -296,17 +289,6 @@ export function getResolveRoutes(
       }
     }
 
-    const normalizers = {
-      basePath:
-        config.basePath && config.basePath !== '/'
-          ? new BasePathPathnameNormalizer(config.basePath)
-          : undefined,
-      data: new NextDataPathnameNormalizer(fsChecker.buildId),
-      postponed: config.experimental.ppr
-        ? new PostponedPathnameNormalizer()
-        : undefined,
-    }
-
     async function handleRoute(
       route: (typeof routes)[0]
     ): Promise<UnwrapPromise<ReturnType<typeof resolveRoutes>> | void> {
@@ -375,41 +357,6 @@ export function getResolveRoutes(
           }
         }
 
-        if (route.name === 'middleware_next_data' && parsedUrl.pathname) {
-          if (fsChecker.getMiddlewareMatchers()?.length) {
-            let normalized = parsedUrl.pathname
-
-            // Remove the base path if it exists.
-            const hadBasePath = normalizers.basePath?.match(parsedUrl.pathname)
-            if (hadBasePath && normalizers.basePath) {
-              normalized = normalizers.basePath.normalize(normalized, true)
-            }
-
-            let updated = false
-            if (normalizers.data.match(normalized)) {
-              updated = true
-              parsedUrl.query.__nextDataReq = '1'
-              normalized = normalizers.data.normalize(normalized, true)
-            } else if (normalizers.postponed?.match(normalized)) {
-              updated = true
-              normalized = normalizers.postponed.normalize(normalized, true)
-            }
-
-            // If we updated the pathname, and it had a base path, re-add the
-            // base path.
-            if (updated) {
-              if (hadBasePath) {
-                normalized = path.posix.join(config.basePath, normalized)
-              }
-
-              // Re-add the trailing slash (if required).
-              normalized = maybeAddTrailingSlash(normalized)
-
-              parsedUrl.pathname = normalized
-            }
-          }
-        }
-
         if (route.name === 'check_fs') {
           const pathname = parsedUrl.pathname || ''
 
@@ -743,6 +690,7 @@ export function getResolveRoutes(
             }
           }
           didRewrite = true
+          console.log('setting pathname 775', parsedDestination.pathname)
           parsedUrl.pathname = parsedDestination.pathname
           Object.assign(parsedUrl.query, parsedDestination.query)
         }

packages/next/src/shared/lib/i18n/normalize-locale-path.ts

@@ -17,17 +17,8 @@ export function normalizeLocalePath(
   locales?: string[]
 ): PathLocale {
   let detectedLocale: string | undefined
-  const isDataRoute = pathname.startsWith('/_next/data')
-
-  // Create a pathname for locale detection, removing /_next/data/[buildId] if present
-  // This is because locale detection relies on path splitting and so the first part
-  // should be the locale.
-  const pathNameNoDataPrefix = isDataRoute
-    ? pathname.replace(/^\/_next\/data\/[^/]+/, '')
-    : pathname
-
-  // Split the path for locale detection
-  const pathnameParts = pathNameNoDataPrefix.split('/')
+  // first item will be empty string from splitting at first char
+  const pathnameParts = pathname.split('/')
 
   ;(locales || []).some((locale) => {
     if (
@@ -36,17 +27,12 @@ export function normalizeLocalePath(
     ) {
       detectedLocale = locale
       pathnameParts.splice(1, 1)
+      pathname = pathnameParts.join('/') || '/'
       return true
     }
     return false
   })
 
-  // For non-data routes, we return the path with the locale stripped out.
-  // For data routes, we keep the path as is, since we only want to extract the locale.
-  if (detectedLocale && !isDataRoute) {
-    pathname = pathnameParts.join('/') || '/'
-  }
-
   return {
     pathname,
     detectedLocale,