fix: incorrect canonicalUrl set when using output: export

Author: ztanner

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -158,6 +158,10 @@ export async function fetchServerResponse(
     headers[NEXT_URL] = nextUrl
   }
 
+  // In static export mode, we need to modify the URL to request the .txt file,
+  // but we should preserve the original URL for the canonical URL and error handling.
+  const originalUrl = url
+
   try {
     // When creating a "temporary" prefetch (the "on-demand" prefetch that gets created on navigation, if one doesn't exist)
     // we send the request with a "high" priority as it's in response to a user interaction that could be blocking a transition.
@@ -198,7 +202,7 @@ export async function fetchServerResponse(
     )
 
     const responseUrl = urlToUrlWithoutFlightMarker(new URL(res.url))
-    const canonicalUrl = res.redirected ? responseUrl : url
+    const canonicalUrl = res.redirected ? responseUrl : originalUrl
 
     const contentType = res.headers.get('content-type') || ''
     const interception = !!res.headers.get('vary')?.includes(NEXT_URL)
@@ -285,15 +289,15 @@ export async function fetchServerResponse(
   } catch (err) {
     if (!abortController.signal.aborted) {
       console.error(
-        `Failed to fetch RSC payload for ${url}. Falling back to browser navigation.`,
+        `Failed to fetch RSC payload for ${originalUrl}. Falling back to browser navigation.`,
         err
       )
     }
 
     // If fetch fails handle it like a mpa navigation
     // TODO-APP: Add a test for the case where a CORS request fails, e.g. external url redirect coming from the response.
     // See https://github.com/vercel/next.js/issues/43605#issuecomment-1451617521 for a reproduction.
-    return url.toString()
+    return originalUrl.toString()
   }
 }