Handle basePath for redirect()

packages/next-swc/crates/next-core/js/src/entry/app-renderer.tsx

@@ -73,6 +73,7 @@ async function runOperation(renderData: RenderData) {
   } = {
     // TODO: give an actual buildId when next build is supported
     buildId: 'development',
+    basePath: '',
     params: renderData.params,
     supportsDynamicHTML: true,
     dev: true,

packages/next-swc/crates/next-core/js/src/entry/app/edge-page-bootstrap.ts

@@ -29,6 +29,7 @@ async function render(request: NextRequest, event: NextFetchEvent) {
     supportsDynamicHTML: true,
     dev: true,
     buildId: 'development',
+    basePath: '',
     buildManifest: {
       polyfillFiles: [],
       rootMainFiles: BOOTSTRAP.filter((path) => path.endsWith('.js')),

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

@@ -77,6 +77,7 @@ import { warn } from '../../build/output/log'
 import { appendMutableCookies } from '../web/spec-extension/adapters/request-cookies'
 import { createServerInsertedHTML } from './server-inserted-html'
 import { getRequiredScripts } from './required-scripts'
+import { addPathPrefix } from '../../shared/lib/router/utils/add-path-prefix'
 
 export type GetDynamicParamFromSegment = (
   // [slug] / [[slug]] / [...slug]
@@ -1576,7 +1577,11 @@ export async function renderToHTMLOrFlight(
                 res.setHeader('set-cookie', Array.from(headers.values()))
               }
             }
-            res.setHeader('Location', getURLFromRedirectError(err))
+            const redirectUrl = addPathPrefix(
+              getURLFromRedirectError(err),
+              renderOpts.basePath
+            )
+            res.setHeader('Location', redirectUrl)
           }
 
           const is404 = res.statusCode === 404

packages/next/src/server/app-render/types.ts

@@ -124,6 +124,7 @@ export type RenderOptsPartial = {
   err?: Error | null
   dev?: boolean
   buildId: string
+  basePath: string
   clientReferenceManifest?: ClientReferenceManifest
   supportsDynamicHTML: boolean
   runtime?: ServerRuntime

test/e2e/app-dir/app-basepath/app/redirect/page.js

@@ -0,0 +1,5 @@
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  redirect('/another')
+}

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

@@ -1,4 +1,5 @@
 import { createNextDescribe } from 'e2e-utils'
+import { check } from 'next-test-utils'
 
 createNextDescribe(
   'app dir basepath',
@@ -34,5 +35,13 @@ createNextDescribe(
 
       expect(ogImageHref).toContain('/base/another/opengraph-image.png')
     })
+
+    it('should prefix redirect() with basePath', async () => {
+      const browser = await next.browser('/base/redirect')
+      await check(async () => {
+        expect(await browser.url()).toBe(`${next.url}/base/another`)
+        return 'success'
+      }, 'success')
+    })
   }
 )