Fix redirect under suspense boundary with basePath

packages/next/src/server/app-render/app-render.tsx

@@ -952,6 +952,7 @@ async function renderToHTMLOrFlightImpl(
         polyfills,
         renderServerInsertedHTML,
         serverCapturedErrors: allCapturedErrors,
+        basePath: renderOpts.basePath,
       })
 
       const renderer = createStaticRenderer({
@@ -1281,6 +1282,7 @@ async function renderToHTMLOrFlightImpl(
                 polyfills,
                 renderServerInsertedHTML,
                 serverCapturedErrors: [],
+                basePath: renderOpts.basePath,
               }),
               serverInsertedHTMLToHead: true,
               validateRootLayout,

packages/next/src/server/app-render/make-get-server-inserted-html.tsx

@@ -8,15 +8,18 @@ import {
 import { renderToReadableStream } from 'react-dom/server.edge'
 import { streamToString } from '../stream-utils/node-web-streams-helper'
 import { RedirectStatusCode } from '../../client/components/redirect-status-code'
+import { addPathPrefix } from '../../shared/lib/router/utils/add-path-prefix'
 
 export function makeGetServerInsertedHTML({
   polyfills,
   renderServerInsertedHTML,
   serverCapturedErrors,
+  basePath,
 }: {
   polyfills: JSX.IntrinsicElements['script'][]
   renderServerInsertedHTML: () => React.ReactNode
   serverCapturedErrors: Error[]
+  basePath: string
 }) {
   let flushedErrorMetaTagsUntilIndex = 0
   let hasUnflushedPolyfills = polyfills.length !== 0
@@ -37,7 +40,10 @@ export function makeGetServerInsertedHTML({
           ) : null
         )
       } else if (isRedirectError(error)) {
-        const redirectUrl = getURLFromRedirectError(error)
+        const redirectUrl = addPathPrefix(
+          getURLFromRedirectError(error),
+          basePath
+        )
         const statusCode = getRedirectStatusCodeFromError(error)
         const isPermanent =
           statusCode === RedirectStatusCode.PermanentRedirect ? true : false

test/e2e/app-dir/app-basepath/app/dynamic/[id]/loading.js

@@ -0,0 +1,4 @@
+// Have loading.js to trigger suspense boundary for /dynamic/[id] page
+export default function Loading() {
+  return <div>loading</div>
+}

test/e2e/app-dir/app-basepath/app/dynamic/[id]/page.js

@@ -0,0 +1,11 @@
+import { redirect } from 'next/navigation'
+
+export default async function Page({ params: { id } }) {
+  if (id === 'source') redirect('/dynamic/dest')
+
+  return (
+    <div>
+      <p>{`id:${id}`}</p>
+    </div>
+  )
+}

test/e2e/app-dir/app-basepath/index.test.ts

@@ -1,5 +1,5 @@
 import { createNextDescribe } from 'e2e-utils'
-import { check } from 'next-test-utils'
+import { retry } from 'next-test-utils'
 
 createNextDescribe(
   'app dir - basepath',
@@ -42,10 +42,9 @@ createNextDescribe(
 
     it('should prefix redirect() with basePath', async () => {
       const browser = await next.browser('/base/redirect')
-      await check(async () => {
+      await retry(async () => {
         expect(await browser.url()).toBe(`${next.url}/base/another`)
-        return 'success'
-      }, 'success')
+      })
     })
 
     it('should render usePathname without the basePath', async () => {
@@ -56,5 +55,13 @@ createNextDescribe(
       })
       await Promise.all(validatorPromises)
     })
+
+    it('should handle redirect in dynamic in suspense boundary routes with basePath', async () => {
+      const browser = await next.browser('/base/dynamic/source')
+      await retry(async () => {
+        expect(await browser.url()).toBe(`${next.url}/base/dynamic/dest`)
+        expect(await browser.elementByCss('p').text()).toBe(`id:dest`)
+      })
+    })
   }
 )