Skip to content

Commit 20f4580

Browse files
posvaposva
committed
refactor: use ts-expect-error
1 parent 3d465cc commit 20f4580

File tree

20 files changed

+41
-49
lines changed

20 files changed

+41
-49
lines changed

‎__tests__/RouterLink.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -919,15 +919,15 @@ describe('RouterLink', () => {
919919
components: { RouterLink },
920920
name: 'AppLink',
921921

922-
// @ts-ignore
922+
// @ts-expect-error
923923
props: {
924924
...((RouterLink as any).props as RouterLinkProps),
925925
inactiveClass: String as PropType<string>,
926926
},
927927

928928
computed: {
929929
isExternalLink(): boolean {
930-
// @ts-ignore
930+
// @ts-expect-error
931931
return typeof this.to === 'string' && this.to.startsWith('http')
932932
},
933933
},

‎__tests__/guards/extractComponentsGuards.spec.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@ const from = START_LOCATION_NORMALIZED
1414
const NoGuard: RouteRecordRaw = { path: '/', component: components.Home }
1515
const InvalidRoute: RouteRecordRaw = {
1616
path: '/',
17-
// @ts-ignore: intended error
17+
// @ts-expect-error
1818
component: null,
1919
}
2020
const WrongLazyRoute: RouteRecordRaw = {
2121
path: '/',
22-
// @ts-ignore: intended error
2322
component: Promise.resolve(components.Home),
2423
}
2524
const SingleGuard: RouteRecordRaw = {
@@ -88,7 +87,7 @@ describe('extractComponentsGuards', () => {
8887
})
8988

9089
it('throws if component is null', async () => {
91-
// @ts-ignore
90+
// @ts-expect-error
9291
await expect(checkGuards([InvalidRoute], 2)).rejects.toHaveProperty(
9392
'message',
9493
expect.stringMatching('Invalid route component')

‎__tests__/matcher/addingRemoving.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { MatcherLocation } from '../../src/types'
33
import { mockWarn } from 'jest-mock-warn'
44

55
const currentLocation = { path: '/' } as MatcherLocation
6-
// @ts-ignore
6+
// @ts-expect-error
77
const component: RouteComponent = null
88

99
describe('Matcher: adding and removing records', () => {

‎__tests__/matcher/pathRanking.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,16 @@ describe('Path ranking', () => {
1313
{
1414
score: a,
1515
re: /a/,
16-
// @ts-ignore
16+
// @ts-expect-error
1717
stringify: v => v,
18-
// @ts-ignore
18+
// @ts-expect-error
1919
parse: v => v,
2020
keys: [],
2121
},
2222
{
2323
score: b,
2424
re: /a/,
25-
// @ts-ignore
2625
stringify: v => v,
27-
// @ts-ignore
2826
parse: v => v,
2927
keys: [],
3028
}

‎__tests__/matcher/resolve.spec.ts‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
import { MatcherLocationNormalizedLoose } from '../utils'
1010
import { mockWarn } from 'jest-mock-warn'
1111

12-
// @ts-ignore
12+
// @ts-expect-error
1313
const component: RouteComponent = null
1414

1515
// for normalized records
@@ -42,9 +42,7 @@ describe('RouterMatcher.resolve', () => {
4242
throw new Error('not handled')
4343
} else {
4444
// use one single record
45-
if (!resolved.matched)
46-
// @ts-ignore
47-
resolved.matched = record.map(normalizeRouteRecord)
45+
if (!resolved.matched) resolved.matched = record.map(normalizeRouteRecord)
4846
// allow passing an expect.any(Array)
4947
else if (Array.isArray(resolved.matched))
5048
resolved.matched = resolved.matched.map(m => ({

‎__tests__/mount.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function createMockedRoute(initialValue: RouteLocationNormalizedLoose) {
2020
}
2121

2222
for (let key in initialValue) {
23-
// @ts-ignore
23+
// @ts-expect-error
2424
route[key] =
2525
// new line to still get errors here
2626
computed(() => routeRef.value[key as keyof RouteLocationNormalizedLoose])

‎__tests__/router.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ describe('Router', () => {
9595
})
9696

9797
it('fails if history option is missing', () => {
98-
// @ts-ignore
98+
// @ts-expect-error
9999
expect(() => createRouter({ routes })).toThrowError(
100100
'Provide the "history" option'
101101
)

‎__tests__/urlEncoding.spec.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ describe('URL Encoding', () => {
2525
beforeEach(() => {
2626
// mock all encoding functions
2727
for (const key in encoding) {
28-
// @ts-ignore
28+
// @ts-expect-error
2929
const value = encoding[key]
30-
// @ts-ignore
30+
// @ts-expect-error
3131
if (typeof value === 'function') encoding[key] = jest.fn((v: string) => v)
32-
// @ts-ignore
32+
// @ts-expect-error
3333
else if (key === 'PLUS_RE') encoding[key] = /\+/g
3434
}
3535
})
@@ -82,9 +82,9 @@ describe('URL Encoding', () => {
8282
})
8383

8484
it('decodes values in params', async () => {
85-
// @ts-ignore: override to make the difference
85+
// @ts-expect-error: override to make the difference
8686
encoding.decode = () => 'd'
87-
// @ts-ignore
87+
// @ts-expect-error
8888
encoding.encodeParam = () => 'e'
8989
const router = createRouter()
9090
await router.push({ name: 'optional', params: { a: 'a%' } })
@@ -124,11 +124,11 @@ describe('URL Encoding', () => {
124124
})
125125

126126
it('keeps decoded values in query', async () => {
127-
// @ts-ignore: override to make the difference
127+
// @ts-expect-error: override to make the difference
128128
encoding.decode = () => 'd'
129-
// @ts-ignore
129+
// @ts-expect-error
130130
encoding.encodeQueryValue = () => 'ev'
131-
// @ts-ignore
131+
// @ts-expect-error
132132
encoding.encodeQueryKey = () => 'ek'
133133
const router = createRouter()
134134
await router.push({ name: 'home', query: { p: '%' } })
@@ -139,9 +139,9 @@ describe('URL Encoding', () => {
139139
})
140140

141141
it('keeps decoded values in hash', async () => {
142-
// @ts-ignore: override to make the difference
142+
// @ts-expect-error: override to make the difference
143143
encoding.decode = () => 'd'
144-
// @ts-ignore
144+
// @ts-expect-error
145145
encoding.encodeHash = () => '#e'
146146
const router = createRouter()
147147
await router.push({ name: 'home', hash: '#%' })
@@ -151,9 +151,9 @@ describe('URL Encoding', () => {
151151
})
152152
})
153153
it('decodes hash', async () => {
154-
// @ts-ignore: override to make the difference
154+
// @ts-expect-error: override to make the difference
155155
encoding.decode = () => '#d'
156-
// @ts-ignore
156+
// @ts-expect-error
157157
encoding.encodeHash = () => '#e'
158158
const router = createRouter()
159159
await router.push('#%20')

‎__tests__/utils.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export interface RouteRecordViewLoose
6060
aliasOf: RouteRecordViewLoose | undefined
6161
}
6262

63-
// @ts-ignore we are intentionally overriding the type
63+
// @ts-expect-error we are intentionally overriding the type
6464
export interface RouteLocationNormalizedLoose extends RouteLocationNormalized {
6565
name: RouteRecordName | null | undefined
6666
path: string
@@ -105,7 +105,7 @@ export function createDom(options?: ConstructorOptions) {
105105
}
106106
)
107107

108-
// @ts-ignore: needed for jsdom
108+
// @ts-expect-error: needed for jsdom
109109
global.window = dom.window
110110
global.location = dom.window.location
111111
global.history = dom.window.history

‎e2e/guards-instances/index.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function createTestComponent(key: string) {
6464
state.enter++
6565
logs.value.push(`${key}: enter ${from.path} - ${to.path}`)
6666
next(vm => {
67-
// @ts-ignore
67+
// @ts-expect-error
6868
vm.enterCallback++
6969
})
7070
},
@@ -239,7 +239,6 @@ leaves: {{ state.leave }}
239239

240240
app.use(router)
241241

242-
// @ts-ignore
243242
window.r = router
244243

245244
app.mount('#app')

0 commit comments

Comments
 (0)