fix root page revalidation when redirecting in a server action

Author: ztanner

packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts

@@ -225,7 +225,9 @@ export function serverActionReducer(
           [''],
           currentTree,
           treePatch,
-          href
+          redirectLocation
+            ? createHrefFromUrl(redirectLocation)
+            : state.canonicalUrl
         )
 
         if (newTree === null) {

test/e2e/app-dir/parallel-routes-revalidation/app/actions.ts

@@ -1,7 +1,8 @@
 'use server'
+import { revalidatePath } from 'next/cache'
 import { redirect } from 'next/navigation'
 
-const data = []
+let data = []
 
 export async function addData(newData: string) {
   // sleep 1s
@@ -21,3 +22,8 @@ export async function redirectAction() {
   await new Promise((res) => setTimeout(res, 1000))
   redirect('/')
 }
+
+export async function clearData() {
+  data = []
+  revalidatePath('/')
+}

test/e2e/app-dir/parallel-routes-revalidation/app/page.tsx

@@ -1,5 +1,5 @@
 import Link from 'next/link'
-import { getData } from './actions'
+import { clearData, getData } from './actions'
 
 export default async function Home() {
   const data = await getData()
@@ -14,6 +14,9 @@ export default async function Home() {
       <Link href="/redirect-modal">Open Redirect Modal</Link>
       <Link href="/detail-page">Intercepted Detail Page</Link>
       <div id="random-number">{randomNumber}</div>
+      <form action={clearData}>
+        <button id="clear-entries">Clear Entries</button>
+      </form>
       <div>
         <h1>Current Data</h1>
         <ul id="entries">

test/e2e/app-dir/parallel-routes-revalidation/app/redirect/page.tsx

@@ -0,0 +1,14 @@
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  return (
+    <form
+      action={async () => {
+        'use server'
+        redirect('/')
+      }}
+    >
+      <button type="submit">Redirect</button>
+    </form>
+  )
+}

test/e2e/app-dir/parallel-routes-revalidation/parallel-routes-revalidation.test.ts

@@ -191,6 +191,28 @@ createNextDescribe(
       )
     })
 
+    it('should refresh the correct page when a server action triggers a redirect', async () => {
+      const browser = await next.browser('/redirect')
+      await browser.elementByCss('button').click()
+
+      await browser.elementByCss("[href='/revalidate-modal']").click()
+
+      // clear any entries
+      await browser.elementById('clear-entries').click()
+
+      await retry(async () => {
+        // confirm there aren't any entries yet
+        expect((await browser.elementsByCss('#entries li')).length).toBe(0)
+      })
+
+      await browser.elementById('create-entry').click()
+
+      await retry(async () => {
+        // we created an entry and called revalidate, so we should have 1 entry
+        expect((await browser.elementsByCss('#entries li')).length).toBe(1)
+      })
+    })
+
     describe.each([
       { basePath: '/refreshing', label: 'regular', withSearchParams: false },
       { basePath: '/refreshing', label: 'regular', withSearchParams: true },