Skip to content

Commit

Permalink
revert outlet change
Browse files Browse the repository at this point in the history
  • Loading branch information
ztanner committed Mar 1, 2025
1 parent 7364e6e commit aae30db
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/next/src/server/app-render/app-render.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,6 @@ async function generateDynamicRSCPayload(
{/* Adding requestId as react key to make metadata remount for each render */}
<ViewportTree key={requestId} />
{StreamingMetadata ? <StreamingMetadata /> : null}
{StreamingMetadataOutlet ? <StreamingMetadataOutlet /> : null}
<StaticMetadata />
</React.Fragment>
),
Expand All @@ -534,6 +533,7 @@ async function generateDynamicRSCPayload(
getViewportReady,
getMetadataReady,
preloadCallbacks,
StreamingMetadataOutlet,
})
).map((path) => path.slice(1)) // remove the '' (root) segment
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export function createComponentTree(props: {
preloadCallbacks: PreloadCallbacks
authInterrupts: boolean
StreamingMetadata: React.ComponentType<{}> | null
StreamingMetadataOutlet: React.ComponentType | null
StreamingMetadataOutlet: React.ComponentType
}): Promise<CacheNodeSeedData> {
return getTracer().trace(
NextNodeServerSpan.createComponentTree,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export async function walkTreeWithFlightRouterState({
getMetadataReady,
ctx,
preloadCallbacks,
StreamingMetadataOutlet,
}: {
loaderTreeToFilter: LoaderTree
parentParams: { [key: string]: string | string[] }
Expand All @@ -54,6 +55,7 @@ export async function walkTreeWithFlightRouterState({
getViewportReady: () => Promise<void>
ctx: AppRenderContext
preloadCallbacks: PreloadCallbacks
StreamingMetadataOutlet: React.ComponentType
}): Promise<FlightDataPath[]> {
const {
renderOpts: { nextFontManifest, experimental },
Expand Down Expand Up @@ -203,7 +205,7 @@ export async function walkTreeWithFlightRouterState({
preloadCallbacks,
authInterrupts: experimental.authInterrupts,
StreamingMetadata: null,
StreamingMetadataOutlet: null,
StreamingMetadataOutlet,
}
)

Expand Down Expand Up @@ -263,6 +265,7 @@ export async function walkTreeWithFlightRouterState({
getViewportReady,
getMetadataReady,
preloadCallbacks,
StreamingMetadataOutlet,
})

for (const subPath of subPaths) {
Expand Down

0 comments on commit aae30db

Please sign in to comment.