Merge branch 'canary' into og-emails

vercel · Apr 15, 2024 · c63306b · c63306b
2 parents 2c3f5b0 + 4024a89
commit c63306b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 0 deletions.
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -320,6 +320,18 @@
     "ws": "8.2.3",
     "zod": "3.22.3"
   },
+  "keywords": [
+    "react",
+    "framework",
+    "nextjs",
+    "web",
+    "server",
+    "node",
+    "front-end",
+    "back-end",
+    "cli",
+    "vercel"
+  ],
   "engines": {
     "node": ">=18.17.0"
   }

diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -668,6 +668,7 @@ function createPatchedFetcher(
             const err = new DynamicServerError(dynamicUsageReason)
             staticGenerationStore.dynamicUsageErr = err
             staticGenerationStore.dynamicUsageDescription = dynamicUsageReason
+            throw err
           }
 
           const hasNextConfig = 'next' in init
@@ -695,6 +696,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
@@ -703,6 +703,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>
+    </>
+  )
+}