Call initializeCacheHandlers slightly later in edge

Author: mischnic

packages/next/src/build/templates/edge-ssr-app.ts

@@ -33,9 +33,6 @@ declare const nextConfig: NextConfigRuntime
 // OPTIONAL_IMPORT:incrementalCacheHandler
 // INJECT:nextConfig
 
-// Initialize the cache handlers interface.
-initializeCacheHandlers(nextConfig.cacheMaxMemorySize)
-
 const maybeJSONParse = (str?: string) => (str ? JSON.parse(str) : undefined)
 
 const rscManifest = self.__RSC_MANIFEST?.['VAR_PAGE']
@@ -88,6 +85,9 @@ async function requestHandler(
     routerServerContext,
   } = prepareResult
 
+  // Initialize the cache handlers interface.
+  initializeCacheHandlers(nextConfig.cacheMaxMemorySize)
+
   const isPossibleServerAction = getIsPossibleServerAction(req)
   const botType = getBotType(req.headers.get('User-Agent') || '')
   const { isOnDemandRevalidate } = checkIsOnDemandRevalidate(

packages/next/src/build/templates/edge-ssr.ts

@@ -35,15 +35,12 @@ declare const nextConfig: NextConfigRuntime
 declare const pageRouteModuleOptions: any
 declare const errorRouteModuleOptions: any
 declare const user500RouteModuleOptions: any
-// INJECT:nextConfig
-// INJECT:pageRouteModuleOptions
-// INJECT:errorRouteModuleOptions
-// INJECT:user500RouteModuleOptions
+  // INJECT:nextConfig
+  // INJECT:pageRouteModuleOptions
+  // INJECT:errorRouteModuleOptions
+  // INJECT:user500RouteModuleOptions
 
-// Initialize the cache handlers interface.
-initializeCacheHandlers(nextConfig.cacheMaxMemorySize)
-
-// expose this for the route-module
+  // expose this for the route-module
 ;(globalThis as any).nextConfig = nextConfig
 
 const pageMod = {
@@ -119,6 +116,8 @@ async function requestHandler(
     dynamicCssManifest,
   } = prepareResult
 
+  initializeCacheHandlers(nextConfig.cacheMaxMemorySize)
+
   const renderContext: PagesRouteHandlerContext = {
     page: srcPage,
     query,