fix: added entrypoint

wyattjoh · wyattjoh · commit 54ec1b268d20 · 2025-06-16T16:30:01.000-05:00
diff --git a/packages/next/src/server/lib/incremental-cache/file-system-cache.ts b/packages/next/src/server/lib/incremental-cache/file-system-cache.ts
@@ -10,7 +10,7 @@ import {
   type SetIncrementalResponseCacheContext,
 } from '../../response-cache'
 
-import { LRUCache } from '../lru-cache'
+import type { LRUCache } from '../lru-cache'
 import path from '../../../shared/lib/isomorphic/path'
 import {
   NEXT_CACHE_TAGS_HEADER,
@@ -23,6 +23,7 @@ import {
 } from '../../../lib/constants'
 import { isStale, tagsManifest } from './tags-manifest.external'
 import { MultiFileWriter } from '../../../lib/multi-file-writer'
+import { getMemoryCache } from './memory-cache.external'
 
 type FileSystemCacheContext = Omit<
   CacheHandlerContext,
@@ -52,31 +53,7 @@ export default class FileSystemCache implements CacheHandler {
           console.log('using memory store for fetch cache')
         }
 
-        FileSystemCache.memoryCache = new LRUCache(
-          ctx.maxMemoryCacheSize,
-          function length({ value }) {
-            if (!value) {
-              return 25
-            } else if (value.kind === CachedRouteKind.REDIRECT) {
-              return JSON.stringify(value.props).length
-            } else if (value.kind === CachedRouteKind.IMAGE) {
-              throw new Error('invariant image should not be incremental-cache')
-            } else if (value.kind === CachedRouteKind.FETCH) {
-              return JSON.stringify(value.data || '').length
-            } else if (value.kind === CachedRouteKind.APP_ROUTE) {
-              return value.body.length
-            }
-            // rough estimate of size of cache value
-            return (
-              value.html.length +
-              (JSON.stringify(
-                value.kind === CachedRouteKind.APP_PAGE
-                  ? value.rscData
-                  : value.pageData
-              )?.length || 0)
-            )
-          }
-        )
+        FileSystemCache.memoryCache = getMemoryCache(ctx.maxMemoryCacheSize)
       } else if (FileSystemCache.debug) {
         console.log('memory store already initialized')
       }
diff --git a/packages/next/src/server/lib/incremental-cache/index.ts b/packages/next/src/server/lib/incremental-cache/index.ts
@@ -452,23 +452,6 @@ export class IncrementalCache implements IncrementalCacheType {
         return null
       }
 
-      // As we're able to get the cache entry for this fetch, and the prerender
-      // resume data cache (RDC) is available, it must have been populated by a
-      // previous fetch, but was not yet present in the in-memory cache. This
-      // could be the case when performing multiple renders in parallel during
-      // build time where we de-duplicate the fetch calls.
-      //
-      // We add it to the RDC so that the next fetch call will be able to use it
-      // and it won't have to reach into the fetch cache implementation.
-      const workUnitStore = workUnitAsyncStorage.getStore()
-      if (workUnitStore) {
-        const prerenderResumeDataCache =
-          getPrerenderResumeDataCache(workUnitStore)
-        if (prerenderResumeDataCache) {
-          prerenderResumeDataCache.fetch.set(cacheKey, cacheData.value)
-        }
-      }
-
       const revalidate = ctx.revalidate || cacheData.value.revalidate
       const age =
         (performance.timeOrigin +
diff --git a/packages/next/src/server/lib/incremental-cache/memory-cache.external.ts b/packages/next/src/server/lib/incremental-cache/memory-cache.external.ts
@@ -0,0 +1,34 @@
+import type { CacheHandlerValue } from '.'
+import { CachedRouteKind } from '../../response-cache/types'
+import { LRUCache } from '../lru-cache'
+
+let memoryCache: LRUCache<CacheHandlerValue> | undefined
+
+export function getMemoryCache(maxMemoryCacheSize: number) {
+  if (!memoryCache) {
+    memoryCache = new LRUCache(maxMemoryCacheSize, function length({ value }) {
+      if (!value) {
+        return 25
+      } else if (value.kind === CachedRouteKind.REDIRECT) {
+        return JSON.stringify(value.props).length
+      } else if (value.kind === CachedRouteKind.IMAGE) {
+        throw new Error('invariant image should not be incremental-cache')
+      } else if (value.kind === CachedRouteKind.FETCH) {
+        return JSON.stringify(value.data || '').length
+      } else if (value.kind === CachedRouteKind.APP_ROUTE) {
+        return value.body.length
+      }
+      // rough estimate of size of cache value
+      return (
+        value.html.length +
+        (JSON.stringify(
+          value.kind === CachedRouteKind.APP_PAGE
+            ? value.rscData
+            : value.pageData
+        )?.length || 0)
+      )
+    })
+  }
+
+  return memoryCache
+}
