isPrerender -> prerendered

vercel · Oct 1, 2024 · 9ca1772 · 9ca1772
1 parent 052a8bc
commit 9ca1772
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git a/packages/next/src/client/app-index.tsx b/packages/next/src/client/app-index.tsx
@@ -160,7 +160,7 @@ const pendingActionQueue: Promise<AppRouterActionQueue> = new Promise(
               location: window.location,
               couldBeIntercepted: initialRSCPayload.i,
               postponed: initialRSCPayload.s,
-              isPrerender: initialRSCPayload.S,
+              prerendered: initialRSCPayload.S,
             })
           )
         )

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
@@ -43,7 +43,7 @@ describe('createInitialRouterState', () => {
       location: new URL('/linking', 'https://localhost') as any,
       couldBeIntercepted: false,
       postponed: false,
-      isPrerender: false,
+      prerendered: false,
     })
 
     const state2 = createInitialRouterState({
@@ -56,7 +56,7 @@ describe('createInitialRouterState', () => {
       location: new URL('/linking', 'https://localhost') as any,
       couldBeIntercepted: false,
       postponed: false,
-      isPrerender: false,
+      prerendered: false,
     })
 
     const expectedCache: CacheNode = {

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
@@ -17,7 +17,7 @@ export interface InitialRouterStateParameters {
   location: Location | null
   couldBeIntercepted: boolean
   postponed: boolean
-  isPrerender: boolean
+  prerendered: boolean
 }
 
 export function createInitialRouterState({
@@ -28,7 +28,7 @@ export function createInitialRouterState({
   location,
   couldBeIntercepted,
   postponed,
-  isPrerender,
+  prerendered,
 }: InitialRouterStateParameters) {
   // When initialized on the server, the canonical URL is provided as an array of parts.
   // This is to ensure that when the RSC payload streamed to the client, crawlers don't interpret it
@@ -120,13 +120,13 @@ export function createInitialRouterState({
         flightData: [normalizedFlightData],
         canonicalUrl: undefined,
         couldBeIntercepted: !!couldBeIntercepted,
-        isPrerender,
+        prerendered,
         postponed,
       },
       tree: initialState.tree,
       prefetchCache: initialState.prefetchCache,
       nextUrl: initialState.nextUrl,
-      kind: isPrerender ? PrefetchKind.FULL : PrefetchKind.AUTO,
+      kind: prerendered ? PrefetchKind.FULL : PrefetchKind.AUTO,
     })
   }
 

diff --git a/packages/next/src/client/components/router-reducer/fetch-server-response.ts b/packages/next/src/client/components/router-reducer/fetch-server-response.ts
@@ -45,7 +45,7 @@ export type FetchServerResponseResult = {
   flightData: NormalizedFlightData[] | string
   canonicalUrl: URL | undefined
   couldBeIntercepted: boolean
-  isPrerender: boolean
+  prerendered: boolean
   postponed: boolean
 }
 
@@ -71,7 +71,7 @@ function doMpaNavigation(url: string): FetchServerResponseResult {
     flightData: urlToUrlWithoutFlightMarker(url).toString(),
     canonicalUrl: undefined,
     couldBeIntercepted: false,
-    isPrerender: false,
+    prerendered: false,
     postponed: false,
   }
 }
@@ -221,7 +221,7 @@ export async function fetchServerResponse(
       flightData: normalizeFlightData(response.f),
       canonicalUrl: canonicalUrl,
       couldBeIntercepted: interception,
-      isPrerender: response.S,
+      prerendered: response.S,
       postponed,
     }
   } catch (err) {
@@ -236,7 +236,7 @@ export async function fetchServerResponse(
       flightData: url.toString(),
       canonicalUrl: undefined,
       couldBeIntercepted: false,
-      isPrerender: false,
+      prerendered: false,
       postponed: false,
     }
   }

diff --git a/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts b/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts
@@ -353,7 +353,7 @@ function createLazyPrefetchEntry({
       // If the prefetch was a cache hit, we want to update the existing cache entry to reflect that it was a full prefetch.
       // This is because we know that a static response will contain the full RSC payload, and can be updated to respect the `static`
       // staleTime.
-      if (prefetchResponse.isPrerender) {
+      if (prefetchResponse.prerendered) {
         const existingCacheEntry = prefetchCache.get(
           // if we prefixed the cache key due to route interception, we want to use the new key. Otherwise we use the original key
           newCacheKey ?? prefetchCacheKey

diff --git a/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts b/packages/next/src/client/components/router-reducer/reducers/server-action-reducer.ts
@@ -265,7 +265,7 @@ export function serverActionReducer(
             flightData,
             canonicalUrl: undefined,
             couldBeIntercepted: false,
-            isPrerender: false,
+            prerendered: false,
             postponed: false,
           },
           tree: state.tree,

diff --git a/packages/next/src/server/app-render/app-render.tsx b/packages/next/src/server/app-render/app-render.tsx
@@ -770,7 +770,7 @@ function App<T>({
     location: null,
     couldBeIntercepted: response.i,
     postponed: response.s,
-    isPrerender: response.S,
+    prerendered: response.S,
   })
 
   const actionQueue = createMutableActionQueue(initialState)
@@ -829,7 +829,7 @@ function AppWithoutContext<T>({
     location: null,
     couldBeIntercepted: response.i,
     postponed: response.s,
-    isPrerender: response.S,
+    prerendered: response.S,
   })
 
   const actionQueue = createMutableActionQueue(initialState)

diff --git a/test/e2e/app-dir/app-prefetch/prefetching.test.ts b/test/e2e/app-dir/app-prefetch/prefetching.test.ts
@@ -332,9 +332,18 @@ describe('app dir - prefetching', () => {
         )
       })
 
+      // navigate to index
+      await browser.elementByCss('[href="/"]').click()
+
+      // we should be on the index page
+      await browser.waitForElementByCss('#to-dashboard')
+
       // navigate to the static page
       await browser.elementByCss('[href="/static-page"]').click()
 
+      // we should be on the static page
+      await browser.waitForElementByCss('#static-page')
+
       // We still shouldn't see any requests
       await retry(async () => {
         expect(rscRequests.filter((req) => req === '/static-page').length).toBe(