vercel · ijjk · Jan 4, 2024 · Dec 27, 2023 · Jan 3, 2024 · Jan 4, 2024
diff --git a/packages/next/src/server/lib/incremental-cache/index.ts b/packages/next/src/server/lib/incremental-cache/index.ts
@@ -65,6 +65,7 @@ export class CacheHandler {
 export class IncrementalCache implements IncrementalCacheType {
   dev?: boolean
   cacheHandler?: CacheHandler
+  isFetchCacherPossible: boolean
   prerenderManifest: PrerenderManifest
   requestHeaders: Record<string, undefined | string | string[]>
   requestProtocol?: 'http' | 'https'
@@ -112,6 +113,8 @@ export class IncrementalCache implements IncrementalCacheType {
     experimental: { ppr: boolean }
   }) {
     const debug = !!process.env.NEXT_PRIVATE_DEBUG_CACHE
+    this.isFetchCacherPossible =
+      !CurCacheHandler || CurCacheHandler instanceof FetchCache
     if (!CurCacheHandler) {
       if (fs && serverDistDir) {
         if (debug) {
@@ -556,7 +559,11 @@ export class IncrementalCache implements IncrementalCacheType {
 
     if (this.dev && !ctx.fetchCache) return
     // fetchCache has upper limit of 2MB per-entry currently
-    if (ctx.fetchCache && JSON.stringify(data).length > 2 * 1024 * 1024) {
+    if (
+      ctx.fetchCache &&
+      this.isFetchCacherPossible &&
+      JSON.stringify(data).length > 2 * 1024 * 1024
+    ) {
       if (this.dev) {
         throw new Error(`fetch for over 2MB of data can not be cached`)
       }

diff --git a/test/e2e/fetch-cache-limit/app/api/mock/route.ts b/test/e2e/fetch-cache-limit/app/api/mock/route.ts
@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+export async function GET() {
+  console.log('Load data')
+  return NextResponse.json({
+    content: Array.from(new Array(3 * 1024 * 1024))
+      .map(() => 1)
+      .join(''),
+  })
+}
diff --git a/test/e2e/fetch-cache-limit/app/layout.tsx b/test/e2e/fetch-cache-limit/app/layout.tsx
@@ -0,0 +1,14 @@
+export const metadata = {
+  title: 'Next.js',
+  description: 'Generated by Next.js',
+}
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
+
+export const dynamic = 'force-dynamic'
diff --git a/test/e2e/fetch-cache-limit/app/page.tsx b/test/e2e/fetch-cache-limit/app/page.tsx
@@ -0,0 +1,8 @@
+export default async function Page() {
+  const resp = await fetch(`http://localhost:${process.env.PORT}/api/mock`, {
+    cache: 'force-cache',
+  })
+  const data = await resp.json()
+
+  return <p id="content">{data.content}</p>
+}
diff --git a/test/e2e/fetch-cache-limit/cache-handler.js b/test/e2e/fetch-cache-limit/cache-handler.js
@@ -0,0 +1,19 @@
+const cache = new Map()
+
+module.exports = class CacheHandler {
+  constructor(options) {
+    this.cache = {}
+    this.options = options
+  }
+
+  async get(key) {
+    return cache.get(key)
+  }
+
+  async set(key, data) {
+    cache.set(key, {
+      value: data,
+      lastModified: Date.now(),
+    })
+  }
+}
diff --git a/test/e2e/fetch-cache-limit/fetch-cache-limit.test.ts b/test/e2e/fetch-cache-limit/fetch-cache-limit.test.ts
@@ -0,0 +1,22 @@
+import { createNextDescribe } from 'e2e-utils'
+
+createNextDescribe(
+  'fetch-cache-limit',
+  {
+    files: __dirname,
+    // don't have access to runtime logs on deploy
+    skipDeployment: true,
+  },
+  ({ next }) => {
+    it('when awaiting `fetch` using an unknown domain, stack traces are preserved', async () => {
+      const browser = await next.browser('/')
+      await browser.waitForElementByCss('#content')
+      await browser.refresh()
+      await browser.waitForElementByCss('#content')
+      await browser.refresh()
+      await browser.waitForElementByCss('#content')
+      // console.log(next.cliOutput.match('Load data'))
+      expect(next.cliOutput.match('Load data').length).toBe(1)
+    })
+  }
+)
diff --git a/test/e2e/fetch-cache-limit/next.config.js b/test/e2e/fetch-cache-limit/next.config.js
@@ -0,0 +1,6 @@
+/** @type {import('next').NextConfig} */
+module.exports = {
+  experimental: {
+    incrementalCacheHandlerPath: require.resolve('./cache-handler.js'),
+  },
+}