add layerAssets property to FlightDataPath

vercel · May 30, 2024 · a23a8f9 · a23a8f9
1 parent b4f3283
commit a23a8f9
Show file tree

Hide file tree

Showing 25 changed files with 149 additions and 42 deletions.
diff --git a/packages/next/src/client/components/app-router.tsx b/packages/next/src/client/components/app-router.tsx
@@ -134,6 +134,7 @@ type AppRouterProps = Omit<
 > & {
  buildId: string
  initialHead: ReactNode
+ initialLayerAssets: ReactNode
  assetPrefix: string
  missingSlots: Set<string>
 }
@@ -183,6 +184,7 @@ export function createEmptyCacheNode(): CacheNode {
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -290,6 +292,7 @@ function Head({
 function Router({
  buildId,
  initialHead,
+ initialLayerAssets,
  initialTree,
  initialCanonicalUrl,
  initialSeedData,
@@ -307,6 +310,7 @@ function Router({
  initialParallelRoutes,
  location: !isServer ? window.location : null,
  initialHead,
+ initialLayerAssets,
  couldBeIntercepted,
  }),
  [
@@ -315,6 +319,7 @@ function Router({
  initialCanonicalUrl,
  initialTree,
  initialHead,
+ initialLayerAssets,
  couldBeIntercepted,
  ]
  )
@@ -656,6 +661,7 @@ function Router({
  let content = (
  <RedirectBoundary>
  {head}
+ {/* {cache.layerAssets} */}
  {cache.rsc}
  <AppRouterAnnouncer tree={tree} />
  </RedirectBoundary>

diff --git a/packages/next/src/client/components/layout-router.tsx b/packages/next/src/client/components/layout-router.tsx
@@ -364,6 +364,7 @@ function InnerLayoutRouter({
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -466,6 +467,7 @@ function InnerLayoutRouter({
  loading: childNode.loading,
  }}
  >
+ {/* {childNode.layerAssets} */}
  {resolvedRsc}
  </LayoutRouterContext.Provider>
  )

diff --git a/packages/next/src/client/components/router-reducer/apply-flight-data.ts b/packages/next/src/client/components/router-reducer/apply-flight-data.ts
@@ -11,14 +11,15 @@ export function applyFlightData(
  prefetchEntry?: PrefetchCacheEntry
 ): boolean {
  // The one before last item is the router state tree patch
- const [treePatch, cacheNodeSeedData, head] = flightDataPath.slice(-3)
+ const [treePatch, cacheNodeSeedData, head, layerAssets] =
+ flightDataPath.slice(-4)
 
  // Handles case where prefetch only returns the router tree patch without rendered components.
  if (cacheNodeSeedData === null) {
  return false
  }
 
- if (flightDataPath.length === 3) {
+ if (flightDataPath.length === 4) {
  const rsc = cacheNodeSeedData[2]
  const loading = cacheNodeSeedData[3]
  cache.loading = loading
@@ -35,6 +36,7 @@ export function applyFlightData(
  treePatch,
  cacheNodeSeedData,
  head,
+ layerAssets,
  prefetchEntry
  )
  } else {

diff --git a/...next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.test.tsx b/...next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.test.tsx
@@ -17,6 +17,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -27,6 +28,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  rsc: <>Root layout</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -42,6 +44,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  prefetchRsc: null,
  lazyDataResolved: false,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  loading: null,
  parallelRoutes: new Map([
@@ -55,6 +58,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  rsc: <>Page</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -76,20 +80,23 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  expect(cache).toMatchInlineSnapshot(`
  {
  "head": null,
+ "layerAssets": null,
  "lazyData": null,
  "lazyDataResolved": false,
  "loading": null,
  "parallelRoutes": Map {
  "children" => Map {
  "linking" => {
  "head": null,
+ "layerAssets": null,
  "lazyData": null,
  "lazyDataResolved": false,
  "loading": null,
  "parallelRoutes": Map {
  "children" => Map {
  "" => {
  "head": null,
+ "layerAssets": null,
  "lazyData": null,
  "lazyDataResolved": false,
  "loading": null,
@@ -110,6 +117,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
  },
  "dashboard" => {
  "head": null,
+ "layerAssets": null,
  "lazyData": null,
  "lazyDataResolved": false,
  "loading": null,

diff --git a/packages/next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.ts b/packages/next/src/client/components/router-reducer/clear-cache-node-data-for-segment-path.ts
@@ -40,6 +40,7 @@ export function clearCacheNodeDataForSegmentPath(
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -57,6 +58,7 @@ export function clearCacheNodeDataForSegmentPath(
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  parallelRoutes: new Map(),
  lazyDataResolved: false,
@@ -72,6 +74,7 @@ export function clearCacheNodeDataForSegmentPath(
  rsc: childCacheNode.rsc,
  prefetchRsc: childCacheNode.prefetchRsc,
  head: childCacheNode.head,
+ layerAssets: childCacheNode.layerAssets,
  prefetchHead: childCacheNode.prefetchHead,
  parallelRoutes: new Map(childCacheNode.parallelRoutes),
  lazyDataResolved: childCacheNode.lazyDataResolved,

diff --git a/packages/next/src/client/components/router-reducer/create-initial-router-state.test.tsx b/packages/next/src/client/components/router-reducer/create-initial-router-state.test.tsx
@@ -41,6 +41,7 @@ describe('createInitialRouterState', () => {
  initialParallelRoutes,
  location: new URL('/linking', 'https://localhost') as any,
  initialHead: <title>Test</title>,
+ initialLayerAssets: null,
  couldBeIntercepted: false,
  })
 
@@ -52,13 +53,15 @@ describe('createInitialRouterState', () => {
  initialParallelRoutes,
  location: new URL('/linking', 'https://localhost') as any,
  initialHead: <title>Test</title>,
+ initialLayerAssets: null,
  })
 
  const expectedCache: CacheNode = {
  lazyData: null,
  rsc: children,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -82,6 +85,7 @@ describe('createInitialRouterState', () => {
  parallelRoutes: new Map(),
  loading: null,
  head: <title>Test</title>,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  },
@@ -93,6 +97,7 @@ describe('createInitialRouterState', () => {
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,

diff --git a/packages/next/src/client/components/router-reducer/create-initial-router-state.ts b/packages/next/src/client/components/router-reducer/create-initial-router-state.ts
@@ -21,6 +21,7 @@ export interface InitialRouterStateParameters {
  initialParallelRoutes: CacheNode['parallelRoutes']
  location: Location | null
  initialHead: ReactNode
+ initialLayerAssets: ReactNode
  couldBeIntercepted?: boolean
 }
 
@@ -32,6 +33,7 @@ export function createInitialRouterState({
  initialParallelRoutes,
  location,
  initialHead,
+ initialLayerAssets,
  couldBeIntercepted,
 }: InitialRouterStateParameters) {
  const isServer = !location
@@ -42,6 +44,7 @@ export function createInitialRouterState({
  rsc: rsc,
  prefetchRsc: null,
  head: null,
+ layerAssets: initialLayerAssets,
  prefetchHead: null,
  // The cache gets seeded during the first render. `initialParallelRoutes` ensures the cache from the first render is there during the second render.
  parallelRoutes: isServer ? new Map() : initialParallelRoutes,
@@ -68,7 +71,8 @@ export function createInitialRouterState({
  undefined,
  initialTree,
  initialSeedData,
- initialHead
+ initialHead,
+ initialLayerAssets
  )
  }
 
@@ -106,7 +110,9 @@ export function createInitialRouterState({
  location.origin
  )
 
- const initialFlightData: FlightData = [['', initialTree, null, null]]
+ const initialFlightData: FlightData = [
+ ['', initialTree, null, null, initialLayerAssets],
+ ]
  createPrefetchCacheEntryForInitialLoad({
  url,
  kind: PrefetchKind.AUTO,

diff --git a/packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.test.tsx b/packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.test.tsx
@@ -31,6 +31,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  loading: null,
  parallelRoutes: new Map(),
@@ -41,6 +42,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: <>Root layout</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -55,6 +57,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: <>Linking</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -69,6 +72,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: <>Page</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -101,6 +105,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: null,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -115,6 +120,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: <>Linking</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -130,6 +136,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  rsc: <>Page</>,
  prefetchRsc: null,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  lazyDataResolved: false,
  loading: null,
@@ -142,6 +149,7 @@ describe('fillCacheWithNewSubtreeData', () => {
  lazyData: null,
  lazyDataResolved: false,
  head: null,
+ layerAssets: null,
  prefetchHead: null,
  loading: null,
  parallelRoutes: new Map([

diff --git a/packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.ts b/packages/next/src/client/components/router-reducer/fill-cache-with-new-subtree-data.ts
@@ -17,7 +17,7 @@ export function fillCacheWithNewSubTreeData(
  flightDataPath: FlightDataPath,
  prefetchEntry?: PrefetchCacheEntry
 ): void {
- const isLastEntry = flightDataPath.length <= 5
+ const isLastEntry = flightDataPath.length <= 6
  const [parallelRouteKey, segment] = flightDataPath
 
  const cacheKey = createRouterCacheKey(segment)
@@ -47,13 +47,15 @@ export function fillCacheWithNewSubTreeData(
  childCacheNode === existingChildCacheNode
  ) {
  const seedData: CacheNodeSeedData = flightDataPath[3]
+ const layerAssets = flightDataPath[5]
  const rsc = seedData[2]
  const loading = seedData[3]
  childCacheNode = {
  lazyData: null,
  rsc,
  prefetchRsc: null,
  head: null,
+ layerAssets,
  prefetchHead: null,
  loading,
  // Ensure segments other than the one we got data for are preserved.
@@ -77,6 +79,7 @@ export function fillCacheWithNewSubTreeData(
  flightDataPath[2],
  seedData,
  flightDataPath[4],
+ flightDataPath[5],
  prefetchEntry
  )
 
@@ -97,6 +100,7 @@ export function fillCacheWithNewSubTreeData(
  rsc: childCacheNode.rsc,
  prefetchRsc: childCacheNode.prefetchRsc,
  head: childCacheNode.head,
+ layerAssets: childCacheNode.layerAssets,
  prefetchHead: childCacheNode.prefetchHead,
  parallelRoutes: new Map(childCacheNode.parallelRoutes),
  lazyDataResolved: false,