move getMiddleware

vercel · Jan 19, 2022 · 03b0c4e · 03b0c4e
1 parent 09b4e4a
commit 03b0c4e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 13 deletions.
diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
@@ -41,7 +41,6 @@ import {
   getRouteRegex,
   getSortedRoutes,
   isDynamicRoute,
-  getMiddlewareRegex,
 } from '../shared/lib/router/utils'
 import * as envConfig from '../shared/lib/runtime-config'
 import { DecodeError, normalizeRepeatedSlashes } from '../shared/lib/utils'
@@ -193,6 +192,14 @@ export default abstract class Server {
   protected abstract generateImageRoutes(): Route[]
   protected abstract generateCatchAllMiddlewareRoute(): Route | undefined
   protected abstract getFilesystemPaths(): Set<string>
+  protected abstract getMiddleware(): {
+    match: (pathname: string | null | undefined) =>
+      | false
+      | {
+          [paramName: string]: string | string[]
+        }
+    page: string
+  }[]
   protected abstract findPageComponents(
     pathname: string,
     query?: NextParsedUrlQuery,
@@ -668,18 +675,6 @@ export default abstract class Server {
     return this.getPrerenderManifest().preview
   }
 
-  protected getMiddleware() {
-    const middleware = this.middlewareManifest?.middleware || {}
-    return (
-      this.middlewareManifest?.sortedMiddleware.map((page) => ({
-        match: getRouteMatcher(
-          getMiddlewareRegex(page, MIDDLEWARE_ROUTE.test(middleware[page].name))
-        ),
-        page,
-      })) || []
-    )
-  }
-
   protected async hasMiddleware(
     pathname: string,
     _isSSR?: boolean

diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
@@ -58,6 +58,8 @@ import { relativizeURL } from '../shared/lib/router/utils/relativize-url'
 import { parseNextUrl } from '../shared/lib/router/utils/parse-next-url'
 import { prepareDestination } from '../shared/lib/router/utils/prepare-destination'
 import { normalizeLocalePath } from '../shared/lib/i18n/normalize-locale-path'
+import { getMiddlewareRegex, getRouteMatcher } from '../shared/lib/router/utils'
+import { MIDDLEWARE_ROUTE } from '../lib/constants'
 
 export * from './base-server'
 
@@ -771,6 +773,18 @@ export default class NextNodeServer extends BaseServer {
     }
   }
 
+  protected getMiddleware() {
+    const middleware = this.middlewareManifest?.middleware || {}
+    return (
+      this.middlewareManifest?.sortedMiddleware.map((page) => ({
+        match: getRouteMatcher(
+          getMiddlewareRegex(page, MIDDLEWARE_ROUTE.test(middleware[page].name))
+        ),
+        page,
+      })) || []
+    )
+  }
+
   private middlewareBetaWarning = execOnce(() => {
     Log.warn(
       `using beta Middleware (not covered by semver) - https://nextjs.org/docs/messages/beta-middleware`