diff --git a/test/e2e/app-dir/with-exported-function-config/app/foo/bar/route.ts b/test/e2e/app-dir/with-exported-function-config/app/app-route-edge/route.ts similarity index 73% rename from test/e2e/app-dir/with-exported-function-config/app/foo/bar/route.ts rename to test/e2e/app-dir/with-exported-function-config/app/app-route-edge/route.ts index 2fd5eb60b0e3..98e12548f48c 100644 --- a/test/e2e/app-dir/with-exported-function-config/app/foo/bar/route.ts +++ b/test/e2e/app-dir/with-exported-function-config/app/app-route-edge/route.ts @@ -1,7 +1,7 @@ import { NextResponse } from 'next/server' export async function GET() { - return NextResponse.json({ hello: 'world' }) + return NextResponse.json({ hello: 'app-edge' }) } export const runtime = 'edge' diff --git a/test/e2e/app-dir/with-exported-function-config/app/route.ts b/test/e2e/app-dir/with-exported-function-config/app/app-route/route.ts similarity index 50% rename from test/e2e/app-dir/with-exported-function-config/app/route.ts rename to test/e2e/app-dir/with-exported-function-config/app/app-route/route.ts index 10f0e63cfc73..7587c9943459 100644 --- a/test/e2e/app-dir/with-exported-function-config/app/route.ts +++ b/test/e2e/app-dir/with-exported-function-config/app/app-route/route.ts @@ -1,7 +1,7 @@ import { NextResponse } from 'next/server' export async function GET() { - return NextResponse.json({ hello: 'world' }) + return NextResponse.json({ hello: 'app' }) } -export const maxDuration = 5 +export const maxDuration = 1 diff --git a/test/e2e/app-dir/with-exported-function-config/app/app-ssr-edge/page.tsx b/test/e2e/app-dir/with-exported-function-config/app/app-ssr-edge/page.tsx new file mode 100644 index 000000000000..8eb17ae02e61 --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/app/app-ssr-edge/page.tsx @@ -0,0 +1,6 @@ +export default function Page() { + return

app-edge-ssr

+} + +export const runtime = 'edge' +export const maxDuration = 4 diff --git a/test/e2e/app-dir/with-exported-function-config/app/app-ssr/page.tsx b/test/e2e/app-dir/with-exported-function-config/app/app-ssr/page.tsx new file mode 100644 index 000000000000..4f2b088517aa --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/app/app-ssr/page.tsx @@ -0,0 +1,5 @@ +export default function Page() { + return

app-ssr

+} + +export const maxDuration = 3 diff --git a/test/e2e/app-dir/with-exported-function-config/app/layout.tsx b/test/e2e/app-dir/with-exported-function-config/app/layout.tsx new file mode 100644 index 000000000000..dbce4ea8e3ae --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/app/layout.tsx @@ -0,0 +1,11 @@ +export default function RootLayout({ + children, +}: { + children: React.ReactNode +}) { + return ( + + {children} + + ) +} diff --git a/test/e2e/app-dir/with-exported-function-config/pages/api/page-route.ts b/test/e2e/app-dir/with-exported-function-config/pages/api/page-route.ts new file mode 100644 index 000000000000..354559f3e620 --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/pages/api/page-route.ts @@ -0,0 +1,10 @@ +import { NextApiResponse, NextApiRequest } from 'next' + +export default function handler( + _req: NextApiRequest, + res: NextApiResponse<{ hello: string }> +) { + return res.status(200).json({ hello: 'world' }) +} + +export const maxDuration = 1 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 new file mode 100644 index 000000000000..fd898a4d2bdb --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/pages/page-ssr.tsx @@ -0,0 +1,9 @@ +export default function Page({ data }) { + ;

hello {data}

+} + +export const 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 new file mode 100644 index 000000000000..01f69e141dfc --- /dev/null +++ b/test/e2e/app-dir/with-exported-function-config/pages/page.tsx @@ -0,0 +1,5 @@ +export default function Page() { + ;

hello world

+} + +export const maxDuration = 2 diff --git a/test/e2e/app-dir/with-exported-function-config/with-exported-function-config.test.ts b/test/e2e/app-dir/with-exported-function-config/with-exported-function-config.test.ts index 5e85981677c7..e633be281b5e 100644 --- a/test/e2e/app-dir/with-exported-function-config/with-exported-function-config.test.ts +++ b/test/e2e/app-dir/with-exported-function-config/with-exported-function-config.test.ts @@ -14,12 +14,27 @@ createNextDescribe( expect(functionsConfigManifest).toMatchInlineSnapshot(` Object { - "/": Object { - "maxDuration": 5, + "/api/page-route": Object { + "maxDuration": 1, }, - "/foo/bar": Object { + "/app-route": Object { + "maxDuration": 1, + }, + "/app-route-edge": Object { + "maxDuration": 2, + }, + "/app-ssr": Object { + "maxDuration": 3, + }, + "/app-ssr-edge": Object { + "maxDuration": 4, + }, + "/page": Object { "maxDuration": 2, }, + "/page-ssr": Object { + "maxDuration": 3, + }, } `) })