8000 remove requestId prop from initial RSC payload · vercel/next.js@be68bbf · GitHub
[go: up one dir, main page]

Skip to content 8000

Commit be68bbf

Browse files
committed
remove requestId prop from initial RSC payload
1 parent 4a8fc74 commit be68bbf

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,6 @@ async function generateDynamicRSCPayload(
518518
/>
519519
{/* Adding requestId as react key to make metadata remount for each render */}
520520
<ViewportTree key={getFlightViewportKey(requestId)} />
521-
{/* Not add requestId as react key to ensure segment prefetch could result consistently if nothing changed */}
522521
<MetadataTree key={getFlightMetadataKey(requestId)} />
523522
</React.Fragment>
524523
),
@@ -857,8 +856,7 @@ async function getRSCPayload(
857856
statusCode={ctx.res.statusCode}
858857
isPossibleServerAction={ctx.isPossibleServerAction}
859858
/>
860-
<ViewportTree key={getFlightViewportKey(ctx.requestId)} />
861-
{/* Not add requestId as react key to ensure segment prefetch could result consistently if nothing changed */}
859+
<ViewportTree />
862860
<MetadataTree />
863861
</React.Fragment>
864862
)
@@ -926,7 +924,6 @@ async function getErrorRSCPayload(
926924
ViewportBoundary,
927925
},
928926
url,
929-
requestId,
930927
workStore,
931928
} = ctx
932929

@@ -945,22 +942,18 @@ async function getErrorRSCPayload(
945942
serveStreamingMetadata: serveStreamingMetadata,
946943
})
947944

948-
// {/* Adding requestId as react key to make metadata remount for each render */}
949-
const metadata = <MetadataTree key={getFlightMetadataKey(requestId)} />
950-
951945
const initialHead = (
952946
<React.Fragment key={flightDataPathHeadKey}>
953947
<NonIndex
954948
pagePath={ctx.pagePath}
955949
statusCode={ctx.res.statusCode}
956950
isPossibleServerAction={ctx.isPossibleServerAction}
957951
/>
958-
{/* Adding requestId as react key to make metadata remount for each render */}
959-
<ViewportTree key={getFlightViewportKey(requestId)} />
952+
<ViewportTree />
960953
{process.env.NODE_ENV === 'development' && (
961954
<meta name="next-error" content="not-found" />
962955
)}
963-
{metadata}
956+
<MetadataTree />
964957
</React.Fragment>
965958
)
966959

@@ -980,7 +973,9 @@ async function getErrorRSCPayload(
980973
const seedData: CacheNodeSeedData = [
981974
initialTree[0],
982975
<html id="__next_error__">
983-
<head>{metadata}</head>
976+
<head>
977+
<MetadataTree />
978+
</head>
984979
<body>
985980
{process.env.NODE_ENV !== 'production' && err ? (
986981
<template

0 commit comments

Comments
 (0)
0