Unverified Commit 9097ef6f authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Propagate maxDuration to edge adapter outputs (#95118)

## Summary

Propagate `maxDuration` to Edge adapter outputs so deployment adapters
receive the same route execution limit metadata as Node.js outputs.

Normalize Pages Router Edge adapter pathnames that end in `/index` to
their public route pathname, for example `/edge-pages/index` to
`/edge-pages`. This matters because the functions config manifest stores
route metadata under the public pathname, so matching the unnormalized
`/index` form would miss `maxDuration`.

Add adapter coverage for App Router pages and routes, Pages Router pages
and API routes, and both Node.js and Edge runtimes, including the Pages
Router `/index` normalization case.

## Verification

- `pnpm test-start-turbo
test/production/adapter-config/adapter-config.test.ts`
- `pnpm test-start-webpack
test/production/adapter-config/adapter-config.test.ts`

<!-- NEXT_JS_LLM_PR -->
parent 727a3ffa
...@@ -657,7 +657,8 @@ export async function handleBuildComplete({ ...@@ -657,7 +657,8 @@ export async function handleBuildComplete({
? normalizeAppPath(route) ? normalizeAppPath(route)
: route === '/index' : route === '/index'
? '/' ? '/'
: route : route.replace(/\/index$/, '')
const functionConfig = functionsConfigManifest.functions[pathname] || {}
const edgeEntrypointRelativePath = page.entrypoint const edgeEntrypointRelativePath = page.entrypoint
const edgeEntrypointPath = path.join( const edgeEntrypointPath = path.join(
distDir, distDir,
...@@ -683,6 +684,7 @@ export async function handleBuildComplete({ ...@@ -683,6 +684,7 @@ export async function handleBuildComplete({
// Computing assetsHash for edge functions isn't implemented for now // Computing assetsHash for edge functions isn't implemented for now
wasmAssets: {}, wasmAssets: {},
config: { config: {
maxDuration: functionConfig.maxDuration,
env: page.env, env: page.env,
preferredRegion: page.regions, preferredRegion: page.regions,
}, },
......
...@@ -90,6 +90,73 @@ describe('adapter-config', () => { ...@@ -90,6 +90,73 @@ describe('adapter-config', () => {
expect(staticOutputs.length).toBeGreaterThan(0) expect(staticOutputs.length).toBeGreaterThan(0)
expect(prerenderOutputs.length).toBeGreaterThan(0) expect(prerenderOutputs.length).toBeGreaterThan(0)
const expectedRouteConfigs = [
{
pathname: '/docs/node-app',
type: 'APP_PAGE',
runtime: 'nodejs',
maxDuration: 10,
},
{
pathname: '/docs/edge-app',
type: 'APP_PAGE',
runtime: 'edge',
maxDuration: 20,
},
{
pathname: '/docs/node-route',
type: 'APP_ROUTE',
runtime: 'nodejs',
maxDuration: 30,
},
{
pathname: '/docs/edge-route',
type: 'APP_ROUTE',
runtime: 'edge',
maxDuration: 40,
},
{
pathname: '/docs/node-pages',
type: 'PAGES',
runtime: 'nodejs',
maxDuration: 50,
},
{
pathname: '/docs/edge-pages',
type: 'PAGES',
runtime: 'edge',
maxDuration: 60,
},
{
pathname: '/docs/api/node-pages',
type: 'PAGES_API',
runtime: 'nodejs',
maxDuration: 70,
},
{
pathname: '/docs/api/edge-pages',
type: 'PAGES_API',
runtime: 'edge',
maxDuration: 80,
},
] as const
for (const {
pathname,
type,
runtime,
maxDuration,
} of expectedRouteConfigs) {
expect(combinedRouteOutputs).toContainEqual(
expect.objectContaining({
pathname,
type,
runtime,
config: expect.objectContaining({ maxDuration }),
})
)
}
for (const output of staticOutputs) { for (const output of staticOutputs) {
expect(output.id).toBeTruthy() expect(output.id).toBeTruthy()
......
export const runtime = 'edge' export const runtime = 'edge'
export const maxDuration = 20
export default function Page() { export default function Page() {
return ( return (
......
import { NextRequest, NextResponse } from 'next/server' import { NextRequest, NextResponse } from 'next/server'
export const runtime = 'edge' export const runtime = 'edge'
export const maxDuration = 40
export function GET(req: NextRequest) { export function GET(req: NextRequest) {
console.log(req.url.toString()) console.log(req.url.toString())
......
export const dynamic = 'force-dynamic' export const dynamic = 'force-dynamic'
export const maxDuration = 10
export default function Page() { export default function Page() {
return ( return (
......
import { NextRequest, NextResponse } from 'next/server' import { NextRequest, NextResponse } from 'next/server'
export const maxDuration = 30
export function GET(req: NextRequest) { export function GET(req: NextRequest) {
console.log(req.url.toString()) console.log(req.url.toString())
return NextResponse.json({ return NextResponse.json({
......
...@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server' ...@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from 'next/server'
export const config = { export const config = {
runtime: 'edge', runtime: 'edge',
maxDuration: 80,
} }
export default function handler(req: NextRequest) { export default function handler(req: NextRequest) {
......
import { NextApiRequest, NextApiResponse } from 'next/dist/types' import { NextApiRequest, NextApiResponse } from 'next/dist/types'
export const config = {
maxDuration: 70,
}
export default function handler(req: NextApiRequest, res: NextApiResponse) { export default function handler(req: NextApiRequest, res: NextApiResponse) {
console.log(req.url) console.log(req.url)
res.json({ now: Date.now() }) res.json({ now: Date.now() })
......
export const config = { export const config = {
runtime: 'experimental-edge', runtime: 'experimental-edge',
maxDuration: 60,
} }
export default function Page() { export default function Page() {
......
export const config = {
maxDuration: 50,
}
export function getServerSideProps() { export function getServerSideProps() {
return { return {
props: { props: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment