Fix no-server-import-in-page eslint rule for subfolder middleware (#3…

…2139) People have been reporting on #30973 that the `no-server-import-in-page` eslint rule is reporting false positives for `_middleware` files inside sub-page folders. Unlike `_document`, we can have multiple `_middleware` files. Fixes #32121
vercel · Dec 5, 2021 · 5b4e139 · 5b4e139
1 parent 20814c3
commit 5b4e139
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/packages/eslint-plugin-next/lib/rules/no-server-import-in-page.js b/packages/eslint-plugin-next/lib/rules/no-server-import-in-page.js
@@ -21,8 +21,8 @@ module.exports = {
 
         if (
           !page ||
-          page.startsWith(`${path.sep}_middleware`) ||
-          page.startsWith(`${path.posix.sep}_middleware`)
+          page.includes(`${path.sep}_middleware`) ||
+          page.includes(`${path.posix.sep}_middleware`)
         ) {
           return
         }

diff --git a/test/unit/eslint-plugin-next/no-server-import-in-page.test.ts b/test/unit/eslint-plugin-next/no-server-import-in-page.test.ts
@@ -78,6 +78,15 @@ ruleTester.run('no-server-import-in-page', rule, {
     `,
       filename: 'pagesapp/src/pages/_middleware.js',
     },
+    {
+      code: `import { NextFetchEvent, NextRequest } from "next/server"
+
+      export function middleware(req, ev) {
+        return new Response('Hello, world!')
+      }
+    `,
+      filename: 'src/pages/subFolder/_middleware.js',
+    },
   ],
   invalid: [
     {