re-arrange some things

vercel · Feb 7, 2024 · ec7f968 · ec7f968
1 parent 3ca5de0
commit ec7f968
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
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
@@ -33,6 +33,10 @@ function createPrefetchCacheKey(url: URL, nextUrl?: string | null) {
   return pathnameFromUrl
 }
 
+/**
+ * Used to take an existing cache entry and prefix it with the nextUrl, if it exists.
+ * This ensures that we don't have conflicting cache entries for the same URL (as is the case with route interception).
+ */
 export function prefixExistingPrefetchCacheEntry({
   url,
   nextUrl,
@@ -142,7 +146,7 @@ export function getPrefetchCacheEntry({
 }
 
 /**
- * Use to seed the prefetch cache with an entry for already-resolved data
+ * Use to seed the prefetch cache with data that has already been fetched.
  */
 export function createPrefetchEntry({
   nextUrl,
@@ -178,7 +182,7 @@ export function createPrefetchEntry({
 }
 
 /**
- * Creates a prefetch entry for data that has not been resolved. This will add the prefetch request to a promise queue.
+ * Creates a prefetch entry entry and enqueues a fetch request to retrieve the data.
  */
 export function createLazyPrefetchEntry({
   url,

diff --git a/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.ts b/packages/next/src/client/components/router-reducer/reducers/navigate-reducer.ts
@@ -144,7 +144,7 @@ function navigateReducer_noPPR(
   return data.then(
     ([flightData, canonicalUrlOverride]) => {
       // we only want to mark this once
-      if (prefetchValues && !prefetchValues.lastUsedTime) {
+      if (!prefetchValues.lastUsedTime) {
         // important: we should only mark the cache node as dirty after we unsuspend from the call above
         prefetchValues.lastUsedTime = Date.now()
       }
@@ -197,7 +197,7 @@ function navigateReducer_noPPR(
             currentCache,
             cache,
             flightDataPath,
-            prefetchValues?.kind === 'auto' &&
+            prefetchValues.kind === 'auto' &&
               prefetchEntryCacheStatus === PrefetchCacheEntryStatus.reusable
           )
 
@@ -314,7 +314,7 @@ function navigateReducer_PPR(
   return data.then(
     ([flightData, canonicalUrlOverride, _postponed]) => {
       // we only want to mark this once
-      if (prefetchValues && !prefetchValues.lastUsedTime) {
+      if (!prefetchValues.lastUsedTime) {
         // important: we should only mark the cache node as dirty after we unsuspend from the call above
         prefetchValues.lastUsedTime = Date.now()
       }
@@ -451,7 +451,7 @@ function navigateReducer_PPR(
               currentCache,
               cache,
               flightDataPath,
-              prefetchValues?.kind === 'auto' &&
+              prefetchValues.kind === 'auto' &&
                 prefetchEntryCacheStatus === PrefetchCacheEntryStatus.reusable
             )