fix: route tracking handle currentRoute to be null

nuxt · Sep 6, 2023 · 7ca1fc9 · 7ca1fc9
1 parent 0dc4848
commit 7ca1fc9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/devtools/client/plugins/global.ts b/packages/devtools/client/plugins/global.ts
@@ -39,8 +39,8 @@ export default defineNuxtPlugin(() => {
   })
 
   router.afterEach(() => {
-    const path = router.currentRoute.value.path
-    if (path.includes('__'))
+    const path = router.currentRoute.value?.path
+    if (!path || path.includes('__'))
       return
     client.value?.hooks.callHook('devtools:navigate', path)
   })

diff --git a/packages/devtools/client/setup/client-rpc.ts b/packages/devtools/client/setup/client-rpc.ts
@@ -31,7 +31,7 @@ export function setupClientRPC() {
     },
     async navigateTo(path: string) {
       client.value.open()
-      if (router.currentRoute.value.path !== path)
+      if (router.currentRoute.value?.path !== path)
         router.push(path)
     },
   } satisfies ClientFunctions)

diff --git a/packages/devtools/src/runtime/plugins/view/client.ts b/packages/devtools/src/runtime/plugins/view/client.ts
@@ -342,7 +342,7 @@ export function useClientColorMode(): Ref<ColorScheme> {
 
 function setupRouteTracking(timeline: TimelineMetrics, router: Router) {
   // Add initial route event
-  if (router && timeline.options.enabled) {
+  if (timeline.options.enabled && router?.currentRoute?.value?.path) {
     const start = timeline.events[0]?.start || Date.now()
     timeline.events.unshift({
       type: 'route',