-
Notifications
You must be signed in to change notification settings - Fork 26.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix action revalidation within a parallel slot
- Loading branch information
Showing
21 changed files
with
345 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
test/e2e/app-dir/parallel-routes-revalidation/app/@dialog/default.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export default function Default() { | ||
return null | ||
} |
3 changes: 3 additions & 0 deletions
3
test/e2e/app-dir/parallel-routes-revalidation/app/@dialog/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export default function Page() { | ||
return null | ||
} |
21 changes: 21 additions & 0 deletions
21
test/e2e/app-dir/parallel-routes-revalidation/app/@dialog/refresh-modal/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
'use client' | ||
import Link from 'next/link' | ||
import { useRouter } from 'next/navigation' | ||
import React from 'react' | ||
|
||
export default function Page() { | ||
const router = useRouter() | ||
|
||
return ( | ||
<dialog open> | ||
<h1>Modal</h1> | ||
|
||
<br /> | ||
|
||
<button onClick={() => router.refresh()} id="refresh-router"> | ||
Refresh Router | ||
</button> | ||
<Link href="/">Close</Link> | ||
</dialog> | ||
) | ||
} |
30 changes: 30 additions & 0 deletions
30
test/e2e/app-dir/parallel-routes-revalidation/app/@dialog/revalidate-modal/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import Link from 'next/link' | ||
|
||
import { revalidatePath } from 'next/cache' | ||
import { addData } from '../../actions' | ||
|
||
export default function Page() { | ||
async function createItem() { | ||
'use server' | ||
|
||
await addData(new Date().toISOString()) | ||
|
||
revalidatePath('/', 'layout') | ||
} | ||
|
||
return ( | ||
<dialog open> | ||
<h1>Modal</h1> | ||
|
||
<br /> | ||
|
||
<form action={createItem}> | ||
<button type="submit" className="button" id="create-entry"> | ||
Create New Item | ||
</button> | ||
</form> | ||
|
||
<Link href="/">Close</Link> | ||
</dialog> | ||
) | ||
} |
14 changes: 14 additions & 0 deletions
14
test/e2e/app-dir/parallel-routes-revalidation/app/@interception/(.)redirect-modal/page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import { RedirectForm } from '../../components/RedirectForm' | ||
import { redirectAction } from '../../actions' | ||
|
||
export default function Page() { | ||
return ( | ||
<dialog open> | ||
<h1>Modal</h1> | ||
|
||
<br /> | ||
|
||
<RedirectForm action={redirectAction} /> | ||
</dialog> | ||
) | ||
} |
3 changes: 3 additions & 0 deletions
3
test/e2e/app-dir/parallel-routes-revalidation/app/@interception/default.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export default function Default() { | ||
return null | ||
} |
23 changes: 23 additions & 0 deletions
23
test/e2e/app-dir/parallel-routes-revalidation/app/actions.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
'use server' | ||
import { redirect } from 'next/navigation' | ||
|
||
const data = [] | ||
|
||
export async function addData(newData: string) { | ||
// sleep 1s | ||
await new Promise((resolve) => setTimeout(resolve, 1000)) | ||
data.push(newData) | ||
} | ||
|
||
export async function getData() { | ||
// sleep 1s | ||
await new Promise((resolve) => setTimeout(resolve, 1000)) | ||
return data | ||
} | ||
|
||
export async function redirectAction() { | ||
'use server' | ||
console.log('redirecting...') | ||
await new Promise((res) => setTimeout(res, 1000)) | ||
redirect('/') | ||
} |
11 changes: 11 additions & 0 deletions
11
test/e2e/app-dir/parallel-routes-revalidation/app/components/RedirectForm.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
'use client' | ||
|
||
export function RedirectForm({ action }: { action: () => Promise<void> }) { | ||
return ( | ||
<form action={action}> | ||
<button type="submit" className="button" id="redirect"> | ||
Redirect to Home | ||
</button> | ||
</form> | ||
) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
export { default } from './page' |
21 changes: 21 additions & 0 deletions
21
test/e2e/app-dir/parallel-routes-revalidation/app/layout.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
import React from 'react' | ||
|
||
export default function Root({ | ||
children, | ||
dialog, | ||
interception, | ||
}: { | ||
children: React.ReactNode | ||
dialog: React.ReactNode | ||
interception: React.ReactNode | ||
}) { | ||
return ( | ||
<html> | ||
<body> | ||
{children} | ||
{dialog} | ||
{interception} | ||
</body> | ||
</html> | ||
) | ||
} |
Oops, something went wrong.