Skip to content

Commit 1292fda

Browse files
committed
patch resolveServerReference in server build (to fix ReactFlightReplyServer)
1 parent cfce188 commit 1292fda

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

packages/next/taskfile.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1813,12 +1813,11 @@ export async function copy_vendor_react(task_) {
18131813
// Workaround: patch support for async modules into `resolveServerReference`
18141814
// Needed until the React TODO is resolved:
18151815
// https://github.com/facebook/react/blob/5e0c951b58a98feed034e2bb92f25ae6d0616855/packages/react-server-dom-turbopack/src/client/ReactFlightClientConfigBundlerTurbopack.js#L135-L137
1816-
if (file.base.startsWith('react-server-dom-turbopack-client')) {
1817-
source = source.replace(
1818-
`return [resolvedModuleData.id, resolvedModuleData.chunks, name];`,
1819-
`return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];`
1820-
)
1821-
}
1816+
// Note that we're patching this in server code as well, because `ReactFlightReplyServer` also resolves server references.
1817+
source = source.replace(
1818+
`return [resolvedModuleData.id, resolvedModuleData.chunks, name];`,
1819+
`return resolvedModuleData.async ? [resolvedModuleData.id, resolvedModuleData.chunks, name, 1] : [resolvedModuleData.id, resolvedModuleData.chunks, name];`
1820+
)
18221821

18231822
// We replace the module loading code with our own implementation in Next.js.
18241823
// NOTE: We only replace module loading for server builds because the server

0 commit comments

Comments
 (0)