Fix DynamicServerError not being thrown in fetch (#64511)

ijjk · ztanner · commit 6c31a2d41ef0 · 2024-04-17T11:56:47.000-07:00
This ensures we properly skip calling a fetch during build-time that has `cache: 'no-store'` as it should only be called during runtime instead. Fixes: #64462 Closes NEXT-3114
diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -662,6 +662,7 @@ function createPatchedFetcher(
             const err = new DynamicServerError(dynamicUsageReason)
             staticGenerationStore.dynamicUsageErr = err
             staticGenerationStore.dynamicUsageDescription = dynamicUsageReason
+            throw err
           }
 
           const hasNextConfig = 'next' in init
@@ -689,6 +690,7 @@ function createPatchedFetcher(
               const err = new DynamicServerError(dynamicUsageReason)
               staticGenerationStore.dynamicUsageErr = err
               staticGenerationStore.dynamicUsageDescription = dynamicUsageReason
+              throw err
             }
 
             if (!staticGenerationStore.forceStatic || next.revalidate !== 0) {
diff --git a/test/e2e/app-dir/app-static/app-static.test.ts b/test/e2e/app-dir/app-static/app-static.test.ts
@@ -671,6 +671,8 @@ createNextDescribe(
             "force-dynamic-no-prerender/[id]/page_client-reference-manifest.js",
             "force-dynamic-prerender/[slug]/page.js",
             "force-dynamic-prerender/[slug]/page_client-reference-manifest.js",
+            "force-no-store-bailout/page.js",
+            "force-no-store-bailout/page_client-reference-manifest.js",
             "force-no-store/page.js",
             "force-no-store/page_client-reference-manifest.js",
             "force-static-fetch-no-store.html",
diff --git a/test/e2e/app-dir/app-static/app/force-no-store-bailout/page.js b/test/e2e/app-dir/app-static/app/force-no-store-bailout/page.js
@@ -0,0 +1,16 @@
+export const fetchCache = 'force-no-store'
+
+export default async function Page() {
+  // this should not be invoked during build as
+  // no-store should have it bail out
+  await fetch('https://non-existent', {
+    cache: 'no-store',
+  })
+
+  return (
+    <>
+      <p id="page">/force-no-store-bailout</p>
+      <p id="now">{Date.now()}</p>
+    </>
+  )
+}

Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,7 @@ function createPatchedFetcher(`
`662`	`662`	`const err = new DynamicServerError(dynamicUsageReason)`
`663`	`663`	`staticGenerationStore.dynamicUsageErr = err`
`664`	`664`	`staticGenerationStore.dynamicUsageDescription = dynamicUsageReason`
	`665`	`+ throw err`
`665`	`666`	`}`
`666`	`667`
`667`	`668`	`const hasNextConfig = 'next' in init`
`@@ -689,6 +690,7 @@ function createPatchedFetcher(`
`689`	`690`	`const err = new DynamicServerError(dynamicUsageReason)`
`690`	`691`	`staticGenerationStore.dynamicUsageErr = err`
`691`	`692`	`staticGenerationStore.dynamicUsageDescription = dynamicUsageReason`
	`693`	`+ throw err`
`692`	`694`	`}`
`693`	`695`
`694`	`696`	`if (!staticGenerationStore.forceStatic \|\| next.revalidate !== 0) {`