diff --git a/packages/next/src/client/components/layout-router.tsx b/packages/next/src/client/components/layout-router.tsx index 920b262ed053..fb57a0dbe308 100644 --- a/packages/next/src/client/components/layout-router.tsx +++ b/packages/next/src/client/components/layout-router.tsx @@ -453,7 +453,7 @@ export default function OuterLayoutRouter({ notFound, notFoundStyles, asNotFound, - assets, + styles, }: { parallelRouterKey: string segmentPath: FlightSegmentPath @@ -468,7 +468,7 @@ export default function OuterLayoutRouter({ notFound: React.ReactNode | undefined notFoundStyles: React.ReactNode | undefined asNotFound?: boolean - assets?: React.ReactNode + styles?: React.ReactNode }) { const context = useContext(LayoutRouterContext) if (!context) { @@ -503,7 +503,7 @@ export default function OuterLayoutRouter({ return ( <> - {assets} + {styles} {preservedSegments.map((preservedSegment) => { const isChildPropSegment = matchSegment( preservedSegment, diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx index 7634fe61fa62..c3e4dcea868d 100644 --- a/packages/next/src/server/app-render/app-render.tsx +++ b/packages/next/src/server/app-render/app-render.tsx @@ -605,7 +605,7 @@ export async function renderToHTMLOrFlight( asNotFound?: boolean }): Promise<{ Component: React.ComponentType - assets: React.ReactNode + styles: React.ReactNode }> => { const { page, layoutOrPagePath, segment, components, parallelRoutes } = parseLoaderTree(tree) @@ -854,7 +854,7 @@ export async function renderToHTMLOrFlight( } // Create the child component - const { Component: ChildComponent, assets: childAssets } = + const { Component: ChildComponent, styles: childStyles } = await createComponentTree({ createSegmentPath: (child) => { return createSegmentPath([...currentSegmentPath, ...child]) @@ -902,7 +902,7 @@ export async function renderToHTMLOrFlight( notFoundStyles={notFoundStyles} asNotFound={asNotFound} childProp={childProp} - assets={childAssets} + styles={childStyles} />, ] } @@ -922,7 +922,7 @@ export async function renderToHTMLOrFlight( if (!Component) { return { Component: () => <>{parallelRouteComponents.children}, - assets: styles, + styles, } } @@ -986,7 +986,7 @@ export async function renderToHTMLOrFlight( ) }, - assets: styles, + styles, } } @@ -1320,7 +1320,7 @@ export async function renderToHTMLOrFlight( const injectedCSS = new Set() const injectedFontPreloadTags = new Set() - const { Component: ComponentTree, assets } = await createComponentTree({ + const { Component: ComponentTree, styles } = await createComponentTree({ createSegmentPath: (child) => child, loaderTree, parentParams: {}, @@ -1356,7 +1356,7 @@ export async function renderToHTMLOrFlight( return ( <> - {assets} + {styles} - {assets} - - {notFoundStyles} - - - + + {notFoundStyles} + + ) : undefined } asNotFound={props.asNotFound}