Ensure force-dynamic is honored during build (#45015)

vercel · Jan 18, 2023 · ad48202 · ad48202
1 parent 04f2646
commit ad48202
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/packages/next/src/build/utils.ts b/packages/next/src/build/utils.ts
@@ -1048,7 +1048,7 @@ export async function buildStaticPaths({
 export type AppConfig = {
   revalidate?: number | false
   dynamicParams?: true | false
-  dynamic?: 'auto' | 'error' | 'force-static'
+  dynamic?: 'auto' | 'error' | 'force-static' | 'force-dynamic'
   fetchCache?: 'force-cache' | 'only-cache'
   preferredRegion?: string
 }
@@ -1354,6 +1354,10 @@ export async function isPageStatic({
           {}
         )
 
+        if (appConfig.dynamic === 'force-dynamic') {
+          appConfig.revalidate = 0
+        }
+
         if (isDynamicRoute(page)) {
           ;({
             paths: prerenderRoutes,

diff --git a/test/e2e/app-dir/app-static/app-static.test.ts b/test/e2e/app-dir/app-static/app-static.test.ts
@@ -46,6 +46,7 @@ createNextDescribe(
           'dynamic-no-gen-params/[slug].html',
           'dynamic-no-gen-params/[slug].rsc',
           'dynamic-no-gen-params/[slug]/page.js',
+          'force-dynamic-no-prerender/[id]/page.js',
           'force-static/[slug]/page.js',
           'force-static/first.html',
           'force-static/first.rsc',

diff --git a/test/e2e/app-dir/app-static/app/force-dynamic-no-prerender/[id]/page.js b/test/e2e/app-dir/app-static/app/force-dynamic-no-prerender/[id]/page.js
@@ -0,0 +1,5 @@
+export const dynamic = 'force-dynamic'
+
+export default function Page({ params }) {
+  throw new Error('this should not attempt prerendering with force-dynamic')
+}