Separate viewport and metadata in rsc and cache (#73867)

vercel · Dec 16, 2024 · 73cfb96 · 73cfb96
1 parent 2a791d1
commit 73cfb96
Show file tree

Hide file tree

Showing 27 changed files with 306 additions and 204 deletions.
diff --git a/packages/next/src/client/components/app-router.tsx b/packages/next/src/client/components/app-router.tsx
@@ -145,7 +145,7 @@ export function createEmptyCacheNode(): CacheNode {
     lazyData: null,
     rsc: null,
     prefetchRsc: null,
-    head: null,
+    head: [null, null],
     prefetchHead: null,
     parallelRoutes: new Map(),
     loading: null,

diff --git a/packages/next/src/client/components/layout-router.tsx b/packages/next/src/client/components/layout-router.tsx
@@ -549,7 +549,7 @@ export default function OuterLayoutRouter({
       lazyData: null,
       rsc: null,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       parallelRoutes: new Map(),
       loading: null,

diff --git a/packages/next/src/client/components/router-reducer/aliased-prefetch-navigations.ts b/packages/next/src/client/components/router-reducer/aliased-prefetch-navigations.ts
@@ -172,7 +172,7 @@ function fillNewTreeWithOnlyLoadingSegments(
         // copy the layout but null the page segment as that's not meant to be used
         rsc: segmentForParallelRoute.includes(PAGE_SEGMENT_KEY) ? null : rsc,
         prefetchRsc: null,
-        head: null,
+        head: [null, null],
         prefetchHead: null,
         parallelRoutes: new Map(),
         loading,
@@ -184,7 +184,7 @@ function fillNewTreeWithOnlyLoadingSegments(
         lazyData: null,
         rsc: null,
         prefetchRsc: null,
-        head: null,
+        head: [null, null],
         prefetchHead: null,
         parallelRoutes: new Map(),
         loading: null,

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
@@ -16,7 +16,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
       lazyData: null,
       rsc: null,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       parallelRoutes: new Map(),
       loading: null,
@@ -25,7 +25,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
       lazyData: null,
       rsc: <>Root layout</>,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       loading: null,
       parallelRoutes: new Map([
@@ -38,7 +38,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
                 lazyData: null,
                 rsc: <>Linking</>,
                 prefetchRsc: null,
-                head: null,
+                head: [null, null],
                 prefetchHead: null,
                 loading: null,
                 parallelRoutes: new Map([
@@ -51,7 +51,7 @@ describe('clearCacheNodeDataForSegmentPath', () => {
                           lazyData: null,
                           rsc: <>Page</>,
                           prefetchRsc: null,
-                          head: null,
+                          head: [null, null],
                           prefetchHead: null,
                           parallelRoutes: new Map(),
                           loading: null,
@@ -70,52 +70,64 @@ describe('clearCacheNodeDataForSegmentPath', () => {
     clearCacheNodeDataForSegmentPath(cache, existingCache, flightSegmentPath)
 
     expect(cache).toMatchInlineSnapshot(`
-      {
-        "head": null,
-        "lazyData": null,
-        "loading": null,
-        "parallelRoutes": Map {
-          "children" => Map {
-            "linking" => {
-              "head": null,
-              "lazyData": null,
-              "loading": null,
-              "parallelRoutes": Map {
-                "children" => Map {
-                  "" => {
-                    "head": null,
-                    "lazyData": null,
-                    "loading": null,
-                    "parallelRoutes": Map {},
-                    "prefetchHead": null,
-                    "prefetchRsc": null,
-                    "rsc": <React.Fragment>
-                      Page
-                    </React.Fragment>,
-                  },
-                },
-              },
-              "prefetchHead": null,
-              "prefetchRsc": null,
-              "rsc": <React.Fragment>
-                Linking
-              </React.Fragment>,
-            },
-            "dashboard" => {
-              "head": null,
-              "lazyData": null,
-              "loading": null,
-              "parallelRoutes": Map {},
-              "prefetchHead": null,
-              "prefetchRsc": null,
-              "rsc": null,
-            },
-          },
-        },
-        "prefetchHead": null,
-        "prefetchRsc": null,
-        "rsc": null,
-      }
+     {
+       "head": [
+         null,
+         null,
+       ],
+       "lazyData": null,
+       "loading": null,
+       "parallelRoutes": Map {
+         "children" => Map {
+           "linking" => {
+             "head": [
+               null,
+               null,
+             ],
+             "lazyData": null,
+             "loading": null,
+             "parallelRoutes": Map {
+               "children" => Map {
+                 "" => {
+                   "head": [
+                     null,
+                     null,
+                   ],
+                   "lazyData": null,
+                   "loading": null,
+                   "parallelRoutes": Map {},
+                   "prefetchHead": null,
+                   "prefetchRsc": null,
+                   "rsc": <React.Fragment>
+                     Page
+                   </React.Fragment>,
+                 },
+               },
+             },
+             "prefetchHead": null,
+             "prefetchRsc": null,
+             "rsc": <React.Fragment>
+               Linking
+             </React.Fragment>,
+           },
+           "dashboard" => {
+             "head": [
+               null,
+               null,
+             ],
+             "lazyData": null,
+             "loading": null,
+             "parallelRoutes": Map {},
+             "prefetchHead": null,
+             "prefetchRsc": null,
+             "rsc": null,
+           },
+         },
+       },
+       "prefetchHead": null,
+       "prefetchRsc": null,
+       "rsc": 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,7 +40,7 @@ export function clearCacheNodeDataForSegmentPath(
         lazyData: null,
         rsc: null,
         prefetchRsc: null,
-        head: null,
+        head: [null, null],
         prefetchHead: null,
         parallelRoutes: new Map(),
         loading: null,
@@ -56,7 +56,7 @@ export function clearCacheNodeDataForSegmentPath(
         lazyData: null,
         rsc: null,
         prefetchRsc: null,
-        head: null,
+        head: [null, null],
         prefetchHead: null,
         parallelRoutes: new Map(),
         loading: null,

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
@@ -59,7 +59,7 @@ describe('createInitialRouterState', () => {
       lazyData: null,
       rsc: children,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       loading: null,
       parallelRoutes: new Map([
@@ -81,7 +81,7 @@ describe('createInitialRouterState', () => {
                           prefetchRsc: null,
                           parallelRoutes: new Map(),
                           loading: null,
-                          head: <title>Test</title>,
+                          head: [null, <title>Test</title>],
                           prefetchHead: null,
                         },
                       ],
@@ -91,7 +91,7 @@ describe('createInitialRouterState', () => {
                 lazyData: null,
                 rsc: null,
                 prefetchRsc: null,
-                head: null,
+                head: [null, null],
                 prefetchHead: null,
                 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
@@ -48,7 +48,7 @@ export function createInitialRouterState({
     lazyData: null,
     rsc,
     prefetchRsc: null,
-    head: null,
+    head: [null, null],
     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,
@@ -74,7 +74,8 @@ export function createInitialRouterState({
       undefined,
       initialTree,
       initialSeedData,
-      initialHead
+      initialHead,
+      undefined
     )
   }
 

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
@@ -1,4 +1,3 @@
-import React from 'react'
 import { fillCacheWithNewSubTreeData } from './fill-cache-with-new-subtree-data'
 import type { CacheNode } from '../../../shared/lib/app-router-context.shared-runtime'
 import type { NormalizedFlightData } from '../../flight-data-helpers'
@@ -11,7 +10,7 @@ const getFlightData = (): NormalizedFlightData[] => {
       segment: 'about',
       tree: ['about', { children: ['', {}] }],
       seedData: ['about', <h1>SubTreeData Injected!</h1>, {}, null, false],
-      head: '<title>Head Injected!</title>',
+      head: [null, '<title>Head Injected!</title>'],
       isHeadPartial: false,
       isRootRender: false,
     },
@@ -24,7 +23,7 @@ describe('fillCacheWithNewSubtreeData', () => {
       lazyData: null,
       rsc: null,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       loading: null,
       parallelRoutes: new Map(),
@@ -33,7 +32,7 @@ describe('fillCacheWithNewSubtreeData', () => {
       lazyData: null,
       rsc: <>Root layout</>,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       loading: null,
       parallelRoutes: new Map([
@@ -46,7 +45,7 @@ describe('fillCacheWithNewSubtreeData', () => {
                 lazyData: null,
                 rsc: <>Linking</>,
                 prefetchRsc: null,
-                head: null,
+                head: [null, null],
                 prefetchHead: null,
                 loading: null,
                 parallelRoutes: new Map([
@@ -59,7 +58,7 @@ describe('fillCacheWithNewSubtreeData', () => {
                           lazyData: null,
                           rsc: <>Page</>,
                           prefetchRsc: null,
-                          head: null,
+                          head: [null, null],
                           prefetchHead: null,
                           loading: null,
                           parallelRoutes: new Map(),
@@ -90,7 +89,7 @@ describe('fillCacheWithNewSubtreeData', () => {
       lazyData: null,
       rsc: null,
       prefetchRsc: null,
-      head: null,
+      head: [null, null],
       prefetchHead: null,
       loading: null,
       parallelRoutes: new Map([
@@ -103,7 +102,7 @@ describe('fillCacheWithNewSubtreeData', () => {
                 lazyData: null,
                 rsc: <>Linking</>,
                 prefetchRsc: null,
-                head: null,
+                head: [null, null],
                 prefetchHead: null,
                 loading: null,
                 parallelRoutes: new Map([
@@ -117,7 +116,7 @@ describe('fillCacheWithNewSubtreeData', () => {
                           lazyData: null,
                           rsc: <>Page</>,
                           prefetchRsc: null,
-                          head: null,
+                          head: [null, null],
                           prefetchHead: null,
                           loading: null,
                           parallelRoutes: new Map(),
@@ -127,7 +126,7 @@ describe('fillCacheWithNewSubtreeData', () => {
                         'about',
                         {
                           lazyData: null,
-                          head: null,
+                          head: [null, null],
                           prefetchHead: null,
                           loading: null,
                           parallelRoutes: new Map([
@@ -143,11 +142,12 @@ describe('fillCacheWithNewSubtreeData', () => {
                                     parallelRoutes: new Map(),
                                     prefetchHead: null,
                                     loading: null,
-                                    head: (
+                                    head: [
+                                      null,
                                       <>
                                         <title>Head Injected!</title>
-                                      </>
-                                    ),
+                                      </>,
+                                    ],
                                   },
                                 ],
                               ]),

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
@@ -71,7 +71,7 @@ function fillCacheHelper(
           rsc:
             fillLazyItems || incomingSegment !== PAGE_SEGMENT_KEY ? rsc : null,
           prefetchRsc: null,
-          head: null,
+          head: [null, null],
           prefetchHead: null,
           loading,
           parallelRoutes: