Skip to content

Commit 7492f70

Browse files
fix: Update typescript-eslint (#5467)
1 parent 3d37d87 commit 7492f70

File tree

17 files changed

+199
-123
lines changed

17 files changed

+199
-123
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
"@types/react-dom": "^18.0.5",
5353
"@types/semver": "^7.3.13",
5454
"@types/testing-library__jest-dom": "^5.14.5",
55-
"@typescript-eslint/eslint-plugin": "^5.51.0",
56-
"@typescript-eslint/parser": "^5.51.0",
55+
"@typescript-eslint/eslint-plugin": "^5.54.0",
56+
"@typescript-eslint/parser": "^5.54.0",
5757
"@vitest/coverage-istanbul": "^0.27.1",
5858
"axios": "^1.4.0",
5959
"babel-preset-solid": "^1.6.10",

packages/eslint-plugin-query/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242
"outDir": "build/lib"
4343
},
4444
"devDependencies": {
45-
"@typescript-eslint/eslint-plugin": "^5.51.0",
46-
"@typescript-eslint/parser": "^5.51.0",
47-
"@typescript-eslint/utils": "^5.51.0",
45+
"@typescript-eslint/eslint-plugin": "^5.54.0",
46+
"@typescript-eslint/parser": "^5.54.0",
47+
"@typescript-eslint/utils": "^5.54.0",
4848
"eslint": "^8.34.0",
4949
"tsup": "^6.7.0"
5050
},

packages/query-core/src/queryClient.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import type {
2525
ResetOptions,
2626
SetDataOptions,
2727
DefaultError,
28+
CancelOptions,
29+
DefaultedQueryObserverOptions,
2830
} from './types'
2931
import type { QueryState } from './query'
3032
import { QueryCache } from './queryCache'
@@ -33,7 +35,6 @@ import { focusManager } from './focusManager'
3335
import { onlineManager } from './onlineManager'
3436
import { notifyManager } from './notifyManager'
3537
import { infiniteQueryBehavior } from './infiniteQueryBehavior'
36-
import type { CancelOptions, DefaultedQueryObserverOptions } from './types'
3738

3839
// TYPES
3940

packages/query-core/src/queryObserver.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
1-
import type { DefaultedQueryObserverOptions, DefaultError } from './types'
2-
import {
3-
isServer,
4-
isValidTimeout,
5-
noop,
6-
replaceData,
7-
shallowEqualObjects,
8-
timeUntilStale,
9-
} from './utils'
10-
import { notifyManager } from './notifyManager'
111
import type {
2+
DefaultedQueryObserverOptions,
3+
DefaultError,
124
PlaceholderDataFunction,
135
QueryKey,
146
QueryObserverBaseResult,
@@ -17,6 +9,15 @@ import type {
179
QueryOptions,
1810
RefetchOptions,
1911
} from './types'
12+
import {
13+
isServer,
14+
isValidTimeout,
15+
noop,
16+
replaceData,
17+
shallowEqualObjects,
18+
timeUntilStale,
19+
} from './utils'
20+
import { notifyManager } from './notifyManager'
2021
import type { Query, QueryState, FetchOptions } from './query'
2122
import type { QueryClient } from './queryClient'
2223
import { focusManager } from './focusManager'

packages/query-core/src/tests/queryCache.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { sleep, queryKey, createQueryClient } from './utils'
2-
import { QueryClient } from '..'
3-
import { QueryCache, QueryObserver } from '..'
2+
import { QueryClient, QueryCache, QueryObserver } from '..'
43
import { waitFor } from '@testing-library/react'
54
import { vi } from 'vitest'
65

packages/query-core/src/tests/queryClient.test.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@ import type {
1313
QueryFunction,
1414
QueryObserverOptions,
1515
} from '..'
16-
import { MutationObserver, QueryObserver } from '..'
17-
import { focusManager, onlineManager } from '..'
16+
import {
17+
MutationObserver,
18+
QueryObserver,
19+
focusManager,
20+
onlineManager,
21+
} from '..'
1822
import { noop } from '../utils'
1923
import { vi } from 'vitest'
2024

packages/query-core/src/types.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/* istanbul ignore file */
22

33
import type { MutationState } from './mutation'
4-
import type { QueryBehavior, Query } from './query'
4+
import type { FetchDirection, QueryBehavior, Query } from './query'
55
import type { RetryValue, RetryDelayValue } from './retryer'
66
import type { QueryFilters, QueryTypeFilter } from './utils'
77
import type { QueryCache } from './queryCache'
88
import type { MutationCache } from './mutationCache'
9-
import type { FetchDirection } from './query'
109

1110
export interface Register {
1211
// defaultError: Error

packages/query-devtools/src/Devtools.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type { Accessor, Component, JSX, Setter } from 'solid-js'
2-
import { For } from 'solid-js'
32
import {
43
createEffect,
54
createMemo,
65
createSignal,
76
on,
87
onCleanup,
98
onMount,
9+
For,
1010
Show,
1111
} from 'solid-js'
1212
import { rankItem } from '@tanstack/match-sorter-utils'

packages/query-persist-client-core/src/persist.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import type {
33
DehydratedState,
44
DehydrateOptions,
55
HydrateOptions,
6+
NotifyEventType,
67
} from '@tanstack/query-core'
78
import { dehydrate, hydrate } from '@tanstack/query-core'
8-
import type { NotifyEventType } from '@tanstack/query-core'
99

1010
export type Promisable<T> = T | PromiseLike<T>
1111

packages/react-query/src/suspense.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import type { DefaultedQueryObserverOptions } from '@tanstack/query-core'
2-
import type { QueryObserver } from '@tanstack/query-core'
1+
import type {
2+
DefaultedQueryObserverOptions,
3+
QueryObserverResult,
4+
QueryKey,
5+
QueryObserver,
6+
} from '@tanstack/query-core'
37
import type { QueryErrorResetBoundaryValue } from './QueryErrorResetBoundary'
4-
import type { QueryObserverResult } from '@tanstack/query-core'
5-
import type { QueryKey } from '@tanstack/query-core'
68

79
export const ensureStaleTime = (
810
defaultedOptions: DefaultedQueryObserverOptions<any, any, any, any, any>,

packages/solid-query/src/__tests__/QueryClientProvider.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { render, screen, waitFor } from '@solidjs/testing-library'
2-
import { queryKey } from './utils'
2+
import { createQueryClient, sleep, queryKey } from './utils'
33

44
import { QueryCache } from '@tanstack/query-core'
55
import { createQuery, QueryClientProvider, useQueryClient } from '..'
6-
import { createQueryClient, sleep } from './utils'
76
import { vi } from 'vitest'
87

98
describe('QueryClientProvider', () => {

packages/solid-query/src/__tests__/createInfiniteQuery.test.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
22

3-
import { createQueryClient, sleep } from './utils'
3+
import {
4+
createQueryClient,
5+
sleep,
6+
Blink,
7+
queryKey,
8+
setActTimeout,
9+
} from './utils'
410

511
import {
612
createEffect,
@@ -23,7 +29,6 @@ import {
2329
QueryClientProvider,
2430
keepPreviousData,
2531
} from '..'
26-
import { Blink, queryKey, setActTimeout } from './utils'
2732
import { vi } from 'vitest'
2833
import type { Mock } from 'vitest'
2934

packages/solid-query/src/__tests__/useIsMutating.test.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { fireEvent, render, screen, waitFor } from '@solidjs/testing-library'
22
import { createMutation, QueryClientProvider, useIsMutating } from '..'
3-
import { createQueryClient, sleep } from './utils'
3+
import { createQueryClient, sleep, setActTimeout } from './utils'
44

55
import { createEffect, createRenderEffect, createSignal, Show } from 'solid-js'
66
import * as MutationCacheModule from '../../../query-core/src/mutationCache'
7-
import { setActTimeout } from './utils'
87
import { vi } from 'vitest'
98

109
describe('useIsMutating', () => {

packages/solid-query/src/createBaseQuery.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import type {
88
QueryObserverResult,
99
} from '@tanstack/query-core'
1010
import type { QueryClient } from './QueryClient'
11-
import { hydrate } from '@tanstack/query-core'
12-
import { notifyManager } from '@tanstack/query-core'
11+
import { hydrate, notifyManager } from '@tanstack/query-core'
1312
import type { Accessor } from 'solid-js'
1413
import { isServer } from 'solid-js/web'
1514
import {

packages/vue-query/src/useMutationState.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import type {
44
MutationFilters as MF,
55
Mutation,
66
DefaultError,
7+
MutationState,
78
} from '@tanstack/query-core'
8-
import type { MutationState } from '@tanstack/query-core'
99
import { useQueryClient } from './useQueryClient'
1010
import { cloneDeepUnref } from './utils'
1111
import type { QueryClient } from './queryClient'

packages/vue-query/src/useQueries.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import type {
44
QueriesPlaceholderDataFunction,
55
QueryKey,
66
QueriesObserverOptions,
7+
QueryFunction,
8+
QueryObserverResult,
79
} from '@tanstack/query-core'
810
import type { Ref } from 'vue-demi'
911
import { computed, onScopeDispose, readonly, ref, watch } from 'vue-demi'
1012

11-
import type { QueryFunction, QueryObserverResult } from '@tanstack/query-core'
12-
1313
import { useQueryClient } from './useQueryClient'
1414
import { cloneDeepUnref } from './utils'
1515
import type { UseQueryOptions } from './useQuery'

0 commit comments

Comments
 (0)