test: move middleware-pages to test variants

pieh · pieh · commit 8b5579f93f8e · 2025-08-21T10:10:36.000+02:00
diff --git a/tests/e2e/edge-middleware.test.ts b/tests/e2e/edge-middleware.test.ts
@@ -8,11 +8,16 @@ type ExtendedWindow = Window & {
   didReload?: boolean
 }
 
+type ExtendedFixtures = {
+  edgeOrNodeMiddleware: Fixture
+  edgeOrNodeMiddlewarePages: Fixture
+}
+
 for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
   {
     expectedRuntime: 'edge-runtime',
     label: 'Edge runtime middleware',
-    testWithSwitchableMiddlewareRuntime: test.extend<{}, { edgeOrNodeMiddleware: Fixture }>({
+    testWithSwitchableMiddlewareRuntime: test.extend<{}, ExtendedFixtures>({
       edgeOrNodeMiddleware: [
         async ({ middleware }, use) => {
           await use(middleware)
@@ -21,13 +26,21 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
           scope: 'worker',
         },
       ],
+      edgeOrNodeMiddlewarePages: [
+        async ({ middlewarePages }, use) => {
+          await use(middlewarePages)
+        },
+        {
+          scope: 'worker',
+        },
+      ],
     }),
   },
   hasNodeMiddlewareSupport()
     ? {
         expectedRuntime: 'node',
         label: 'Node.js runtime middleware',
-        testWithSwitchableMiddlewareRuntime: test.extend<{}, { edgeOrNodeMiddleware: Fixture }>({
+        testWithSwitchableMiddlewareRuntime: test.extend<{}, ExtendedFixtures>({
           edgeOrNodeMiddleware: [
             async ({ middlewareNode }, use) => {
               await use(middlewareNode)
@@ -36,6 +49,14 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
               scope: 'worker',
             },
           ],
+          edgeOrNodeMiddlewarePages: [
+            async ({ middlewarePagesNode }, use) => {
+              await use(middlewarePagesNode)
+            },
+            {
+              scope: 'worker',
+            },
+          ],
         }),
       }
     : undefined,
@@ -103,91 +124,95 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
         const size = await getImageSize(Buffer.from(imageBuffer), 'png')
         expect([size.width, size.height]).toEqual([1200, 630])
       })
+    }
 
-      test.describe('json data', () => {
-        const testConfigs = [
-          {
-            describeLabel: 'NextResponse.next() -> getServerSideProps page',
-            selector: 'NextResponse.next()#getServerSideProps',
-            jsonPathMatcher: '/link/next-getserversideprops.json',
-          },
-          {
-            describeLabel: 'NextResponse.next() -> getStaticProps page',
-            selector: 'NextResponse.next()#getStaticProps',
-            jsonPathMatcher: '/link/next-getstaticprops.json',
-          },
-          {
-            describeLabel: 'NextResponse.next() -> fully static page',
-            selector: 'NextResponse.next()#fullyStatic',
-            jsonPathMatcher: '/link/next-fullystatic.json',
-          },
-          {
-            describeLabel: 'NextResponse.rewrite() -> getServerSideProps page',
-            selector: 'NextResponse.rewrite()#getServerSideProps',
-            jsonPathMatcher: '/link/rewrite-me-getserversideprops.json',
-          },
-          {
-            describeLabel: 'NextResponse.rewrite() -> getStaticProps page',
-            selector: 'NextResponse.rewrite()#getStaticProps',
-            jsonPathMatcher: '/link/rewrite-me-getstaticprops.json',
-          },
-        ]
-
-        // Linking to static pages reloads on rewrite for versions below 14
-        if (nextVersionSatisfies('>=14.0.0')) {
-          testConfigs.push({
-            describeLabel: 'NextResponse.rewrite() -> fully static page',
-            selector: 'NextResponse.rewrite()#fullyStatic',
-            jsonPathMatcher: '/link/rewrite-me-fullystatic.json',
-          })
-        }
+    test.describe('json data', () => {
+      const testConfigs = [
+        {
+          describeLabel: 'NextResponse.next() -> getServerSideProps page',
+          selector: 'NextResponse.next()#getServerSideProps',
+          jsonPathMatcher: '/link/next-getserversideprops.json',
+        },
+        {
+          describeLabel: 'NextResponse.next() -> getStaticProps page',
+          selector: 'NextResponse.next()#getStaticProps',
+          jsonPathMatcher: '/link/next-getstaticprops.json',
+        },
+        {
+          describeLabel: 'NextResponse.next() -> fully static page',
+          selector: 'NextResponse.next()#fullyStatic',
+          jsonPathMatcher: '/link/next-fullystatic.json',
+        },
+        {
+          describeLabel: 'NextResponse.rewrite() -> getServerSideProps page',
+          selector: 'NextResponse.rewrite()#getServerSideProps',
+          jsonPathMatcher: '/link/rewrite-me-getserversideprops.json',
+        },
+        {
+          describeLabel: 'NextResponse.rewrite() -> getStaticProps page',
+          selector: 'NextResponse.rewrite()#getStaticProps',
+          jsonPathMatcher: '/link/rewrite-me-getstaticprops.json',
+        },
+      ]
+
+      // Linking to static pages reloads on rewrite for versions below 14
+      if (nextVersionSatisfies('>=14.0.0')) {
+        testConfigs.push({
+          describeLabel: 'NextResponse.rewrite() -> fully static page',
+          selector: 'NextResponse.rewrite()#fullyStatic',
+          jsonPathMatcher: '/link/rewrite-me-fullystatic.json',
+        })
+      }
 
-        test.describe('no 18n', () => {
-          for (const testConfig of testConfigs) {
-            test.describe(testConfig.describeLabel, () => {
-              test('json data fetch', async ({ middlewarePages, page }) => {
-                const dataFetchPromise = new Promise<Response>((resolve) => {
-                  page.on('response', (response) => {
-                    if (response.url().includes(testConfig.jsonPathMatcher)) {
-                      resolve(response)
-                    }
-                  })
+      test.describe('no 18n', () => {
+        for (const testConfig of testConfigs) {
+          test.describe(testConfig.describeLabel, () => {
+            test('json data fetch', async ({ edgeOrNodeMiddlewarePages, page }) => {
+              const dataFetchPromise = new Promise<Response>((resolve) => {
+                page.on('response', (response) => {
+                  if (response.url().includes(testConfig.jsonPathMatcher)) {
+                    resolve(response)
+                  }
                 })
+              })
 
-                await page.goto(`${middlewarePages.url}/link`)
+              const pageResponse = await page.goto(`${edgeOrNodeMiddlewarePages.url}/link`)
+              expect(await pageResponse?.headerValue('x-runtime')).toEqual(expectedRuntime)
 
-                await page.hover(`[data-link="${testConfig.selector}"]`)
+              await page.hover(`[data-link="${testConfig.selector}"]`)
 
-                const dataResponse = await dataFetchPromise
+              const dataResponse = await dataFetchPromise
 
-                expect(dataResponse.ok()).toBe(true)
-              })
+              expect(dataResponse.ok()).toBe(true)
+            })
 
-              test('navigation', async ({ middlewarePages, page }) => {
-                await page.goto(`${middlewarePages.url}/link`)
+            test('navigation', async ({ edgeOrNodeMiddlewarePages, page }) => {
+              const pageResponse = await page.goto(`${edgeOrNodeMiddlewarePages.url}/link`)
+              expect(await pageResponse?.headerValue('x-runtime')).toEqual(expectedRuntime)
 
-                await page.evaluate(() => {
-                  // set some value to window to check later if browser did reload and lost this state
-                  ;(window as ExtendedWindow).didReload = false
-                })
+              await page.evaluate(() => {
+                // set some value to window to check later if browser did reload and lost this state
+                ;(window as ExtendedWindow).didReload = false
+              })
 
-                await page.click(`[data-link="${testConfig.selector}"]`)
+              await page.click(`[data-link="${testConfig.selector}"]`)
 
-                // wait for page to be rendered
-                await page.waitForSelector(`[data-page="${testConfig.selector}"]`)
+              // wait for page to be rendered
+              await page.waitForSelector(`[data-page="${testConfig.selector}"]`)
 
-                // check if browser navigation worked by checking if state was preserved
-                const browserNavigationWorked =
-                  (await page.evaluate(() => {
-                    return (window as ExtendedWindow).didReload
-                  })) === false
+              // check if browser navigation worked by checking if state was preserved
+              const browserNavigationWorked =
+                (await page.evaluate(() => {
+                  return (window as ExtendedWindow).didReload
+                })) === false
 
-                // we expect client navigation to work without browser reload
-                expect(browserNavigationWorked).toBe(true)
-              })
+              // we expect client navigation to work without browser reload
+              expect(browserNavigationWorked).toBe(true)
             })
-          }
-        })
+          })
+        }
+      })
+      if (expectedRuntime !== 'node') {
         test.describe('with 18n', () => {
           for (const testConfig of testConfigs) {
             test.describe(testConfig.describeLabel, () => {
@@ -242,8 +267,10 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
             })
           }
         })
-      })
+      }
+    })
 
+    if (expectedRuntime !== 'node') {
       // those tests use `fetch` instead of `page.goto` intentionally to avoid potential client rendering
       // hiding any potential edge/server issues
       test.describe('Middleware with i18n and excluded paths', () => {
diff --git a/tests/fixtures/middleware-pages/middleware-node.ts b/tests/fixtures/middleware-pages/middleware-node.ts
@@ -0,0 +1,5 @@
+export { middleware } from './middleware-shared'
+
+export const config = {
+  runtime: 'nodejs',
+}
diff --git a/tests/fixtures/middleware-pages/middleware-shared.ts b/tests/fixtures/middleware-pages/middleware-shared.ts
@@ -1,6 +1,19 @@
+import type { NextRequest } from 'next/server'
 import { NextResponse, URLPattern } from 'next/server'
 
-export async function middleware(request) {
+export async function middleware(request: NextRequest) {
+  const response = getResponse(request)
+
+  response.headers.append('Deno' in globalThis ? 'x-deno' : 'x-node', Date.now().toString())
+  // report Next.js Middleware Runtime (not the execution runtime, but target runtime)
+  // @ts-expect-error EdgeRuntime global not declared
+  response.headers.append('x-runtime', typeof EdgeRuntime !== 'undefined' ? EdgeRuntime : 'node')
+  response.headers.set('x-hello-from-middleware-res', 'hello')
+
+  return response
+}
+
+const getResponse = (request: NextRequest) => {
   const url = request.nextUrl
 
   // this is needed for tests to get the BUILD_ID
@@ -93,7 +106,10 @@ export async function middleware(request) {
   })
 }
 
-const PATTERNS = [
+const PATTERNS: [
+  URLPattern,
+  (params: ReturnType<URLPattern['exec']>) => { pathname: string; params: Record<string, string> },
+][] = [
   [
     new URLPattern({ pathname: '/:locale/:id' }),
     ({ pathname }) => ({
diff --git a/tests/fixtures/middleware-pages/middleware.ts b/tests/fixtures/middleware-pages/middleware.ts
@@ -0,0 +1 @@
+export { middleware } from './middleware-shared'
diff --git a/tests/fixtures/middleware-pages/next.config.js b/tests/fixtures/middleware-pages/next.config.js
@@ -25,9 +25,13 @@ if (platform === 'win32') {
 module.exports = {
   trailingSlash: true,
   output: 'standalone',
+  distDir: process.env.NEXT_DIST_DIR ?? '.next',
   eslint: {
     ignoreDuringBuilds: true,
   },
+  experimental: {
+    nodeMiddleware: true,
+  },
   generateBuildId: () => 'build-id',
   redirects() {
     return [
diff --git a/tests/fixtures/middleware-pages/package.json b/tests/fixtures/middleware-pages/package.json
@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "postinstall": "next build",
+    "postinstall": "npm run build",
     "dev": "next dev",
-    "build": "next build"
+    "build": "node ../../utils/build-variants.mjs"
   },
   "dependencies": {
     "next": "latest",
diff --git a/tests/fixtures/middleware-pages/test-variants.json b/tests/fixtures/middleware-pages/test-variants.json
@@ -0,0 +1,21 @@
+{
+  "node-middleware": {
+    "distDir": ".next-node-middleware",
+    "files": {
+      "middleware.ts": "middleware-node.ts"
+    },
+    "test": {
+      "dependencies": {
+        "next": [
+          {
+            "versionConstraint": ">=15.2.0",
+            "canaryOnly": true
+          },
+          {
+            "versionConstraint": ">=15.5.0"
+          }
+        ]
+      }
+    }
+  }
+}
diff --git a/tests/integration/edge-handler.test.ts b/tests/integration/edge-handler.test.ts
diff --git a/tests/utils/create-e2e-fixture.ts b/tests/utils/create-e2e-fixture.ts

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export { middleware } from './middleware-shared'`