split e2e tests for unstable_after into app and pages, run app tests …

…for both nodejs and edge runtimes

test/e2e/app-dir/next-after/app/[id]/dynamic/page.js → test/e2e/app-dir/next-after-app/app/[id]/dynamic/page.js

@@ -1,6 +1,6 @@
 import { unstable_after as after } from 'next/server'
 import { cache } from 'react'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 import { headers } from 'next/headers'
 
 const thing = cache(() => Symbol('cache me please'))
@@ -13,7 +13,7 @@ export default function Index({ params }) {
     const hostFromAfter = headers().get('host')
     const valueFromAfter = thing()
 
-    persistentLog({
+    cliLog({
       source: '[page] /[id]/dynamic',
       value: params.id,
       assertions: {

test/e2e/app-dir/next-after/app/[id]/layout.js → test/e2e/app-dir/next-after-app/app/[id]/layout.js

@@ -1,9 +1,9 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../utils/log'
+import { cliLog } from '../../utils/log'
 
 export default function Layout({ children }) {
   after(async () => {
-    persistentLog({ source: '[layout] /[id]' })
+    cliLog({ source: '[layout] /[id]' })
   })
   return <>{children}</>
 }

test/e2e/app-dir/next-after/app/[id]/setting-cookies/page.js → test/e2e/app-dir/next-after-app/app/[id]/setting-cookies/page.js

@@ -3,14 +3,15 @@ import { cookies } from 'next/headers'
 
 export default function Index() {
   after(() => {
-    cookies().set('testCookie', 'after-render')
+    cookies().set('testCookie', 'after-render', { path: '/' })
   })
+
   const action = async () => {
     'use server'
-    cookies().set('testCookie', 'action')
+    cookies().set('testCookie', 'action', { path: '/' })
 
     after(() => {
-      cookies().set('testCookie', 'after-action')
+      cookies().set('testCookie', 'after-action', { path: '/' })
     })
   }
 

test/e2e/app-dir/next-after/app/[id]/with-action/page.js → test/e2e/app-dir/next-after-app/app/[id]/with-action/page.js

@@ -1,6 +1,6 @@
 import { unstable_after as after } from 'next/server'
 import { cache } from 'react'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 import { headers } from 'next/headers'
 
 const thing = cache(() => Symbol('cache me please'))
@@ -16,7 +16,7 @@ export default function Index({ params }) {
       const valueFromAfter = thing()
       const hostFromAfter = headers().get('host')
 
-      persistentLog({
+      cliLog({
         source: '[action] /[id]/with-action',
         value: params.id,
         assertions: {

test/e2e/app-dir/next-after/app/[id]/with-metadata/page.js → test/e2e/app-dir/next-after-app/app/[id]/with-metadata/page.js

@@ -1,9 +1,9 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 
 export function generateMetadata({ params }) {
   after(() => {
-    persistentLog({
+    cliLog({
       source: '[metadata] /[id]/with-metadata',
       value: params.id,
     })

test/e2e/app-dir/next-after/app/delay/page.js → test/e2e/app-dir/next-after-app/app/delay/page.js

@@ -1,12 +1,12 @@
 import { Suspense } from 'react'
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../utils/log'
+import { cliLog } from '../../utils/log'
 
 export const dynamic = 'force-dynamic'
 
 export default async function Page() {
   after(() => {
-    persistentLog({ source: '[page] /delay (Page)' })
+    cliLog({ source: '[page] /delay (Page)' })
   })
   return (
     <Suspense fallback={'Loading...'}>
@@ -17,7 +17,7 @@ export default async function Page() {
 
 async function Inner({ children }) {
   after(() => {
-    persistentLog({ source: '[page] /delay (Inner)' })
+    cliLog({ source: '[page] /delay (Inner)' })
   })
 
   // the test intercepts this to assert on whether the after() callbacks ran

test/e2e/app-dir/next-after/app/interrupted/calls-not-found/page.js → test/e2e/app-dir/next-after-app/app/interrupted/calls-not-found/page.js

@@ -1,10 +1,10 @@
 import { notFound } from 'next/navigation'
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 
 export default function Page() {
   after(() => {
-    persistentLog({
+    cliLog({
       source: '[page] /interrupted/calls-not-found',
     })
   })

test/e2e/app-dir/next-after/app/interrupted/calls-redirect/page.js → test/e2e/app-dir/next-after-app/app/interrupted/calls-redirect/page.js

@@ -1,10 +1,10 @@
 import { redirect } from 'next/navigation'
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 
 export default function Page() {
   after(() => {
-    persistentLog({
+    cliLog({
       source: '[page] /interrupted/calls-redirect',
     })
   })

test/e2e/app-dir/next-after/app/interrupted/redirect-target/page.js → test/e2e/app-dir/next-after-app/app/interrupted/redirect-target/page.js

@@ -1,9 +1,9 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 
 export default function Page() {
   after(() => {
-    persistentLog({
+    cliLog({
       source: '[page] /interrupted/redirect-target',
     })
   })

test/e2e/app-dir/next-after/app/interrupted/throws-error/page.js → test/e2e/app-dir/next-after-app/app/interrupted/throws-error/page.js

@@ -1,9 +1,9 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../../utils/log'
+import { cliLog } from '../../../utils/log'
 
 export default function Page() {
   after(() => {
-    persistentLog({
+    cliLog({
       source: '[page] /interrupted/throws-error',
     })
   })

test/e2e/app-dir/next-after/app/invalid-in-client/page.js → test/e2e/app-dir/next-after-app/app/invalid-in-client/page.js

@@ -1,7 +1,7 @@
 // 'use client'
 
 import { unstable_after as after } from 'next/server'
-import { cliLog } from '../../utils/log-cli'
+import { cliLog } from '../../utils/log'
 
 export const dynamic = 'force-dynamic'
 

test/e2e/app-dir/next-after/app/layout.js → test/e2e/app-dir/next-after-app/app/layout.js

@@ -1,3 +1,6 @@
+// (patched in tests)
+// export const runtime = 'REPLACE_ME'
+
 export default function AppLayout({ children }) {
   return (
     <html>

test/e2e/app-dir/next-after/app/route/route.js → test/e2e/app-dir/next-after-app/app/route/route.js

@@ -1,12 +1,15 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../utils/log'
+import { cliLog } from '../../utils/log'
+
+// (patched in tests)
+// export const runtime = 'REPLACE_ME'
 
 export const dynamic = 'force-dynamic'
 
 export async function GET() {
   const data = { message: 'Hello, world!' }
   after(() => {
-    persistentLog({ source: '[route handler] /route' })
+    cliLog({ source: '[route handler] /route' })
   })
 
   return Response.json({ data })

test/e2e/app-dir/next-after/app/static/page.js → test/e2e/app-dir/next-after-app/app/static/page.js

@@ -1,12 +1,12 @@
 import { unstable_after as after } from 'next/server'
-import { persistentLog } from '../../utils/log'
+import { cliLog } from '../../utils/log'
 
 // (patched in tests)
 // export const dynamic = 'REPLACE_ME'
 
 export default function Index() {
   after(async () => {
-    persistentLog({ source: '[page] /static' })
+    cliLog({ source: '[page] /static' })
   })
   return <div>Page with after()</div>
 }

test/e2e/app-dir/next-after/index.test.ts → test/e2e/app-dir/next-after-app/index.test.ts

@@ -7,10 +7,11 @@ import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import * as Log from './utils/log'
-import * as LogCLI from './utils/log-cli'
 import { BrowserInterface } from '../../../lib/next-webdriver'
 
-describe('unstable_after()', () => {
+const runtimes = ['nodejs', 'edge']
+
+describe.each(runtimes)('unstable_after() in %s runtime', (runtimeValue) => {
   const logFileDir = fs.mkdtempSync(path.join(os.tmpdir(), 'logs-'))
   const logFile = path.join(logFileDir, 'logs.jsonl')
 
@@ -21,8 +22,44 @@ describe('unstable_after()', () => {
     },
   })
 
-  const getLogs = () => Log.readPersistentLog(logFile)
-  beforeEach(() => Log.clearPersistentLog(logFile))
+  {
+    const originalContents: Record<string, string> = {}
+
+    beforeAll(async () => {
+      const placeholder = `// export const runtime = 'REPLACE_ME'`
+
+      const filesToPatch = ['app/layout.js', 'app/route/route.js']
+
+      for (const file of filesToPatch) {
+        await next.patchFile(file, (contents) => {
+          if (!contents.includes(placeholder)) {
+            throw new Error(`Placeholder "${placeholder}" not found in ${file}`)
+          }
+          originalContents[file] = contents
+
+          return contents.replace(
+            placeholder,
+            `export const runtime = '${runtimeValue}'`
+          )
+        })
+      }
+    })
+
+    afterAll(async () => {
+      for (const [file, contents] of Object.entries(originalContents)) {
+        await next.patchFile(file, contents)
+      }
+    })
+  }
+
+  let currentCliOutputIndex = 0
+  beforeEach(() => {
+    currentCliOutputIndex = next.cliOutput.length
+  })
+
+  const getLogs = () => {
+    return Log.readCliLogs(next.cliOutput.slice(currentCliOutputIndex))
+  }
 
   it('runs in dynamic pages', async () => {
     await next.render('/123/dynamic')
@@ -106,9 +143,8 @@ describe('unstable_after()', () => {
     )
 
     expect(res.status).toBe(200)
-    const cliLogs = LogCLI.readCliLogs(next.cliOutput)
     await retry(() => {
-      expect(cliLogs).toContainEqual({
+      expect(getLogs()).toContainEqual({
         source: '[middleware] /middleware/redirect-source',
         requestId,
         cookies: { testCookie: 'testValue' },
@@ -207,15 +243,19 @@ describe('unstable_after()', () => {
     const cookie1 = await browser.elementById('cookie').text()
     expect(cookie1).toEqual('Cookie: null')
 
-    await browser.elementByCss('button[type="submit"]').click()
+    try {
+      await browser.elementByCss('button[type="submit"]').click()
 
-    await retry(async () => {
-      const cookie1 = await browser.elementById('cookie').text()
-      expect(cookie1).toEqual('Cookie: "action"')
-      // const newLogs = next.cliOutput.slice(cliOutputIndex)
-      // // after() from action
-      // expect(newLogs).toContain(EXPECTED_ERROR)
-    })
+      await retry(async () => {
+        const cookie1 = await browser.elementById('cookie').text()
+        expect(cookie1).toEqual('Cookie: "action"')
+        // const newLogs = next.cliOutput.slice(cliOutputIndex)
+        // // after() from action
+        // expect(newLogs).toContain(EXPECTED_ERROR)
+      })
+    } finally {
+      await browser.eval('document.cookie = "testCookie=;path=/;max-age=-1"')
+    }
   })
 
   if (isNextDev) {
@@ -275,38 +315,6 @@ describe('unstable_after()', () => {
           await cleanup()
         }
       })
-
-      describe('errors at compile time when used in pages dir', () => {
-        it.each([
-          {
-            path: '/pages-dir/invalid-in-gssp',
-            file: 'pages-dir/invalid-in-gssp.js',
-          },
-          {
-            path: '/pages-dir/123/invalid-in-gsp',
-            file: 'pages-dir/[id]/invalid-in-gsp.js',
-          },
-          {
-            path: '/pages-dir/invalid-in-page',
-            file: 'pages-dir/invalid-in-page.js',
-          },
-        ])('$file', async ({ path, file }) => {
-          const { session, cleanup } = await sandbox(
-            next,
-            new Map([[`pages/${file}`, await next.readFile(`_pages/${file}`)]]),
-            path
-          )
-
-          try {
-            expect(await session.getRedboxSource(true)).toMatch(
-              /You're importing a component that needs "?unstable_after"?\. That only works in a Server Component which is not supported in the pages\/ directory\./
-            )
-            expect(getLogs()).toHaveLength(0)
-          } finally {
-            await cleanup()
-          }
-        })
-      })
     })
   }
 })

test/e2e/app-dir/next-after/middleware.js → test/e2e/app-dir/next-after-app/middleware.js

@@ -1,6 +1,6 @@
 import { cookies } from 'next/headers'
 import { NextResponse, unstable_after as after } from 'next/server'
-import { cliLog } from './utils/log-cli'
+import { cliLog } from './utils/log'
 
 export function middleware(
   /** @type {import ('next/server').NextRequest} */ request