test: move middleware-i18n-skip-normalize to test variants

Author: pieh

tests/fixtures/middleware-i18n-skip-normalize/middleware-node.ts

@@ -0,0 +1,5 @@
+export { middleware } from './middleware-shared'
+
+export const config = {
+  runtime: 'nodejs',
+}

tests/fixtures/middleware-i18n-skip-normalize/middleware.js renamed to tests/fixtures/middleware-i18n-skip-normalize/middleware-shared.ts

@@ -1,6 +1,19 @@
+import type { NextRequest } from 'next/server'
 import { NextResponse } from 'next/server'
 
-export async function middleware(request) {
+export async function middleware(request: NextRequest) {
+  const response = getResponse(request)
+
+  if (response) {
+    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')
+  }
+}
+
+const getResponse = (request: NextRequest) => {
   const url = request.nextUrl
 
   // this is needed for tests to get the BUILD_ID

tests/fixtures/middleware-i18n-skip-normalize/middleware.ts

@@ -0,0 +1 @@
+export { middleware } from './middleware-shared'

tests/fixtures/middleware-i18n-skip-normalize/next.config.js

@@ -1,5 +1,6 @@
 module.exports = {
   output: 'standalone',
+  distDir: process.env.NEXT_DIST_DIR ?? '.next',
   eslint: {
     ignoreDuringBuilds: true,
   },
@@ -11,6 +12,7 @@ module.exports = {
   experimental: {
     clientRouterFilter: true,
     clientRouterFilterRedirects: true,
+    nodeMiddleware: true,
   },
   redirects() {
     return [

tests/fixtures/middleware-i18n-skip-normalize/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-i18n-skip-normalize/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/integration/edge-handler.test.ts

@@ -632,59 +632,59 @@ for (const {
         expect(bodyFr.nextUrlLocale).toBe('fr')
       })
 
-      test.skipIf(expectedRuntime === 'node')<FixtureTestContext>(
-        'should preserve locale in request.nextUrl with skipMiddlewareUrlNormalize',
-        async (ctx) => {
-          await createFixture('middleware-i18n-skip-normalize', ctx)
-          await runPlugin(ctx)
-          const origin = await LocalServer.run(async (req, res) => {
-            res.write(
-              JSON.stringify({
-                url: req.url,
-                headers: req.headers,
-              }),
-            )
-            res.end()
-          })
-          ctx.cleanup?.push(() => origin.stop())
+      test<FixtureTestContext>('should preserve locale in request.nextUrl with skipMiddlewareUrlNormalize', async (ctx) => {
+        await createFixture('middleware-i18n-skip-normalize', ctx)
+        await runPlugin(ctx, runPluginConstants)
+        const origin = await LocalServer.run(async (req, res) => {
+          res.write(
+            JSON.stringify({
+              url: req.url,
+              headers: req.headers,
+            }),
+          )
+          res.end()
+        })
+        ctx.cleanup?.push(() => origin.stop())
 
-          const response = await invokeEdgeFunction(ctx, {
-            functions: [EDGE_MIDDLEWARE_FUNCTION_NAME],
-            origin,
-            url: `/json`,
-          })
-          expect(response.status).toBe(200)
-          const body = await response.json()
+        const response = await invokeEdgeFunction(ctx, {
+          functions: [edgeFunctionNameRoot],
+          origin,
+          url: `/json`,
+        })
+        expect(response.status).toBe(200)
+        expect(response.headers.get('x-runtime')).toEqual(expectedRuntime)
+        const body = await response.json()
+
+        expect(body.requestUrlPathname).toBe('/json')
+        expect(body.nextUrlPathname).toBe('/json')
+        expect(body.nextUrlLocale).toBe('en')
 
-          expect(body.requestUrlPathname).toBe('/json')
-          expect(body.nextUrlPathname).toBe('/json')
-          expect(body.nextUrlLocale).toBe('en')
+        const responseEn = await invokeEdgeFunction(ctx, {
+          functions: [edgeFunctionNameRoot],
+          origin,
+          url: `/en/json`,
+        })
+        expect(responseEn.status).toBe(200)
+        expect(responseEn.headers.get('x-runtime')).toEqual(expectedRuntime)
+        const bodyEn = await responseEn.json()
 
-          const responseEn = await invokeEdgeFunction(ctx, {
-            functions: [EDGE_MIDDLEWARE_FUNCTION_NAME],
-            origin,
-            url: `/en/json`,
-          })
-          expect(responseEn.status).toBe(200)
-          const bodyEn = await responseEn.json()
+        expect(bodyEn.requestUrlPathname).toBe('/en/json')
+        expect(bodyEn.nextUrlPathname).toBe('/json')
+        expect(bodyEn.nextUrlLocale).toBe('en')
 
-          expect(bodyEn.requestUrlPathname).toBe('/en/json')
-          expect(bodyEn.nextUrlPathname).toBe('/json')
-          expect(bodyEn.nextUrlLocale).toBe('en')
+        const responseFr = await invokeEdgeFunction(ctx, {
+          functions: [edgeFunctionNameRoot],
+          origin,
+          url: `/fr/json`,
+        })
+        expect(responseFr.status).toBe(200)
+        expect(responseFr.headers.get('x-runtime')).toEqual(expectedRuntime)
+        const bodyFr = await responseFr.json()
 
-          const responseFr = await invokeEdgeFunction(ctx, {
-            functions: [EDGE_MIDDLEWARE_FUNCTION_NAME],
-            origin,
-            url: `/fr/json`,
-          })
-          expect(responseFr.status).toBe(200)
-          const bodyFr = await responseFr.json()
-
-          expect(bodyFr.requestUrlPathname).toBe('/fr/json')
-          expect(bodyFr.nextUrlPathname).toBe('/json')
-          expect(bodyFr.nextUrlLocale).toBe('fr')
-        },
-      )
+        expect(bodyFr.requestUrlPathname).toBe('/fr/json')
+        expect(bodyFr.nextUrlPathname).toBe('/json')
+        expect(bodyFr.nextUrlLocale).toBe('fr')
+      })
     })
   })
 }