Unverified Commit b3000594 authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Fix invalid middleware regexp in manifest (#37492)

parent 28a56d82
...@@ -394,7 +394,7 @@ function getCreateAssets(params: { ...@@ -394,7 +394,7 @@ function getCreateAssets(params: {
const { namedRegex } = getNamedMiddlewareRegex(page, { const { namedRegex } = getNamedMiddlewareRegex(page, {
catchAll: !metadata.edgeSSR, catchAll: !metadata.edgeSSR,
}) })
const regexp = metadata?.edgeMiddleware?.matcherRegexp ?? namedRegex const regexp = metadata?.edgeMiddleware?.matcherRegexp || namedRegex
middlewareManifest.middleware[page] = { middlewareManifest.middleware[page] = {
env: Array.from(metadata.env), env: Array.from(metadata.env),
......
...@@ -1431,6 +1431,12 @@ function getMiddlewareMatcher( ...@@ -1431,6 +1431,12 @@ function getMiddlewareMatcher(
return stored return stored
} }
if (typeof info.regexp !== 'string' || !info.regexp) {
throw new Error(
`Invariant: invalid regexp for middleware ${JSON.stringify(info)}`
)
}
const matcher = getRouteMatcher({ re: new RegExp(info.regexp), groups: {} }) const matcher = getRouteMatcher({ re: new RegExp(info.regexp), groups: {} })
MiddlewareMatcherCache.set(info, matcher) MiddlewareMatcherCache.set(info, matcher)
return matcher return matcher
......
...@@ -113,6 +113,22 @@ describe('Middleware Runtime', () => { ...@@ -113,6 +113,22 @@ describe('Middleware Runtime', () => {
}) })
}) })
it('should have valid middleware field in manifest', async () => {
const manifest = await fs.readJSON(
join(context.appDir, '.next/server/middleware-manifest.json')
)
expect(manifest.middleware).toEqual({
'/': {
env: ['MIDDLEWARE_TEST'],
files: ['server/edge-runtime-webpack.js', 'server/middleware.js'],
name: 'middleware',
page: '/',
regexp: '^/.*$',
wasm: [],
},
})
})
it('should have middleware warning during build', () => { it('should have middleware warning during build', () => {
expect(context.buildLogs.output).toContain(middlewareWarning) expect(context.buildLogs.output).toContain(middlewareWarning)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment