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
103d3ab4
Unverified
Commit
103d3ab4
authored
Feb 04, 2022
by
JJ Kasper
Committed by
GitHub
Feb 04, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure external middleware rewrite is handled correctly (#33962)
parent
0b1d5e17
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
77 additions
and
1 deletion
+77
-1
router.ts
packages/next/shared/lib/router/router.ts
+9
-1
_middleware.js
...integration/middleware/core/pages/rewrites/_middleware.js
+10
-0
index.js
test/integration/middleware/core/pages/rewrites/index.js
+8
-0
index.test.js
test/integration/middleware/core/test/index.test.js
+50
-0
No files found.
packages/next/shared/lib/router/router.ts
View file @
103d3ab4
...
...
@@ -1853,7 +1853,15 @@ export default class Router implements BaseRouter {
shouldCache
:
options
.
cache
,
})
if
(
preflight
.
rewrite
?.
startsWith
(
'/'
))
{
if
(
preflight
.
rewrite
)
{
// for external rewrites we need to do a hard navigation
// to the resource
if
(
!
preflight
.
rewrite
.
startsWith
(
'/'
))
{
return
{
type
:
'redirect'
,
destination
:
options
.
as
,
}
}
const
parsed
=
parseRelativeUrl
(
normalizeLocalePath
(
hasBasePath
(
preflight
.
rewrite
)
...
...
test/integration/middleware/core/pages/rewrites/_middleware.js
View file @
103d3ab4
...
...
@@ -6,6 +6,16 @@ import { NextResponse } from 'next/server'
export
async
function
middleware
(
request
)
{
const
url
=
request
.
nextUrl
if
(
url
.
pathname
.
startsWith
(
'/rewrites/about'
)
&&
url
.
searchParams
.
has
(
'override'
)
)
{
const
isExternal
=
url
.
searchParams
.
get
(
'override'
)
===
'external'
return
NextResponse
.
rewrite
(
isExternal
?
'https://example.com'
:
'/rewrites/a'
)
}
if
(
url
.
pathname
.
startsWith
(
'/rewrites/to-blog'
))
{
const
slug
=
url
.
pathname
.
split
(
'/'
).
pop
()
url
.
pathname
=
`/rewrites/fallback-true-blog/
${
slug
}
`
...
...
test/integration/middleware/core/pages/rewrites/index.js
View file @
103d3ab4
...
...
@@ -24,6 +24,14 @@ export default function Home() {
<
Link
href
=
"/rewrites/rewrite-me-without-hard-navigation?message=refreshed"
>
<
a
id
=
"link-with-rewritten-url"
>
Rewrite
me
without
a
hard
navigation
<
/a
>
<
/Link
>
<
div
/>
<
Link
href
=
"/rewrites/about?override=external"
>
<
a
id
=
"override-with-external-rewrite"
>
Rewrite
me
to
external
site
<
/a
>
<
/Link
>
<
div
/>
<
Link
href
=
"/rewrites/about?override=internal"
>
<
a
id
=
"override-with-internal-rewrite"
>
Rewrite
me
to
internal
path
<
/a
>
<
/Link
>
<
/div
>
)
}
test/integration/middleware/core/test/index.test.js
View file @
103d3ab4
...
...
@@ -162,6 +162,56 @@ function urlTests(log, locale = '') {
}
function
rewriteTests
(
log
,
locale
=
''
)
{
it
(
'should override with rewrite internally correctly'
,
async
()
=>
{
const
res
=
await
fetchViaHTTP
(
context
.
appPort
,
'/rewrites/about'
,
{
override
:
'internal'
},
{
redirect
:
'manual'
}
)
expect
(
res
.
status
).
toBe
(
200
)
expect
(
await
res
.
text
()).
toContain
(
'Welcome Page A'
)
const
browser
=
await
webdriver
(
context
.
appPort
,
`
${
locale
}
/rewrites`
)
await
browser
.
elementByCss
(
'#override-with-internal-rewrite'
).
click
()
await
check
(
()
=>
browser
.
eval
(
'document.documentElement.innerHTML'
),
/Welcome Page A/
)
expect
(
await
browser
.
eval
(
'window.location.pathname'
)).
toBe
(
`
${
locale
||
''
}
/rewrites/about`
)
expect
(
await
browser
.
eval
(
'window.location.search'
)).
toBe
(
'?override=internal'
)
})
it
(
'should override with rewrite externally correctly'
,
async
()
=>
{
const
res
=
await
fetchViaHTTP
(
context
.
appPort
,
'/rewrites/about'
,
{
override
:
'external'
},
{
redirect
:
'manual'
}
)
expect
(
res
.
status
).
toBe
(
200
)
expect
(
await
res
.
text
()).
toContain
(
'Example Domain'
)
const
browser
=
await
webdriver
(
context
.
appPort
,
`
${
locale
}
/rewrites`
)
await
browser
.
elementByCss
(
'#override-with-external-rewrite'
).
click
()
await
check
(
()
=>
browser
.
eval
(
'document.documentElement.innerHTML'
),
/Example Domain/
)
expect
(
await
browser
.
eval
(
'window.location.pathname'
)).
toBe
(
`
${
locale
||
''
}
/rewrites/about`
)
expect
(
await
browser
.
eval
(
'window.location.search'
)).
toBe
(
'?override=external'
)
})
it
(
'should rewrite to fallback: true page successfully'
,
async
()
=>
{
const
randomSlug
=
`another-
${
Date
.
now
()}
`
const
res2
=
await
fetchViaHTTP
(
...
...
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