test: move middleware-i18n-static-asset-matcher to test variants

Author: pieh

tests/e2e/edge-middleware.test.ts

@@ -13,6 +13,7 @@ type ExtendedFixtures = {
   edgeOrNodeMiddlewarePages: Fixture
   edgeOrNodeMiddlewareI18n: Fixture
   edgeOrNodeMiddlewareI18nExcludedPaths: Fixture
+  edgeOrNodeMiddlewareStaticAssetMatcher: Fixture
 }
 
 for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
@@ -52,6 +53,14 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
           scope: 'worker',
         },
       ],
+      edgeOrNodeMiddlewareStaticAssetMatcher: [
+        async ({ middlewareStaticAssetMatcher }, use) => {
+          await use(middlewareStaticAssetMatcher)
+        },
+        {
+          scope: 'worker',
+        },
+      ],
     }),
   },
   hasNodeMiddlewareSupport()
@@ -91,6 +100,14 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
               scope: 'worker',
             },
           ],
+          edgeOrNodeMiddlewareStaticAssetMatcher: [
+            async ({ middlewareStaticAssetMatcherNode }, use) => {
+              await use(middlewareStaticAssetMatcherNode)
+            },
+            {
+              scope: 'worker',
+            },
+          ],
         }),
       }
     : undefined,
@@ -468,16 +485,17 @@ for (const { expectedRuntime, label, testWithSwitchableMiddlewareRuntime } of [
       })
     })
 
-    if (expectedRuntime !== 'node') {
-      test('requests with different encoding than matcher match anyway', async ({
-        middlewareStaticAssetMatcher,
-      }) => {
-        const response = await fetch(`${middlewareStaticAssetMatcher.url}/hello%2Fworld.txt`)
+    test('requests with different encoding than matcher match anyway', async ({
+      edgeOrNodeMiddlewareStaticAssetMatcher,
+    }) => {
+      const response = await fetch(
+        `${edgeOrNodeMiddlewareStaticAssetMatcher.url}/hello%2Fworld.txt`,
+      )
 
-        // middleware was not skipped
-        expect(await response.text()).toBe('hello from middleware')
-      })
-    }
+      // middleware was not skipped
+      expect(await response.text()).toBe('hello from middleware')
+      expect(response.headers.get('x-runtime')).toEqual(expectedRuntime)
+    })
 
     test.describe('RSC cache poisoning', () => {
       test('Middleware rewrite', async ({ page, edgeOrNodeMiddleware }) => {

tests/fixtures/middleware-static-asset-matcher/middleware-node.ts

@@ -0,0 +1,6 @@
+export { middleware } from './middleware-shared'
+
+export const config = {
+  matcher: '/hello/world.txt',
+  runtime: 'nodejs',
+}

tests/fixtures/middleware-static-asset-matcher/middleware-shared.ts

@@ -0,0 +1,9 @@
+export function middleware() {
+  return new Response('hello from middleware', {
+    headers: {
+      // report Next.js Middleware Runtime (not the execution runtime, but target runtime)
+      // @ts-expect-error EdgeRuntime global not declared
+      'x-runtime': typeof EdgeRuntime !== 'undefined' ? EdgeRuntime : 'node',
+    },
+  })
+}

tests/fixtures/middleware-static-asset-matcher/middleware.ts

@@ -1,6 +1,4 @@
-export default function middleware() {
-  return new Response('hello from middleware')
-}
+export { middleware } from './middleware-shared'
 
 export const config = {
   matcher: '/hello/world.txt',

tests/fixtures/middleware-static-asset-matcher/next.config.js

@@ -1,9 +1,13 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   output: 'standalone',
+  distDir: process.env.NEXT_DIST_DIR ?? '.next',
   eslint: {
     ignoreDuringBuilds: true,
   },
+  experimental: {
+    nodeMiddleware: true,
+  },
   outputFileTracingRoot: __dirname,
 }
 

tests/fixtures/middleware-static-asset-matcher/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",

tests/fixtures/middleware-static-asset-matcher/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"
+          }
+        ]
+      }
+    }
+  }
+}

tests/utils/create-e2e-fixture.ts

@@ -366,6 +366,11 @@ export const fixtureFactories = {
       publishDirectory: '.next-node-middleware',
     }),
   middlewareStaticAssetMatcher: () => createE2EFixture('middleware-static-asset-matcher'),
+  middlewareStaticAssetMatcherNode: () =>
+    createE2EFixture('middleware-static-asset-matcher', {
+      buildCommand: getBuildFixtureVariantCommand('node-middleware'),
+      publishDirectory: '.next-node-middleware',
+    }),
   middlewareSubrequestVuln: () => createE2EFixture('middleware-subrequest-vuln'),
   pageRouter: () => createE2EFixture('page-router'),
   pageRouterBasePathI18n: () => createE2EFixture('page-router-base-path-i18n'),