mirror of
https://github.com/nuxt/nuxt.git
synced 2024-11-26 07:32:01 +00:00
fix(nuxt3): move new router behavior to useActiveRoute
(#4124)
This commit is contained in:
parent
d2a814fa6a
commit
eb22ce9ae2
@ -4,7 +4,7 @@ import type { Preset } from 'unimport'
|
|||||||
import autoImports from '../../nuxt3/src/auto-imports/module'
|
import autoImports from '../../nuxt3/src/auto-imports/module'
|
||||||
import { vuePreset } from '../../nuxt3/src/auto-imports/presets'
|
import { vuePreset } from '../../nuxt3/src/auto-imports/presets'
|
||||||
|
|
||||||
const UnsupportedImports = new Set(['useAsyncData', 'useFetch', 'useError', 'throwError', 'clearError', 'defineNuxtLink'])
|
const UnsupportedImports = new Set(['useAsyncData', 'useFetch', 'useError', 'throwError', 'clearError', 'defineNuxtLink', 'useActiveRoute'])
|
||||||
const CapiHelpers = new Set(Object.keys(CompositionApi))
|
const CapiHelpers = new Set(Object.keys(CompositionApi))
|
||||||
|
|
||||||
export function setupAutoImports () {
|
export function setupAutoImports () {
|
||||||
|
@ -9,5 +9,5 @@ export type { FetchResult, UseFetchOptions } from './fetch'
|
|||||||
export { useCookie } from './cookie'
|
export { useCookie } from './cookie'
|
||||||
export type { CookieOptions, CookieRef } from './cookie'
|
export type { CookieOptions, CookieRef } from './cookie'
|
||||||
export { useRequestHeaders } from './ssr'
|
export { useRequestHeaders } from './ssr'
|
||||||
export { abortNavigation, addRouteMiddleware, defineNuxtRouteMiddleware, navigateTo, useRoute, useRouter } from './router'
|
export { abortNavigation, addRouteMiddleware, defineNuxtRouteMiddleware, navigateTo, useRoute, useActiveRoute, useRouter } from './router'
|
||||||
export type { AddRouteMiddlewareOptions, RouteMiddleware } from './router'
|
export type { AddRouteMiddlewareOptions, RouteMiddleware } from './router'
|
||||||
|
@ -10,6 +10,10 @@ export const useRoute = () => {
|
|||||||
return useNuxtApp()._route as RouteLocationNormalizedLoaded
|
return useNuxtApp()._route as RouteLocationNormalizedLoaded
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const useActiveRoute = () => {
|
||||||
|
return useNuxtApp()._activeRoute as RouteLocationNormalizedLoaded
|
||||||
|
}
|
||||||
|
|
||||||
export interface RouteMiddleware {
|
export interface RouteMiddleware {
|
||||||
(to: RouteLocationNormalized, from: RouteLocationNormalized): ReturnType<NavigationGuard>
|
(to: RouteLocationNormalized, from: RouteLocationNormalized): ReturnType<NavigationGuard>
|
||||||
}
|
}
|
||||||
|
@ -36,6 +36,7 @@ export const appPreset = defineUnimportPreset({
|
|||||||
'useRequestHeaders',
|
'useRequestHeaders',
|
||||||
'useRouter',
|
'useRouter',
|
||||||
'useRoute',
|
'useRoute',
|
||||||
|
'useActiveRoute',
|
||||||
'defineNuxtRouteMiddleware',
|
'defineNuxtRouteMiddleware',
|
||||||
'navigateTo',
|
'navigateTo',
|
||||||
'abortNavigation',
|
'abortNavigation',
|
||||||
|
@ -75,10 +75,16 @@ export default defineNuxtPlugin((nuxtApp) => {
|
|||||||
get: () => previousRoute.value
|
get: () => previousRoute.value
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// https://github.com/vuejs/vue-router-next/blob/master/src/router.ts#L1192-L1200
|
||||||
|
const route = {}
|
||||||
|
for (const key in router.currentRoute.value) {
|
||||||
|
route[key] = computed(() => router.currentRoute.value[key])
|
||||||
|
}
|
||||||
|
|
||||||
// Allows suspending the route object until page navigation completes
|
// Allows suspending the route object until page navigation completes
|
||||||
const path = process.server ? nuxtApp.ssrContext.req.url : createCurrentLocation(baseURL, window.location)
|
const path = process.server ? nuxtApp.ssrContext.req.url : createCurrentLocation(baseURL, window.location)
|
||||||
const currentRoute = shallowRef(router.resolve(path) as RouteLocation)
|
const _activeRoute = shallowRef(router.resolve(path) as RouteLocation)
|
||||||
const syncCurrentRoute = () => { currentRoute.value = router.currentRoute.value }
|
const syncCurrentRoute = () => { _activeRoute.value = router.currentRoute.value }
|
||||||
nuxtApp.hook('page:finish', syncCurrentRoute)
|
nuxtApp.hook('page:finish', syncCurrentRoute)
|
||||||
router.afterEach((to, from) => {
|
router.afterEach((to, from) => {
|
||||||
// We won't trigger suspense if the component is reused between routes
|
// We won't trigger suspense if the component is reused between routes
|
||||||
@ -88,12 +94,13 @@ export default defineNuxtPlugin((nuxtApp) => {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
// https://github.com/vuejs/vue-router-next/blob/master/src/router.ts#L1192-L1200
|
// https://github.com/vuejs/vue-router-next/blob/master/src/router.ts#L1192-L1200
|
||||||
const route = {}
|
const activeRoute = {}
|
||||||
for (const key in currentRoute.value) {
|
for (const key in _activeRoute.value) {
|
||||||
route[key] = computed(() => currentRoute.value[key])
|
activeRoute[key] = computed(() => _activeRoute.value[key])
|
||||||
}
|
}
|
||||||
|
|
||||||
nuxtApp._route = reactive(route)
|
nuxtApp._route = reactive(route)
|
||||||
|
nuxtApp._activeRoute = reactive(activeRoute)
|
||||||
|
|
||||||
nuxtApp._middleware = nuxtApp._middleware || {
|
nuxtApp._middleware = nuxtApp._middleware || {
|
||||||
global: [],
|
global: [],
|
||||||
|
Loading…
Reference in New Issue
Block a user