fix: updated redirect data urls

Author: taty2010

packages/runtime/src/templates/edge-shared/utils.ts

@@ -6,7 +6,24 @@ export interface FetchEventResult {
   waitUntil: Promise<any>
 }
 
-type NextDataTransform = <T>(data: T) => T
+function normalizeDataUrl(redirect, url) {
+  const normalizedUrl = new URL(redirect, url)
+
+    if (
+    normalizedUrl.pathname.startsWith('/_next/data/') &&
+    normalizedUrl.pathname.endsWith('.json')
+  ) {
+    const paths = normalizedUrl.pathname
+      .replace(/^\/_next\/data\//, '')
+      .replace(/\.json$/, '')
+      .split('/')
+
+    const buildId = paths[0]
+    normalizedUrl.pathname = paths[1] !== 'index' ? `/${paths.slice(1).join('/')}` : '/'
+  }
+
+  return normalizedUrl.pathname + normalizedUrl.search;
+}
 
 /**
  * This is how Next handles rewritten URLs.
@@ -247,7 +264,7 @@ export const buildResponse = async ({
   // Data requests shouldn;t automatically redirect in the browser (they might be HTML pages): they're handled by the router
   if (redirect && isDataReq) {
     res.headers.delete('location')
-    res.headers.set('x-nextjs-redirect', relativizeURL(redirect, request.url))
+    res.headers.set('x-nextjs-redirect', normalizeDataUrl(redirect, request.url))
   }
 
   if (res.headers.get('x-middleware-next') === '1') {

test/e2e/modified-tests/middleware-redirects/test/index.test.ts

@@ -37,7 +37,7 @@ describe('Middleware Redirect', () => {
       expect(res.headers.get('location')?.endsWith('/default/about')).toEqual(false)
     })
 
-    usuallySkip(`should redirect to data urls with data requests and internal redirects`, async () => {
+    it(`should redirect to data urls with data requests and internal redirects`, async () => {
       const res = await fetchViaHTTP(
         next.url,
         `/_next/data/${next.buildId}/es/old-home.json`,