Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-24 14:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: avoid breaking changes

Browse Source
This commit is contained in:
Harlan Wilton 2024-01-31 23:42:49 +11:00
parent 7d8fb2c4d9
commit da7a9e952e
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/nuxt/src/app/components/nuxt-link.ts
View File

@ -170,9 +170,10 @@ export function defineNuxtLink (options: NuxtLinkOptions) {
const href = computed(() => { const href = computed(() => {
return typeof link.value === 'string' ? link.value : router.resolve(link.value).path return typeof link.value === 'string' ? link.value : router.resolve(link.value).path
}) })
const isAbsoluteLink = computed(() => hasProtocol(href.value, { acceptRelative: true }))
const as = computed(() => { const as = computed(() => {
const forceAnchorTag = props.external const forceAnchorTag = props.external
if (forceAnchorTag || hasProtocol(href.value, { acceptRelative: true })) { if (forceAnchorTag || isAbsoluteLink.value) {
return 'a' return 'a'
} }
return 'RouterLink' return 'RouterLink'
@ -223,7 +224,7 @@ export function defineNuxtLink (options: NuxtLinkOptions) {
}) })
// we can only prefetch valid vue-router links // we can only prefetch valid vue-router links
if (import.meta.client && as.value === 'RouterLink') { if (import.meta.client) {
checkPropConflicts(props, 'prefetch', 'noPrefetch') checkPropConflicts(props, 'prefetch', 'noPrefetch')
const shouldPrefetch = props.prefetch !== false && props.noPrefetch !== true && props.target !== '_blank' && !isSlowConnection() const shouldPrefetch = props.prefetch !== false && props.noPrefetch !== true && props.target !== '_blank' && !isSlowConnection()
if (shouldPrefetch) { if (shouldPrefetch) {
@ -241,7 +242,7 @@ export function defineNuxtLink (options: NuxtLinkOptions) {
await Promise.all([ await Promise.all([
nuxtApp.hooks.callHook('link:prefetch', href.value).catch(() => {}), nuxtApp.hooks.callHook('link:prefetch', href.value).catch(() => {}),
preloadRouteComponents(link.value, router).catch(() => {}) as.value === 'RouterLink' && preloadRouteComponents(link.value, router).catch(() => {})
]) ])
prefetched.value = true prefetched.value = true
}) })
@ -277,14 +278,19 @@ export function defineNuxtLink (options: NuxtLinkOptions) {
} }
if (typeof link.value === 'object') { if (typeof link.value === 'object') {
console.log('[nuxt] [NuxtLink] Providing `to` as a vue-router route is not supported with external links.', link.value) import.meta.dev && console.log('[nuxt] [NuxtLink] Providing `to` as a vue-router route is not supported with external links.', link.value)
return null return null
} }
const navigate = () => navigateTo(anchorProps.value.href, { const navigate = () => {
if (isAbsoluteLink.value) {
import.meta.dev && console.log('[nuxt] [NuxtLink] Navigating to an absolute link using `navigate()` isn\'t supported', anchorProps.value.href)
return
}
return navigateTo(anchorProps.value.href, {
replace: props.replace, replace: props.replace,
external: props.external, // must explicitly opt-in
}) })
}
// https://router.vuejs.org/api/#custom // https://router.vuejs.org/api/#custom
if (props.custom) { if (props.custom) {