Convert secondary fetchServerResponse params into options object (#67526)

This is in preparation for adding another option in #67527.

Author: unstubbable

packages/next/src/client/components/layout-router.tsx

@@ -406,9 +406,11 @@ function InnerLayoutRouter({
       const includeNextUrl = hasInterceptionRouteInCurrentTree(fullTree)
       childNode.lazyData = lazyData = fetchServerResponse(
         new URL(url, location.origin),
-        refetchTree,
-        includeNextUrl ? context.nextUrl : null,
-        buildId
+        {
+          flightRouterState: refetchTree,
+          nextUrl: includeNextUrl ? context.nextUrl : null,
+          buildId,
+        }
       ).then((serverResponse) => {
         startTransition(() => {
           changeByServerResponse({

packages/next/src/client/components/router-reducer/fetch-server-response.ts

@@ -29,6 +29,13 @@ import { callServer } from '../../app-call-server'
 import { PrefetchKind } from './router-reducer-types'
 import { hexHash } from '../../../shared/lib/hash'
 
+export interface FetchServerResponseOptions {
+  readonly flightRouterState: FlightRouterState
+  readonly nextUrl: string | null
+  readonly buildId: string
+  readonly prefetchKind?: PrefetchKind
+}
+
 export type FetchServerResponseResult = [
   flightData: FlightData,
   canonicalUrlOverride: URL | undefined,
@@ -58,15 +65,15 @@ function doMpaNavigation(url: string): FetchServerResponseResult {
 }
 
 /**
- * Fetch the flight data for the provided url. Takes in the current router state to decide what to render server-side.
+ * Fetch the flight data for the provided url. Takes in the current router state
+ * to decide what to render server-side.
  */
 export async function fetchServerResponse(
   url: URL,
-  flightRouterState: FlightRouterState,
-  nextUrl: string | null,
-  currentBuildId: string,
-  prefetchKind?: PrefetchKind
+  options: FetchServerResponseOptions
 ): Promise<FetchServerResponseResult> {
+  const { flightRouterState, nextUrl, buildId, prefetchKind } = options
+
   const headers: {
     [RSC_HEADER]: '1'
     [NEXT_ROUTER_STATE_TREE_HEADER]: string
@@ -169,14 +176,10 @@ export async function fetchServerResponse(
     }
 
     // Handle the `fetch` readable stream that can be unwrapped by `React.use`.
-    const [buildId, flightData]: NextFlightResponse = await createFromFetch(
-      Promise.resolve(res),
-      {
-        callServer,
-      }
-    )
+    const [buildIdFromResponse, flightData]: NextFlightResponse =
+      await createFromFetch(Promise.resolve(res), { callServer })
 
-    if (currentBuildId !== buildId) {
+    if (buildId !== buildIdFromResponse) {
       return doMpaNavigation(res.url)
     }
 

packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts

@@ -195,19 +195,22 @@ function createLazyPrefetchEntry({
   // initiates the fetch request for the prefetch and attaches a listener
   // to the promise to update the prefetch cache entry when the promise resolves (if necessary)
   const data = prefetchQueue.enqueue(() =>
-    fetchServerResponse(url, tree, nextUrl, buildId, kind).then(
-      (prefetchResponse) => {
-        // TODO: `fetchServerResponse` should be more tighly coupled to these prefetch cache operations
-        // to avoid drift between this cache key prefixing logic
-        // (which is currently directly influenced by the server response)
-        const [, , , intercepted] = prefetchResponse
-        if (intercepted) {
-          prefixExistingPrefetchCacheEntry({ url, nextUrl, prefetchCache })
-        }
-
-        return prefetchResponse
+    fetchServerResponse(url, {
+      flightRouterState: tree,
+      nextUrl,
+      buildId,
+      prefetchKind: kind,
+    }).then((prefetchResponse) => {
+      // TODO: `fetchServerResponse` should be more tighly coupled to these prefetch cache operations
+      // to avoid drift between this cache key prefixing logic
+      // (which is currently directly influenced by the server response)
+      const [, , , intercepted] = prefetchResponse
+      if (intercepted) {
+        prefixExistingPrefetchCacheEntry({ url, nextUrl, prefetchCache })
       }
-    )
+
+      return prefetchResponse
+    })
   )
 
   const prefetchEntry = {

packages/next/src/client/components/router-reducer/reducers/fast-refresh-reducer.ts

@@ -34,12 +34,11 @@ function fastRefreshReducerImpl(
 
   // TODO-APP: verify that `href` is not an external url.
   // Fetch data from the root of the tree.
-  cache.lazyData = fetchServerResponse(
-    new URL(href, origin),
-    [state.tree[0], state.tree[1], state.tree[2], 'refetch'],
-    includeNextUrl ? state.nextUrl : null,
-    state.buildId
-  )
+  cache.lazyData = fetchServerResponse(new URL(href, origin), {
+    flightRouterState: [state.tree[0], state.tree[1], state.tree[2], 'refetch'],
+    nextUrl: includeNextUrl ? state.nextUrl : null,
+    buildId: state.buildId,
+  })
 
   return cache.lazyData.then(
     ([flightData, canonicalUrlOverride]) => {

packages/next/src/client/components/router-reducer/reducers/navigate-reducer.ts

@@ -452,12 +452,11 @@ function navigateReducer_PPR(
                 // to the lazy fetching mechanism in that case.)
                 listenForDynamicRequest(
                   task,
-                  fetchServerResponse(
-                    url,
-                    currentTree,
-                    state.nextUrl,
-                    state.buildId
-                  )
+                  fetchServerResponse(url, {
+                    flightRouterState: currentTree,
+                    nextUrl: state.nextUrl,
+                    buildId: state.buildId,
+                  })
                 )
 
                 mutable.cache = newCache

packages/next/src/client/components/router-reducer/reducers/refresh-reducer.ts

@@ -37,12 +37,16 @@ export function refreshReducer(
 
   // TODO-APP: verify that `href` is not an external url.
   // Fetch data from the root of the tree.
-  cache.lazyData = fetchServerResponse(
-    new URL(href, origin),
-    [currentTree[0], currentTree[1], currentTree[2], 'refetch'],
-    includeNextUrl ? state.nextUrl : null,
-    state.buildId
-  )
+  cache.lazyData = fetchServerResponse(new URL(href, origin), {
+    flightRouterState: [
+      currentTree[0],
+      currentTree[1],
+      currentTree[2],
+      'refetch',
+    ],
+    nextUrl: includeNextUrl ? state.nextUrl : null,
+    buildId: state.buildId,
+  })
 
   return cache.lazyData.then(
     async ([flightData, canonicalUrlOverride]) => {

packages/next/src/client/components/router-reducer/refetch-inactive-parallel-segments.ts

@@ -64,11 +64,13 @@ async function refreshInactiveParallelSegmentsImpl({
     // independently on their own cache nodes, and `applyFlightData` will copy anything it doesn't care about from the existing cache.
     const fetchPromise = fetchServerResponse(
       new URL(refetchPath, location.origin),
-      // refetch from the root of the updated tree, otherwise it will be scoped to the current segment
-      // and might not contain the data we need to patch in interception route data (such as dynamic params from a previous segment)
-      [rootTree[0], rootTree[1], rootTree[2], 'refetch'],
-      includeNextUrl ? state.nextUrl : null,
-      state.buildId
+      {
+        // refetch from the root of the updated tree, otherwise it will be scoped to the current segment
+        // and might not contain the data we need to patch in interception route data (such as dynamic params from a previous segment)
+        flightRouterState: [rootTree[0], rootTree[1], rootTree[2], 'refetch'],
+        nextUrl: includeNextUrl ? state.nextUrl : null,
+        buildId: state.buildId,
+      }
     ).then((fetchResponse) => {
       const flightData = fetchResponse[0]
       if (typeof flightData !== 'string') {