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
8a067804
Unverified
Commit
8a067804
authored
May 28, 2021
by
JJ Kasper
Committed by
GitHub
May 28, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure providing only query on dynamic route works as expected (#25469)
parent
d836ebb2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
157 additions
and
16 deletions
+157
-16
link.tsx
packages/next/client/link.tsx
+3
-7
router.ts
packages/next/next-server/lib/router/router.ts
+11
-7
index.js
test/integration/dynamic-routing/pages/[name]/index.js
+47
-0
index.test.js
test/integration/dynamic-routing/test/index.test.js
+96
-2
No files found.
packages/next/client/link.tsx
View file @
8a067804
...
@@ -211,19 +211,15 @@ function Link(props: React.PropsWithChildren<LinkProps>) {
...
@@ -211,19 +211,15 @@ function Link(props: React.PropsWithChildren<LinkProps>) {
}
}
}
}
const
p
=
props
.
prefetch
!==
false
const
p
=
props
.
prefetch
!==
false
const
router
=
useRouter
()
const
router
=
useRouter
()
const
pathname
=
(
router
&&
router
.
asPath
)
||
'/'
const
{
href
,
as
}
=
React
.
useMemo
(()
=>
{
const
{
href
,
as
}
=
React
.
useMemo
(()
=>
{
const
[
resolvedHref
,
resolvedAs
]
=
resolveHref
(
pathname
,
props
.
href
,
true
)
const
[
resolvedHref
,
resolvedAs
]
=
resolveHref
(
router
,
props
.
href
,
true
)
return
{
return
{
href
:
resolvedHref
,
href
:
resolvedHref
,
as
:
props
.
as
as
:
props
.
as
?
resolveHref
(
router
,
props
.
as
)
:
resolvedAs
||
resolvedHref
,
?
resolveHref
(
pathname
,
props
.
as
)
:
resolvedAs
||
resolvedHref
,
}
}
},
[
pathname
,
props
.
href
,
props
.
as
])
},
[
router
,
props
.
href
,
props
.
as
])
let
{
children
,
replace
,
shallow
,
scroll
,
locale
}
=
props
let
{
children
,
replace
,
shallow
,
scroll
,
locale
}
=
props
...
...
packages/next/next-server/lib/router/router.ts
View file @
8a067804
...
@@ -173,7 +173,8 @@ export function delBasePath(path: string): string {
...
@@ -173,7 +173,8 @@ export function delBasePath(path: string): string {
*/
*/
export
function
isLocalURL
(
url
:
string
):
boolean
{
export
function
isLocalURL
(
url
:
string
):
boolean
{
// prevent a hydration mismatch on href for url with anchor refs
// prevent a hydration mismatch on href for url with anchor refs
if
(
url
.
startsWith
(
'/'
)
||
url
.
startsWith
(
'#'
))
return
true
if
(
url
.
startsWith
(
'/'
)
||
url
.
startsWith
(
'#'
)
||
url
.
startsWith
(
'?'
))
return
true
try
{
try
{
// absolute urls can be local if they are on the same origin
// absolute urls can be local if they are on the same origin
const
locationOrigin
=
getLocationOrigin
()
const
locationOrigin
=
getLocationOrigin
()
...
@@ -266,21 +267,24 @@ function omitParmsFromQuery(query: ParsedUrlQuery, params: string[]) {
...
@@ -266,21 +267,24 @@ function omitParmsFromQuery(query: ParsedUrlQuery, params: string[]) {
* Preserves absolute urls.
* Preserves absolute urls.
*/
*/
export
function
resolveHref
(
export
function
resolveHref
(
currentPath
:
string
,
router
:
NextRouter
,
href
:
Url
,
href
:
Url
,
resolveAs
?:
boolean
resolveAs
?:
boolean
):
string
{
):
string
{
// we use a dummy base url for relative urls
// we use a dummy base url for relative urls
let
base
:
URL
let
base
:
URL
const
urlAsString
=
typeof
href
===
'string'
?
href
:
formatWithValidation
(
href
)
try
{
try
{
base
=
new
URL
(
currentPath
,
'http://n'
)
base
=
new
URL
(
urlAsString
.
startsWith
(
'#'
)
?
router
.
asPath
:
router
.
pathname
,
'http://n'
)
}
catch
(
_
)
{
}
catch
(
_
)
{
// fallback to / for invalid asPath values e.g. //
// fallback to / for invalid asPath values e.g. //
base
=
new
URL
(
'/'
,
'http://n'
)
base
=
new
URL
(
'/'
,
'http://n'
)
}
}
const
urlAsString
=
typeof
href
===
'string'
?
href
:
formatWithValidation
(
href
)
// Return because it cannot be routed by the Next.js router
// Return because it cannot be routed by the Next.js router
if
(
!
isLocalURL
(
urlAsString
))
{
if
(
!
isLocalURL
(
urlAsString
))
{
return
(
resolveAs
?
[
urlAsString
]
:
urlAsString
)
as
string
return
(
resolveAs
?
[
urlAsString
]
:
urlAsString
)
as
string
...
@@ -335,7 +339,7 @@ function stripOrigin(url: string) {
...
@@ -335,7 +339,7 @@ function stripOrigin(url: string) {
function
prepareUrlAs
(
router
:
NextRouter
,
url
:
Url
,
as
?:
Url
)
{
function
prepareUrlAs
(
router
:
NextRouter
,
url
:
Url
,
as
?:
Url
)
{
// If url and as provided as an object representation,
// If url and as provided as an object representation,
// we'll format them into the string version here.
// we'll format them into the string version here.
let
[
resolvedHref
,
resolvedAs
]
=
resolveHref
(
router
.
asPath
,
url
,
true
)
let
[
resolvedHref
,
resolvedAs
]
=
resolveHref
(
router
,
url
,
true
)
const
origin
=
getLocationOrigin
()
const
origin
=
getLocationOrigin
()
const
hrefHadOrigin
=
resolvedHref
.
startsWith
(
origin
)
const
hrefHadOrigin
=
resolvedHref
.
startsWith
(
origin
)
const
asHadOrigin
=
resolvedAs
&&
resolvedAs
.
startsWith
(
origin
)
const
asHadOrigin
=
resolvedAs
&&
resolvedAs
.
startsWith
(
origin
)
...
@@ -345,7 +349,7 @@ function prepareUrlAs(router: NextRouter, url: Url, as?: Url) {
...
@@ -345,7 +349,7 @@ function prepareUrlAs(router: NextRouter, url: Url, as?: Url) {
const
preparedUrl
=
hrefHadOrigin
?
resolvedHref
:
addBasePath
(
resolvedHref
)
const
preparedUrl
=
hrefHadOrigin
?
resolvedHref
:
addBasePath
(
resolvedHref
)
const
preparedAs
=
as
const
preparedAs
=
as
?
stripOrigin
(
resolveHref
(
router
.
asPath
,
as
))
?
stripOrigin
(
resolveHref
(
router
,
as
))
:
resolvedAs
||
resolvedHref
:
resolvedAs
||
resolvedHref
return
{
return
{
...
...
test/integration/dynamic-routing/pages/[name]/index.js
View file @
8a067804
...
@@ -14,6 +14,53 @@ const Page = () => {
...
@@ -14,6 +14,53 @@ const Page = () => {
<
a
id
=
"dynamic-route-only-hash-obj"
>
Dynamic
route
only
hash
object
<
/a
>
<
a
id
=
"dynamic-route-only-hash-obj"
>
Dynamic
route
only
hash
object
<
/a
>
<
/Link
>
<
/Link
>
<
br
/>
<
br
/>
<
Link
href
=
"?name=post-2"
>
<
a
id
=
"dynamic-route-only-query"
>
Dynamic
route
only
query
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
"?name=post-3&another=value"
>
<
a
id
=
"dynamic-route-only-query-extra"
>
Dynamic
route
only
query
extra
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
{{
query
:
{
name
:
'post-4'
}
}}
>
<
a
id
=
"dynamic-route-only-query-obj"
>
Dynamic
route
only
query
object
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
{{
query
:
{
name
:
'post-5'
,
another
:
'value'
}
}}
>
<
a
id
=
"dynamic-route-only-query-obj-extra"
>
Dynamic
route
only
query
object
extra
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
"?name=post-2#hash-too"
>
<
a
id
=
"dynamic-route-query-hash"
>
Dynamic
route
query
and
hash
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
"?name=post-3&another=value#hash-again"
>
<
a
id
=
"dynamic-route-query-extra-hash"
>
Dynamic
route
query
extra
and
hash
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
{{
query
:
{
name
:
'post-4'
},
hash
:
'hash-too'
}}
>
<
a
id
=
"dynamic-route-query-hash-obj"
>
Dynamic
route
query
and
hash
object
<
/a
>
<
/Link
>
<
br
/>
<
Link
href
=
{{
query
:
{
name
:
'post-5'
,
another
:
'value'
},
hash
:
'hash-again'
,
}}
>
<
a
id
=
"dynamic-route-query-obj-extra-hash"
>
Dynamic
route
query
and
hash
object
extra
<
/a
>
<
/Link
>
<
br
/>
<
p
id
=
"asdf"
>
This
is
{
query
.
name
}
<
/p
>
<
p
id
=
"asdf"
>
This
is
{
query
.
name
}
<
/p
>
<
p
id
=
"query"
>
{
JSON
.
stringify
(
query
)}
<
/p
>
<
p
id
=
"query"
>
{
JSON
.
stringify
(
query
)}
<
/p
>
<
/
>
<
/
>
...
...
test/integration/dynamic-routing/test/index.test.js
View file @
8a067804
...
@@ -30,23 +30,117 @@ const appDir = join(__dirname, '../')
...
@@ -30,23 +30,117 @@ const appDir = join(__dirname, '../')
const
buildIdPath
=
join
(
appDir
,
'.next/BUILD_ID'
)
const
buildIdPath
=
join
(
appDir
,
'.next/BUILD_ID'
)
function
runTests
(
dev
)
{
function
runTests
(
dev
)
{
it
(
'should handle only query on dynamic route'
,
async
()
=>
{
const
browser
=
await
webdriver
(
appPort
,
'/post-1'
)
for
(
const
expectedValues
of
[
{
id
:
'dynamic-route-only-query'
,
pathname
:
'/post-2'
,
query
:
{},
hash
:
''
,
navQuery
:
{
name
:
'post-2'
},
},
{
id
:
'dynamic-route-only-query-extra'
,
pathname
:
'/post-3'
,
query
:
{
another
:
'value'
},
hash
:
''
,
navQuery
:
{
name
:
'post-3'
,
another
:
'value'
},
},
{
id
:
'dynamic-route-only-query-obj'
,
pathname
:
'/post-4'
,
query
:
{},
hash
:
''
,
navQuery
:
{
name
:
'post-4'
},
},
{
id
:
'dynamic-route-only-query-obj-extra'
,
pathname
:
'/post-5'
,
query
:
{
another
:
'value'
},
hash
:
''
,
navQuery
:
{
name
:
'post-5'
,
another
:
'value'
},
},
{
id
:
'dynamic-route-query-hash'
,
pathname
:
'/post-2'
,
query
:
{},
hash
:
'#hash-too'
,
navQuery
:
{
name
:
'post-2'
},
},
{
id
:
'dynamic-route-query-extra-hash'
,
pathname
:
'/post-3'
,
query
:
{
another
:
'value'
},
hash
:
'#hash-again'
,
navQuery
:
{
name
:
'post-3'
,
another
:
'value'
},
},
{
id
:
'dynamic-route-query-hash-obj'
,
pathname
:
'/post-4'
,
query
:
{},
hash
:
'#hash-too'
,
navQuery
:
{
name
:
'post-4'
},
},
{
id
:
'dynamic-route-query-obj-extra-hash'
,
pathname
:
'/post-5'
,
query
:
{
another
:
'value'
},
hash
:
'#hash-again'
,
navQuery
:
{
name
:
'post-5'
,
another
:
'value'
},
},
])
{
const
{
id
,
pathname
,
query
,
hash
,
navQuery
}
=
expectedValues
const
parsedHref
=
url
.
parse
(
await
browser
.
elementByCss
(
`#
${
id
}
`
).
getAttribute
(
'href'
),
true
)
expect
(
parsedHref
.
pathname
).
toBe
(
pathname
)
expect
(
parsedHref
.
query
||
{}).
toEqual
(
query
)
expect
(
parsedHref
.
hash
||
''
).
toBe
(
hash
)
await
browser
.
eval
(
'window.beforeNav = 1'
)
await
browser
.
elementByCss
(
`#
${
id
}
`
).
click
()
await
check
(()
=>
browser
.
eval
(
'window.location.pathname'
),
pathname
)
expect
(
JSON
.
parse
(
await
browser
.
elementByCss
(
'#query'
).
text
())).
toEqual
(
navQuery
)
expect
(
await
browser
.
eval
(
'window.location.pathname'
)).
toBe
(
pathname
)
expect
(
await
browser
.
eval
(
'window.location.hash'
)).
toBe
(
hash
)
expect
(
Object
.
fromEntries
(
new
URLSearchParams
(
await
browser
.
eval
(
'window.location.search'
))
)
).
toEqual
(
query
)
expect
(
await
browser
.
eval
(
'window.beforeNav'
)).
toBe
(
1
)
}
})
it
(
'should handle only hash on dynamic route'
,
async
()
=>
{
it
(
'should handle only hash on dynamic route'
,
async
()
=>
{
const
browser
=
await
webdriver
(
appPort
,
'/post-1'
)
const
browser
=
await
webdriver
(
appPort
,
'/post-1'
)
const
parsedHref
=
url
.
parse
(
const
parsedHref
=
url
.
parse
(
await
browser
await
browser
.
elementByCss
(
'#dynamic-route-only-hash'
)
.
elementByCss
(
'#dynamic-route-only-hash'
)
.
getAttribute
(
'href'
)
.
getAttribute
(
'href'
),
true
)
)
expect
(
parsedHref
.
pathname
).
toBe
(
'/post-1'
)
expect
(
parsedHref
.
pathname
).
toBe
(
'/post-1'
)
expect
(
parsedHref
.
hash
).
toBe
(
'#only-hash'
)
expect
(
parsedHref
.
hash
).
toBe
(
'#only-hash'
)
expect
(
parsedHref
.
query
||
{}).
toEqual
({})
const
parsedHref2
=
url
.
parse
(
const
parsedHref2
=
url
.
parse
(
await
browser
await
browser
.
elementByCss
(
'#dynamic-route-only-hash-obj'
)
.
elementByCss
(
'#dynamic-route-only-hash-obj'
)
.
getAttribute
(
'href'
)
.
getAttribute
(
'href'
),
true
)
)
expect
(
parsedHref2
.
pathname
).
toBe
(
'/post-1'
)
expect
(
parsedHref2
.
pathname
).
toBe
(
'/post-1'
)
expect
(
parsedHref2
.
hash
).
toBe
(
'#only-hash-obj'
)
expect
(
parsedHref2
.
hash
).
toBe
(
'#only-hash-obj'
)
expect
(
parsedHref2
.
query
||
{}).
toEqual
({})
expect
(
await
browser
.
eval
(
'window.location.hash'
)).
toBe
(
''
)
expect
(
await
browser
.
eval
(
'window.location.hash'
)).
toBe
(
''
)
await
browser
.
elementByCss
(
'#dynamic-route-only-hash'
).
click
()
await
browser
.
elementByCss
(
'#dynamic-route-only-hash'
).
click
()
...
...
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