Rename __flight_router_state_tree__ and __flight_prefetch__ to __next_

vercel · Sep 28, 2022 · a54d8a3 · a54d8a3
1 parent ad86a55
commit a54d8a3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/packages/next/client/components/app-router.client.tsx b/packages/next/client/components/app-router.client.tsx
@@ -45,17 +45,17 @@ export async function fetchServerResponse(
 ): Promise<[FlightData: FlightData, canonicalUrlOverride: URL | undefined]> {
   const headers: {
     __rsc__: '1'
-    __flight_router_state_tree__: string
-    __flight_prefetch__?: '1'
+    __next_router_state_tree__: string
+    __next_router_prefetch__?: '1'
   } = {
     // Enable flight response
     __rsc__: '1',
     // Provide the current router state
-    __flight_router_state_tree__: JSON.stringify(flightRouterState),
+    __next_router_state_tree__: JSON.stringify(flightRouterState),
   }
   if (prefetch) {
     // Enable prefetch response
-    headers.__flight_prefetch__ = '1'
+    headers.__next_router_prefetch__ = '1'
   }
 
   const res = await fetch(url.toString(), {

diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
@@ -580,8 +580,8 @@ function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined {
 
 const FLIGHT_PARAMETERS = [
   '__rsc__',
-  '__flight_router_state_tree__',
-  '__flight_prefetch__',
+  '__next_router_state_tree__',
+  '__next_router_prefetch__',
 ] as const
 
 function headersWithoutFlight(headers: IncomingHttpHeaders) {
@@ -651,7 +651,7 @@ export async function renderToHTMLOrFlight(
     query = Object.assign({}, query)
 
     const isFlight = req.headers.__rsc__ !== undefined
-    const isPrefetch = req.headers.__flight_prefetch__ !== undefined
+    const isPrefetch = req.headers.__next_router_prefetch__ !== undefined
 
     // Handle client-side navigation to pages directory
     if (isFlight && isPagesDir) {
@@ -685,8 +685,8 @@ export async function renderToHTMLOrFlight(
      * Router state provided from the client-side router. Used to handle rendering from the common layout down.
      */
     const providedFlightRouterState: FlightRouterState = isFlight
-      ? req.headers.__flight_router_state_tree__
-        ? JSON.parse(req.headers.__flight_router_state_tree__ as string)
+      ? req.headers.__next_router_state_tree__
+        ? JSON.parse(req.headers.__next_router_state_tree__ as string)
         : {}
       : undefined
 

diff --git a/packages/next/server/internal-utils.ts b/packages/next/server/internal-utils.ts
@@ -8,8 +8,8 @@ const INTERNAL_QUERY_NAMES = [
   // RSC
   '__rsc__',
   // Routing
-  '__flight_router_state_tree__',
-  '__flight_prefetch__',
+  '__next_router_state_tree__',
+  '__next_router_prefetch__',
 ] as const
 
 const EXTENDED_INTERNAL_QUERY_NAMES = ['__nextDataReq'] as const

diff --git a/packages/next/server/web/adapter.ts b/packages/next/server/web/adapter.ts
@@ -37,8 +37,8 @@ class NextRequestHint extends NextRequest {
 
 const FLIGHT_PARAMETERS = [
   '__rsc__',
-  '__flight_router_state_tree__',
-  '__flight_prefetch__',
+  '__next_router_state_tree__',
+  '__next_router_prefetch__',
 ] as const
 
 export async function adapter(params: {

diff --git a/test/e2e/app-dir/app/middleware.js b/test/e2e/app-dir/app/middleware.js
@@ -19,7 +19,7 @@ export function middleware(request) {
       ? 'rewrite'
       : 'redirect'
 
-    const internal = ['__rsc__', '__flight_router_state_tree__']
+    const internal = ['__rsc__', '__next_router_state_tree__']
     if (internal.some((name) => request.headers.has(name))) {
       return NextResponse[method](new URL('/internal/failure', request.url))
     }

diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic.test.ts
@@ -92,8 +92,8 @@ describe('app dir - react server components', () => {
       '__nextDefaultLocale',
       '__nextIsNotFound',
       '__rsc__',
-      '__flight_router_state_tree__',
-      '__flight_prefetch__',
+      '__next_router_state_tree__',
+      '__next_router_prefetch__',
     ]
 
     const hasNextInternalQuery = inlineFlightContents.some((content) =>
@@ -113,7 +113,7 @@ describe('app dir - react server components', () => {
             if (
               headers.__rsc__ === '1' &&
               // Prefetches also include `__rsc__`
-              headers.__flight_prefetch__ !== '1'
+              headers.__next_router_prefetch__ !== '1'
             ) {
               hasFlightRequest = true
             }
@@ -198,7 +198,7 @@ describe('app dir - react server components', () => {
           return request.allHeaders().then((headers) => {
             if (
               headers.__rsc__ === '1' &&
-              headers.__flight_prefetch__ !== '1'
+              headers.__next_router_prefetch__ !== '1'
             ) {
               hasFlightRequest = true
             }