use correct extra config for pages router

vercel · Aug 30, 2023 · bf87c06 · bf87c06
1 parent f567aaf
commit bf87c06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/packages/next/src/build/analysis/get-page-static-info.ts b/packages/next/src/build/analysis/get-page-static-info.ts
@@ -21,7 +21,7 @@ import type { RSCMeta } from '../webpack/loaders/get-module-build-info'
 
 // TODO: migrate preferredRegion here
 // Don't forget to update the next-types-plugin file as well
-const AUTHORIZED_EXTRA_PROPS = ['maxDuration']
+const AUTHORIZED_EXTRA_APP_ROUTER_PROPS = ['maxDuration']
 
 export interface MiddlewareConfig {
   matchers?: MiddlewareMatcher[]
@@ -510,12 +510,11 @@ export async function getPageStaticInfo(params: {
     }
 
     let extraConfig: Record<string, any> | undefined
+    extraConfig = {}
 
-    if (extraProperties) {
-      extraConfig = {}
-
+    if (extraProperties && pageType === 'app') {
       for (const prop of extraProperties) {
-        if (!AUTHORIZED_EXTRA_PROPS.includes(prop)) continue
+        if (!AUTHORIZED_EXTRA_APP_ROUTER_PROPS.includes(prop)) continue
         try {
           extraConfig[prop] = extractExportedConstValue(swcAST, prop)
         } catch (e) {
@@ -524,6 +523,8 @@ export async function getPageStaticInfo(params: {
           }
         }
       }
+    } else if (pageType === 'pages') {
+      extraConfig = { ...config }
     }
 
     if (pageType === 'app') {

diff --git a/test/e2e/app-dir/with-exported-function-config/pages/page-ssr.tsx b/test/e2e/app-dir/with-exported-function-config/pages/page-ssr.tsx
@@ -2,7 +2,9 @@ export default function Page({ data }) {
   ;<p>hello {data}</p>
 }
 
-export const maxDuration = 3
+export const config = {
+  maxDuration: 3,
+}
 
 export async function getServerSideProps() {
   return { props: { data: 'world' } }

diff --git a/test/e2e/app-dir/with-exported-function-config/pages/page.tsx b/test/e2e/app-dir/with-exported-function-config/pages/page.tsx
@@ -2,4 +2,6 @@ export default function Page() {
   ;<p>hello world</p>
 }
 
-export const maxDuration = 2
+export const config = {
+  maxDuration: 2,
+}