@@ -71,6 +71,7 @@ import type { LoadComponentsReturnType } from './load-components'
71
71
import isError , { getProperError } from '../lib/is-error'
72
72
import { splitCookiesString , toNodeOutgoingHttpHeaders } from './web/utils'
73
73
import { getMiddlewareRouteMatcher } from '../shared/lib/router/utils/middleware-route-matcher'
74
+ import { getDefaultMiddlewareMatcher } from '../shared/lib/router/utils/get-default-middleware-matcher'
74
75
import { loadEnvConfig } from '@next/env'
75
76
import { urlQueryToSearchParams } from '../shared/lib/router/utils/querystring'
76
77
import { removeTrailingSlash } from '../shared/lib/router/utils/remove-trailing-slash'
@@ -1455,13 +1456,13 @@ export default class NextNodeServer extends BaseServer<
1455
1456
const middlewareModule = await this . loadNodeMiddleware ( )
1456
1457
1457
1458
if ( middlewareModule ) {
1459
+ const matchers = middlewareModule . config ?. matchers || [
1460
+ getDefaultMiddlewareMatcher ( this . nextConfig ) ,
1461
+ ]
1458
1462
return {
1459
- match : getMiddlewareRouteMatcher (
1460
- middlewareModule . config ?. matchers || [
1461
- { regexp : '.*' , originalSource : '/:path*' } ,
1462
- ]
1463
- ) ,
1463
+ match : getMiddlewareRouteMatcher ( matchers ) ,
1464
1464
page : '/' ,
1465
+ matchers,
1465
1466
}
1466
1467
}
1467
1468
@@ -1471,6 +1472,7 @@ export default class NextNodeServer extends BaseServer<
1471
1472
return {
1472
1473
match : getMiddlewareMatcher ( middleware ) ,
1473
1474
page : '/' ,
1475
+ matchers : middleware . matchers ,
1474
1476
}
1475
1477
}
1476
1478
@@ -1679,6 +1681,7 @@ export default class NextNodeServer extends BaseServer<
1679
1681
return { finished : false }
1680
1682
}
1681
1683
1684
+
1682
1685
await this . ensureMiddleware ( params . request . url )
1683
1686
const middlewareInfo = this . getEdgeFunctionInfo ( {
1684
1687
page : middleware . page ,
0 commit comments