Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-29 09:02:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 52a344d57d into edc299a043

Browse Source
This commit is contained in:
Julien Huang 2024-11-20 06:35:52 -05:00 committed by GitHub
commit 57704665e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/nuxt/src/pages/runtime/plugins/router.ts
View File

@ -1,4 +1,4 @@
import { isReadonly, reactive, shallowReactive, shallowRef } from 'vue' import { isReadonly, reactive, shallowReactive, shallowRef, toValue } from 'vue'
import type { Ref } from 'vue' import type { Ref } from 'vue'
import type { RouteLocation, RouteLocationNormalizedLoaded, Router, RouterScrollBehavior } from 'vue-router' import type { RouteLocation, RouteLocationNormalizedLoaded, Router, RouterScrollBehavior } from 'vue-router'
import { START_LOCATION, createMemoryHistory, createRouter, createWebHashHistory, createWebHistory } from 'vue-router' import { START_LOCATION, createMemoryHistory, createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
@ -114,6 +114,9 @@ const plugin: Plugin<{ router: Router }> = defineNuxtPlugin({
// so we need to update the route manually // so we need to update the route manually
if (to.matched[0]?.components?.default === from.matched[0]?.components?.default) { if (to.matched[0]?.components?.default === from.matched[0]?.components?.default) {
syncCurrentRoute() syncCurrentRoute()
} else {
// assign toValue to avoid reactivity
Object.assign(toValue(_route), router.currentRoute.value)
} }
}) })