Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[functions-config-manifest] use correct extra config for pages router #54786

Merged
merged 9 commits into from
Sep 5, 2023
Merged

[functions-config-manifest] use correct extra config for pages router #54786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bf87c06
use correct extra config for pages router
ecklf Aug 30, 2023
8d1c1c9
use correct extra config for pages router (2)
ecklf Aug 31, 2023
a013a9b
Update packages/next/src/build/analysis/get-page-static-info.ts
ecklf Aug 31, 2023
42ee022
Merge branch 'canary' into ecklf/change-manifest-pages-router
ecklf Aug 31, 2023
f827909
Merge branch 'canary' into ecklf/change-manifest-pages-router
ecklf Sep 4, 2023
92d66bb
filter keys
ecklf Sep 4, 2023
0b33f6e
Update get-page-static-info.ts
ecklf Sep 4, 2023
d9691be
Merge branch 'canary' into ecklf/change-manifest-pages-router
ecklf Sep 5, 2023
9824314
Merge branch 'canary' into ecklf/change-manifest-pages-router
ecklf Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/next/src/build/analysis/get-page-static-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand Down Expand Up @@ -510,12 +510,11 @@ export async function getPageStaticInfo(params: {
}

let extraConfig: Record<string, any> | undefined
extraConfig = {}
ecklf marked this conversation as resolved.
Show resolved Hide resolved

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) {
Expand All @@ -524,6 +523,8 @@ export async function getPageStaticInfo(params: {
}
}
}
} else if (pageType === 'pages') {
extraConfig = { ...config }
ecklf marked this conversation as resolved.
Show resolved Hide resolved
}

if (pageType === 'app') {
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/app-dir/with-exported-function-config/pages/page-ssr.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' } }
Expand Down
4 changes: 3 additions & 1 deletion test/e2e/app-dir/with-exported-function-config/pages/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ export default function Page() {
;<p>hello world</p>
}

export const maxDuration = 2
export const config = {
maxDuration: 2,
}