Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2025-02-21 16:09:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: prefer createRouteResolver

Browse Source
This commit is contained in:
Harlan Wilton 2024-01-25 21:58:48 +08:00
parent ad11d0299d
commit 6c6af8e2c0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import { computed, defineComponent, h, inject, onBeforeUnmount, onMounted, provi
import { hasProtocol, joinURL, parseQuery, parseURL } from 'ufo' import { hasProtocol, joinURL, parseQuery, parseURL } from 'ufo'
import { preloadRouteComponents } from '../composables/preload' import { preloadRouteComponents } from '../composables/preload'
import { onNuxtReady } from '../composables/ready' import { onNuxtReady } from '../composables/ready'
import { createPathResolver, navigateTo, useRouter } from '../composables/router' import { createRouteResolver, navigateTo, useRouter } from '../composables/router'
import { useNuxtApp, useRuntimeConfig } from '../nuxt' import { useNuxtApp, useRuntimeConfig } from '../nuxt'
import { cancelIdleCallback, requestIdleCallback } from '../compat/idle-callback' import { cancelIdleCallback, requestIdleCallback } from '../compat/idle-callback'
@ -150,7 +150,7 @@ export function defineNuxtLink (options: NuxtLinkOptions) {
const router = useRouter() const router = useRouter()
const config = useRuntimeConfig() const config = useRuntimeConfig()
const resolvePath = createPathResolver( { trailingSlash: options?.trailingSlash }) const resolvePath = createRouteResolver( { trailingSlash: options?.trailingSlash })
// Resolving `to` value from `to` and `href` props // Resolving `to` value from `to` and `href` props
const to: ComputedRef<string | RouteLocationRaw> = computed(() => { const to: ComputedRef<string | RouteLocationRaw> = computed(() => {

4
packages/nuxt/src/app/composables/router.ts
View File

@ -43,7 +43,7 @@ export const onBeforeRouteLeave = (guard: NavigationGuard) => {
onScopeDispose(unsubscribe) onScopeDispose(unsubscribe)
} }
export const createPathResolver = (options: { export const createRouteResolver = (options: {
trailingSlash?: NuxtAppConfig['trailingSlash'], trailingSlash?: NuxtAppConfig['trailingSlash'],
} = {}): RouteLocationRaw | RouteLocation => { } = {}): RouteLocationRaw | RouteLocation => {
options.trailingSlash = options.trailingSlash || appTrailingSlash options.trailingSlash = options.trailingSlash || appTrailingSlash
@ -155,7 +155,7 @@ export const navigateTo = (to: RouteLocationRaw | undefined | null, options?: Na
// normalise to a RouteLocationNamedRaw // normalise to a RouteLocationNamedRaw
const route: RouteLocationPathRaw = typeof to === 'string' ? { path: to } : to const route: RouteLocationPathRaw = typeof to === 'string' ? { path: to } : to
const isExternal = options?.external || hasProtocol(route.path, { acceptRelative: true }) const isExternal = options?.external || hasProtocol(route.path, { acceptRelative: true })
const resolvePath = createPathResolver({ const resolvePath = createRouteResolver({
external: isExternal, external: isExternal,
}) })
const resolvedPath = resolvePath(route) const resolvedPath = resolvePath(route)