test: move middleware-trailing-slash to test variants

Author: pieh

tests/fixtures/middleware-trailing-slash/middleware-node.ts

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

tests/fixtures/middleware-trailing-slash/middleware-shared.ts

@@ -0,0 +1,60 @@
+import type { NextRequest } from 'next/server'
+import { NextResponse } from 'next/server'
+
+export 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)
+  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 requestHeaders = new Headers(request.headers)
+
+  requestHeaders.set('x-hello-from-middleware-req', 'hello')
+
+  if (request.nextUrl.pathname === '/test/next/') {
+    return NextResponse.next({
+      request: {
+        headers: requestHeaders,
+      },
+    })
+  }
+
+  if (request.nextUrl.pathname === '/test/redirect/') {
+    return NextResponse.redirect(new URL('/other', request.url))
+  }
+
+  if (request.nextUrl.pathname === '/test/redirect-with-headers/') {
+    return NextResponse.redirect(new URL('/other', request.url), {
+      headers: { 'x-header-from-redirect': 'hello' },
+    })
+  }
+
+  if (request.nextUrl.pathname === '/test/rewrite-internal/') {
+    return NextResponse.rewrite(new URL('/rewrite-target', request.url), {
+      request: {
+        headers: requestHeaders,
+      },
+    })
+  }
+
+  if (request.nextUrl.pathname === '/test/rewrite-external/') {
+    const requestURL = new URL(request.url)
+    const externalURL = new URL(requestURL.searchParams.get('external-url') as string)
+
+    externalURL.searchParams.set('from', 'middleware')
+
+    return NextResponse.rewrite(externalURL, {
+      request: {
+        headers: requestHeaders,
+      },
+    })
+  }
+
+  return NextResponse.json({ error: 'Error' }, { status: 500 })
+}

tests/fixtures/middleware-trailing-slash/middleware.ts

@@ -1,58 +1 @@
-import type { NextRequest } from 'next/server'
-import { NextResponse } from 'next/server'
-
-export function middleware(request: NextRequest) {
-  const response = getResponse(request)
-
-  response.headers.append('Deno' in globalThis ? 'x-deno' : 'x-node', Date.now().toString())
-  response.headers.set('x-hello-from-middleware-res', 'hello')
-
-  return response
-}
-
-const getResponse = (request: NextRequest) => {
-  const requestHeaders = new Headers(request.headers)
-
-  requestHeaders.set('x-hello-from-middleware-req', 'hello')
-
-  if (request.nextUrl.pathname === '/test/next/') {
-    return NextResponse.next({
-      request: {
-        headers: requestHeaders,
-      },
-    })
-  }
-
-  if (request.nextUrl.pathname === '/test/redirect/') {
-    return NextResponse.redirect(new URL('/other', request.url))
-  }
-
-  if (request.nextUrl.pathname === '/test/redirect-with-headers/') {
-    return NextResponse.redirect(new URL('/other', request.url), {
-      headers: { 'x-header-from-redirect': 'hello' },
-    })
-  }
-
-  if (request.nextUrl.pathname === '/test/rewrite-internal/') {
-    return NextResponse.rewrite(new URL('/rewrite-target', request.url), {
-      request: {
-        headers: requestHeaders,
-      },
-    })
-  }
-
-  if (request.nextUrl.pathname === '/test/rewrite-external/') {
-    const requestURL = new URL(request.url)
-    const externalURL = new URL(requestURL.searchParams.get('external-url') as string)
-
-    externalURL.searchParams.set('from', 'middleware')
-
-    return NextResponse.rewrite(externalURL, {
-      request: {
-        headers: requestHeaders,
-      },
-    })
-  }
-
-  return NextResponse.json({ error: 'Error' }, { status: 500 })
-}
+export { middleware } from './middleware-shared'

tests/fixtures/middleware-trailing-slash/next.config.js

@@ -2,9 +2,13 @@
 const nextConfig = {
   trailingSlash: true,
   output: 'standalone',
+  distDir: process.env.NEXT_DIST_DIR ?? '.next',
   eslint: {
     ignoreDuringBuilds: true,
   },
+  experimental: {
+    nodeMiddleware: true,
+  },
   outputFileTracingRoot: __dirname,
 }
 

tests/fixtures/middleware-trailing-slash/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-trailing-slash/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

@@ -337,58 +337,60 @@ for (const {
         }
       })
     })
-  })
-}
 
-describe('should run middleware on data requests', () => {
-  test<FixtureTestContext>('when `trailingSlash: false`', async (ctx) => {
-    await createFixture('middleware', ctx)
-    await runPlugin(ctx)
+    describe('should run middleware on data requests', () => {
+      test<FixtureTestContext>('when `trailingSlash: false`', async (ctx) => {
+        await createFixture('middleware', ctx)
+        await runPlugin(ctx, runPluginConstants)
 
-    const origin = new LocalServer()
-    const response = await invokeEdgeFunction(ctx, {
-      functions: [EDGE_MIDDLEWARE_FUNCTION_NAME],
-      origin,
-      redirect: 'manual',
-      url: '/_next/data/dJvEyLV8MW7CBLFf0Ecbk/test/redirect-with-headers.json',
-    })
+        const origin = new LocalServer()
+        const response = await invokeEdgeFunction(ctx, {
+          functions: [edgeFunctionNameRoot],
+          origin,
+          redirect: 'manual',
+          url: '/_next/data/dJvEyLV8MW7CBLFf0Ecbk/test/redirect-with-headers.json',
+        })
 
-    ctx.cleanup?.push(() => origin.stop())
+        ctx.cleanup?.push(() => origin.stop())
 
-    expect(response.status).toBe(307)
-    expect(response.headers.get('location'), 'added a location header').toBeTypeOf('string')
-    expect(
-      new URL(response.headers.get('location') as string).pathname,
-      'redirected to the correct path',
-    ).toEqual('/other')
-    expect(response.headers.get('x-header-from-redirect'), 'hello').toBe('hello')
-    expect(origin.calls).toBe(0)
-  })
+        expect(response.status).toBe(307)
+        expect(response.headers.get('location'), 'added a location header').toBeTypeOf('string')
+        expect(
+          new URL(response.headers.get('location') as string).pathname,
+          'redirected to the correct path',
+        ).toEqual('/other')
+        expect(response.headers.get('x-header-from-redirect'), 'hello').toBe('hello')
+        expect(response.headers.get('x-runtime')).toEqual(expectedRuntime)
+        expect(origin.calls).toBe(0)
+      })
 
-  test<FixtureTestContext>('when `trailingSlash: true`', async (ctx) => {
-    await createFixture('middleware-trailing-slash', ctx)
-    await runPlugin(ctx)
+      test<FixtureTestContext>('when `trailingSlash: true`', async (ctx) => {
+        await createFixture('middleware-trailing-slash', ctx)
+        await runPlugin(ctx, runPluginConstants)
 
-    const origin = new LocalServer()
-    const response = await invokeEdgeFunction(ctx, {
-      functions: [EDGE_MIDDLEWARE_FUNCTION_NAME],
-      origin,
-      redirect: 'manual',
-      url: '/_next/data/dJvEyLV8MW7CBLFf0Ecbk/test/redirect-with-headers.json',
-    })
+        const origin = new LocalServer()
+        const response = await invokeEdgeFunction(ctx, {
+          functions: [edgeFunctionNameRoot],
+          origin,
+          redirect: 'manual',
+          url: '/_next/data/dJvEyLV8MW7CBLFf0Ecbk/test/redirect-with-headers.json',
+        })
 
-    ctx.cleanup?.push(() => origin.stop())
+        ctx.cleanup?.push(() => origin.stop())
 
-    expect(response.status).toBe(307)
-    expect(response.headers.get('location'), 'added a location header').toBeTypeOf('string')
-    expect(
-      new URL(response.headers.get('location') as string).pathname,
-      'redirected to the correct path',
-    ).toEqual('/other')
-    expect(response.headers.get('x-header-from-redirect'), 'hello').toBe('hello')
-    expect(origin.calls).toBe(0)
+        expect(response.status).toBe(307)
+        expect(response.headers.get('location'), 'added a location header').toBeTypeOf('string')
+        expect(
+          new URL(response.headers.get('location') as string).pathname,
+          'redirected to the correct path',
+        ).toEqual('/other')
+        expect(response.headers.get('x-header-from-redirect'), 'hello').toBe('hello')
+        expect(response.headers.get('x-runtime')).toEqual(expectedRuntime)
+        expect(origin.calls).toBe(0)
+      })
+    })
   })
-})
+}
 
 describe('page router', () => {
   test<FixtureTestContext>('edge api routes should work with middleware', async (ctx) => {