Update to leverage response-cache for image-optimizer

packages/next/server/base-server.ts

@@ -58,6 +58,7 @@ import { MIDDLEWARE_ROUTE } from '../lib/constants'
 import { addRequestMeta, getRequestMeta } from './request-meta'
 import { createHeaderRoute, createRedirectRoute } from './server-route-utils'
 import { PrerenderManifest } from '../build'
+import { ImageOptimizerCache } from './image-optimizer'
 
 export type FindComponentsResult = {
   components: LoadComponentsReturnType
@@ -165,6 +166,7 @@ export default abstract class Server {
   }
   private incrementalCache: IncrementalCache
   private responseCache: ResponseCache
+  protected imageResponseCache: ResponseCache
   protected router: Router
   protected dynamicRoutes?: DynamicRoutes
   protected customRoutes: CustomRoutes
@@ -360,6 +362,12 @@ export default abstract class Server {
       },
     })
     this.responseCache = new ResponseCache(this.incrementalCache)
+    this.imageResponseCache = new ResponseCache(
+      new ImageOptimizerCache({
+        distDir: this.distDir,
+        nextConfig: this.nextConfig,
+      }) as any
+    )
   }
 
   public logError(err: Error): void {
@@ -1516,6 +1524,8 @@ export default abstract class Server {
         await handleRedirect(cachedData.props)
         return null
       }
+    } else if (cachedData.kind === 'IMAGE') {
+      throw new Error('invariant SSG should not return an image cache value')
     } else {
       return {
         type: isDataReq ? 'json' : 'html',

packages/next/server/config-shared.ts

@@ -8,7 +8,7 @@ import {
 } from './image-config'
 
 export type NextConfigComplete = Required<NextConfig> & {
-  images: ImageConfigComplete
+  images: Required<ImageConfigComplete>
   typescript: Required<TypeScriptConfig>
   configOrigin?: string
   configFile?: string