Update to leverage response-cache for image-optimizer

packages/next/server/api-utils.ts

@@ -365,15 +365,29 @@ async function unstable_revalidate(
     )
   }
 
+  if (typeof urlPath !== 'string' || !urlPath.startsWith('/')) {
+    throw new Error(
+      `Invalid urlPath provided to revalidate(), must be a path e.g. /blog/post-1, received ${urlPath}`
+    )
+  }
+
   const baseUrl = context.trustHostHeader
     ? `https://${req.headers.host}`
     : `http://${context.hostname}:${context.port}`
 
-  return fetch(`${baseUrl}${urlPath}`, {
-    headers: {
-      [PRERENDER_REVALIDATE_HEADER]: context.previewModeId,
-    },
-  })
+  try {
+    const res = await fetch(`${baseUrl}${urlPath}`, {
+      headers: {
+        [PRERENDER_REVALIDATE_HEADER]: context.previewModeId,
+      },
+    })
+
+    if (!res.ok) {
+      throw new Error(`Invalid response ${res.status}`)
+    }
+  } catch (err) {
+    throw new Error(`Failed to revalidate ${urlPath}`)
+  }
 }
 
 const COOKIE_NAME_PRERENDER_BYPASS = `__prerender_bypass`

packages/next/server/base-server.ts

@@ -1543,6 +1543,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