Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
b3000594
Unverified
Commit
b3000594
authored
Jun 06, 2022
by
JJ Kasper
Committed by
GitHub
Jun 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix invalid middleware regexp in manifest (#37492)
parent
28a56d82
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
middleware-plugin.ts
packages/next/build/webpack/plugins/middleware-plugin.ts
+1
-1
next-server.ts
packages/next/server/next-server.ts
+6
-0
index.test.js
test/integration/middleware-general/test/index.test.js
+16
-0
No files found.
packages/next/build/webpack/plugins/middleware-plugin.ts
View file @
b3000594
...
@@ -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
),
...
...
packages/next/server/next-server.ts
View file @
b3000594
...
@@ -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
...
...
test/integration/middleware-general/test/index.test.js
View file @
b3000594
...
@@ -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
)
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment