test: update types

vuejs · Jul 19, 2022 · 9030279 · 9030279
1 parent 434139c
commit 9030279
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/packages/playground/src/router.ts b/packages/playground/src/router.ts
@@ -1,5 +1,4 @@
 import { createRouter, createWebHistory, RouterView } from 'vue-router'
-import type { RouterLinkTyped } from 'vue-router'
 import Home from './views/Home.vue'
 import Nested from './views/Nested.vue'
 import NestedWithId from './views/NestedWithId.vue'
@@ -16,13 +15,8 @@ import ComponentWithData from './views/ComponentWithData.vue'
 import { globalState } from './store'
 import { scrollWaiter } from './scrollWaiter'
 import RepeatedParams from './views/RepeatedParams.vue'
-import { h } from 'vue'
-import type { FunctionalComponent } from 'vue'
 let removeRoute: (() => void) | undefined
 
-const TransparentWrapper: FunctionalComponent = () => h(RouterView)
-TransparentWrapper.displayName = 'NestedView'
-
 export const routerHistory = createWebHistory()
 export const router = createRouter({
   history: routerHistory,
@@ -159,7 +153,6 @@ export const router = createRouter({
 
     {
       path: '/admin',
-      component: TransparentWrapper,
       children: [
         { path: '', component },
         { path: 'dashboard', component },
@@ -181,12 +174,6 @@ export const router = createRouter({
   },
 })
 
-declare module 'vue-router' {
-  export interface Config {
-    Router: typeof router
-  }
-}
-
 // router.push({ name: 'user', params: {} })
 
 const delay = (t: number) => new Promise(resolve => setTimeout(resolve, t))

diff --git a/packages/router/__tests__/RouterView.spec.ts b/packages/router/__tests__/RouterView.spec.ts
@@ -20,6 +20,10 @@ function createRoutes<T extends Record<string, RouteLocationNormalizedLoose>>(
 
   for (let key in routes) {
     nonReactiveRoutes[key] = markRaw(routes[key])
+    nonReactiveRoutes[key].matched.forEach(record => {
+      record.leaveGuards ??= new Set()
+      record.updateGuards ??= new Set()
+    })
   }
 
   return nonReactiveRoutes
@@ -238,7 +242,7 @@ describe('RouterView', () => {
     props: any = {}
   ) {
     const route = createMockedRoute(initialRoute)
-    const wrapper = mount(RouterView as any, {
+    const wrapper = mount(RouterView, {
       props,
       global: {
         provide: route.provides,
@@ -439,7 +443,7 @@ describe('RouterView', () => {
       props: any = {}
     ) {
       const route = createMockedRoute(initialRoute)
-      const wrapper = await mount(RouterView as any, {
+      const wrapper = await mount(RouterView, {
         props,
         global: {
           provide: route.provides,
@@ -470,7 +474,7 @@ describe('RouterView', () => {
       props: any = {}
     ) {
       const route = createMockedRoute(initialRoute)
-      const wrapper = await mount(RouterView as any, {
+      const wrapper = await mount(RouterView, {
         props,
         global: {
           provide: route.provides,
@@ -503,7 +507,7 @@ describe('RouterView', () => {
       props: any = {}
     ) {
       const route = createMockedRoute(initialRoute)
-      const wrapper = await mount(RouterView as any, {
+      const wrapper = await mount(RouterView, {
         props,
         global: {
           provide: route.provides,

diff --git a/packages/router/__tests__/utils.ts b/packages/router/__tests__/utils.ts
@@ -55,6 +55,7 @@ export interface RouteRecordViewLoose
     'path' | 'name' | 'meta' | 'beforeEnter'
   > {
   leaveGuards?: any
+  updateGuards?: any
   instances: Record<string, any>
   enterCallbacks: Record<string, Function[]>
   props: Record<string, _RouteRecordProps>