Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/spotty-hotels-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"next": patch
---

[Segment Cache] Fix: Ensure server references can be prerendered
7 changes: 5 additions & 2 deletions packages/next/src/server/app-render/app-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ import { makeGetServerInsertedHTML } from './make-get-server-inserted-html'
import { walkTreeWithFlightRouterState } from './walk-tree-with-flight-router-state'
import { createComponentTree, getRootParams } from './create-component-tree'
import { getAssetQueryString } from './get-asset-query-string'
import { setReferenceManifestsSingleton } from './encryption-utils'
import {
getServerModuleMap,
setReferenceManifestsSingleton,
} from './encryption-utils'
import {
DynamicState,
type PostponedState,
Expand Down Expand Up @@ -3872,7 +3875,7 @@ async function collectSegmentData(
moduleMap: isEdgeRuntime
? clientReferenceManifest.edgeRscModuleMapping
: clientReferenceManifest.rscModuleMapping,
serverModuleMap: null,
serverModuleMap: getServerModuleMap(),
}

const staleTime = prerenderStore.stale
Expand Down
6 changes: 0 additions & 6 deletions packages/next/src/server/app-render/collect-segment-data.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,7 @@ async function PrefetchTreeData({
buildId,
seedData,
fallbackRouteParams,
fullPageDataBuffer,
clientModules,
serverConsumerManifest,
ROOT_SEGMENT_KEY,
segmentTasks
)
Expand Down Expand Up @@ -229,9 +227,7 @@ function collectSegmentDataImpl(
buildId: string,
seedData: CacheNodeSeedData | null,
fallbackRouteParams: FallbackRouteParams | null,
fullPageDataBuffer: Buffer,
clientModules: ManifestNode,
serverConsumerManifest: any,
key: string,
segmentTasks: Array<Promise<[string, Buffer]>>
): TreePrefetch {
Expand Down Expand Up @@ -262,9 +258,7 @@ function collectSegmentDataImpl(
buildId,
childSeedData,
fallbackRouteParams,
fullPageDataBuffer,
clientModules,
serverConsumerManifest,
childKey,
segmentTasks
)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { LinkAccordion } from '../../components/link-accordion'

export default function FullyStaticStart() {
return (
<>
<p>
This is a regression test case to ensure that prerendered segments that
include server actions do not throw an error when navigating to them.
</p>
<ul>
<li>
<LinkAccordion href="/with-server-action/target-page">
Target
</LinkAccordion>
</li>
</ul>
</>
)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
'use server'

export async function action() {
console.log('Action!')
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { action } from './action'

export default function Target() {
return (
<form id="target-page" action={action}>
Target
</form>
)
}
34 changes: 34 additions & 0 deletions test/e2e/app-dir/segment-cache/basic/segment-cache-basic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,4 +306,38 @@ describe('segment cache (basic tests)', () => {
}, 'no-requests')
expect(await readRandomNumberFromPage()).toBe(randomNumber3)
})

it('does not throw an error when navigating to a page with a server action', async () => {
let act: ReturnType<typeof createRouterAct>
const browser = await next.browser('/with-server-action', {
beforePageLoad(page) {
act = createRouterAct(page)
},
})

// Reveal the link to trigger a prefetch.
const reveal = await browser.elementByCss('input[type="checkbox"]')
const link = await act(
async () => {
await reveal.click()
return await browser.elementByCss(
'a[href="/with-server-action/target-page"]'
)
},
{ includes: 'Target' }
)

await act(
async () => {
await link.click()

// The page should render immediately because it was prefetched, and it
// should not throw an error.
const form = await browser.elementById('target-page')
expect(await form.innerHTML()).toBe('Target')
},
// No additional requests were required, because everything was prefetched
'no-requests'
)
})
})
Loading