fix(guards): run beforeRouteEnter with app context

Fix #2051
vuejs · Nov 22, 2023 · 34ace2c · 34ace2c
1 parent 8489050
commit 34ace2c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/router/src/navigationGuards.ts b/packages/router/src/navigationGuards.ts
@@ -231,7 +231,8 @@ export function extractComponentsGuards(
   matched: RouteRecordNormalized[],
   guardType: GuardType,
   to: RouteLocationNormalized,
-  from: RouteLocationNormalizedLoaded
+  from: RouteLocationNormalizedLoaded,
+  runWithContext: <T>(fn: () => T) => T = fn => fn()
 ) {
   const guards: Array<() => Promise<void>> = []
 
@@ -292,7 +293,12 @@ export function extractComponentsGuards(
         const options: ComponentOptions =
           (rawComponent as any).__vccOpts || rawComponent
         const guard = options[guardType]
-        guard && guards.push(guardToPromiseFn(guard, to, from, record, name))
+        guard &&
+          guards.push(
+            runWithContext(() =>
+              guardToPromiseFn(guard, to, from, record, name)
+            )
+          )
       } else {
         // start requesting the chunk already
         let componentPromise: Promise<

diff --git a/packages/router/src/router.ts b/packages/router/src/router.ts
@@ -879,7 +879,8 @@ export function createRouter(options: RouterOptions): Router {
             enteringRecords,
             'beforeRouteEnter',
             to,
-            from
+            from,
+            runWithContext
           )
           guards.push(canceledNavigationCheck)