Merge remote-tracking branch 'origin/main' into feat/node-middleware-support

pieh · pieh · commit c5773b555ed5 · 2025-08-20T19:13:40.000+02:00
diff --git a/src/build/content/server.ts b/src/build/content/server.ts
@@ -18,6 +18,7 @@ import { wrapTracer } from '@opentelemetry/api/experimental'
 import glob from 'fast-glob'
 import type { MiddlewareManifest } from 'next/dist/build/webpack/plugins/middleware-plugin.js'
 import type { FunctionsConfigManifest } from 'next-with-cache-handler-v2/dist/build/index.js'
+import type { FunctionsConfigManifest } from 'next-with-cache-handler-v2/dist/build/index.js'
 import { prerelease, satisfies, lt as semverLowerThan, lte as semverLowerThanOrEqual } from 'semver'
 
 import type { RunConfig } from '../../run/config.js'
diff --git a/tests/fixtures/middleware-node/app/layout.js b/tests/fixtures/middleware-node/app/layout.js
@@ -0,0 +1,12 @@
+export const metadata = {
+  title: 'Simple Next App',
+  description: 'Description for Simple Next App',
+}
+
+export default function RootLayout({ children }) {
+  return (
+    <html lang="en">
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/tests/fixtures/middleware-node/app/page.js b/tests/fixtures/middleware-node/app/page.js
@@ -0,0 +1,7 @@
+export default function Home() {
+  return (
+    <main>
+      <h1>Home</h1>
+    </main>
+  )
+}
diff --git a/tests/fixtures/middleware-node/middleware.ts b/tests/fixtures/middleware-node/middleware.ts
@@ -0,0 +1,9 @@
+import type { NextRequest } from 'next/server'
+
+export async function middleware(request: NextRequest) {
+  console.log('Node.js Middleware request:', request.method, request.nextUrl.pathname)
+}
+
+export const config = {
+  runtime: 'nodejs',
+}
diff --git a/tests/fixtures/middleware-node/next.config.js b/tests/fixtures/middleware-node/next.config.js
@@ -0,0 +1,12 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  output: 'standalone',
+  eslint: {
+    ignoreDuringBuilds: true,
+  },
+  experimental: {
+    nodeMiddleware: true,
+  },
+}
+
+module.exports = nextConfig
diff --git a/tests/fixtures/middleware-node/package.json b/tests/fixtures/middleware-node/package.json
@@ -0,0 +1,20 @@
+{
+  "name": "middleware-node",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "postinstall": "next build",
+    "dev": "next dev",
+    "build": "next build"
+  },
+  "dependencies": {
+    "next": "latest",
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
+  },
+  "test": {
+    "dependencies": {
+      "next": ">=15.2.0"
+    }
+  }
+}
diff --git a/tests/integration/edge-handler.test.ts b/tests/integration/edge-handler.test.ts
@@ -661,3 +661,23 @@ describe('page router', () => {
     expect(bodyFr.nextUrlLocale).toBe('fr')
   })
 })
+
+test.skipIf(!nextVersionSatisfies('>=15.2.0'))<FixtureTestContext>(
+  'should throw an Not Supported error when node middleware is used',
+  async (ctx) => {
+    await createFixture('middleware-node', ctx)
+
+    const runPluginPromise = runPlugin(ctx)
+
+    await expect(runPluginPromise).rejects.toThrow('Node.js middleware is not yet supported.')
+    await expect(runPluginPromise).rejects.toThrow(
+      'Future @netlify/plugin-nextjs release will support node middleware with following limitations:',
+    )
+    await expect(runPluginPromise).rejects.toThrow(
+      ' - usage of C++ Addons (https://nodejs.org/api/addons.html) not supported (for example `bcrypt` npm module will not be supported, but `bcryptjs` will be supported)',
+    )
+    await expect(runPluginPromise).rejects.toThrow(
+      ' - usage of Filesystem (https://nodejs.org/api/fs.html) not supported',
+    )
+  },
+)
diff --git a/tests/utils/next-version-helpers.mjs b/tests/utils/next-version-helpers.mjs
@@ -33,9 +33,9 @@ export function isNextCanary() {
 export function shouldHaveAppRouterNotFoundInPrerenderManifest() {
   // https://github.com/vercel/next.js/pull/82199
 
-  // The canary versions are out of band, as there stable/latest patch versions higher than base of canary versions
-  // and change was not backported to stable versions
-  return nextVersionSatisfies('>=15.4.2-canary.33') && isNextCanary()
+  // The canary versions are out of band, as there stable/latest patch versions higher than base of canary versions without
+  // the change included
+  return nextVersionSatisfies(isNextCanary() ? '>=15.4.2-canary.33' : '>=15.5.0')
 }
 
 export function hasNodeMiddlewareSupport() {
