Skip to content

Commit 1fba7fc

Browse files
authored
chore: consolidate noop function usage across framework packages (#9228)
Multiple framework-specific packages (`solid-query`, `svelte-query`, and `angular-query-experimental`) were maintaining their own implementations of the `noop` function, creating unnecessary code duplication across the codebase. ```typescript // Before: Each package had its own noop // packages/svelte-query/src/utils.ts export function noop(): void {} // packages/solid-query/src/utils.ts (missing, causing import errors) // Local noop definitions scattered across files ``` Consolidated all `noop` usage to import from the canonical implementation in `@tanstack/query-core`, which all framework packages already depend on. ```typescript // After: Single source of truth import { noop } from '@tanstack/query-core' ``` - **Removed duplicate `noop` definition** from `packages/svelte-query/src/utils.ts` - **Updated import statements** in Solid Query and Svelte Query to use `noop` from `@tanstack/query-core` - **Fixed missing utils file** in Solid Query that was causing import errors - **Resolved TypeScript compatibility** issues with `noop`'s overloaded return types - **Persisters were intentionally left unchanged** as they don't import `query-core` and maintain their own lightweight utils - **Framework packages already depend on `query-core`**, making this consolidation natural and dependency-free
1 parent efa963d commit 1fba7fc

File tree

10 files changed

+11
-18
lines changed

10 files changed

+11
-18
lines changed

packages/angular-query-experimental/src/inject-mutation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import {
1212
import {
1313
MutationObserver,
1414
QueryClient,
15+
noop,
1516
notifyManager,
1617
shouldThrowError,
1718
} from '@tanstack/query-core'
1819
import { signalProxy } from './signal-proxy'
19-
import { noop } from './util'
2020
import type { DefaultError, MutationObserverResult } from '@tanstack/query-core'
2121
import type { CreateMutateFunction, CreateMutationResult } from './types'
2222
import type { CreateMutationOptions } from './mutation-options'

packages/angular-query-experimental/src/providers.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import {
77
effect,
88
inject,
99
} from '@angular/core'
10-
import { QueryClient, onlineManager } from '@tanstack/query-core'
10+
import { QueryClient, noop, onlineManager } from '@tanstack/query-core'
1111
import { isPlatformBrowser } from '@angular/common'
1212
import { isDevMode } from './util/is-dev-mode/is-dev-mode'
13-
import { noop } from './util'
1413
import type { Provider } from '@angular/core'
1514
import type {
1615
DevtoolsButtonPosition,

packages/angular-query-experimental/src/util/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/solid-query/src/useMutation.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { MutationObserver, shouldThrowError } from '@tanstack/query-core'
1+
import { MutationObserver, noop, shouldThrowError } from '@tanstack/query-core'
22
import { createComputed, createMemo, on, onCleanup } from 'solid-js'
33
import { createStore } from 'solid-js/store'
44
import { useQueryClient } from './QueryClientProvider'
5-
import { noop } from './utils'
65
import type { DefaultError } from '@tanstack/query-core'
76
import type { QueryClient } from './QueryClient'
87
import type {

packages/solid-query/src/useQueries.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { QueriesObserver } from '@tanstack/query-core'
1+
import { QueriesObserver, noop } from '@tanstack/query-core'
22
import { createStore, unwrap } from 'solid-js/store'
33
import {
44
batch,
@@ -13,7 +13,6 @@ import {
1313
} from 'solid-js'
1414
import { useQueryClient } from './QueryClientProvider'
1515
import { useIsRestoring } from './isRestoring'
16-
import { noop } from './utils'
1716
import type { SolidQueryOptions, UseQueryResult } from './types'
1817
import type { Accessor } from 'solid-js'
1918
import type { QueryClient } from './QueryClient'
@@ -292,7 +291,7 @@ export function useQueries<
292291
})
293292
})
294293

295-
let unsubscribe = noop
294+
let unsubscribe: () => void = noop
296295
createComputed<() => void>((cleanup) => {
297296
cleanup?.()
298297
unsubscribe = isRestoring() ? noop : subscribeToObserver()

packages/solid-query/src/utils.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

packages/svelte-query/src/createBaseQuery.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { derived, get, readable } from 'svelte/store'
2-
import { notifyManager } from '@tanstack/query-core'
2+
import { noop, notifyManager } from '@tanstack/query-core'
33
import { useIsRestoring } from './useIsRestoring.js'
44
import { useQueryClient } from './useQueryClient.js'
5-
import { isSvelteStore, noop } from './utils.js'
5+
import { isSvelteStore } from './utils.js'
66
import type {
77
QueryClient,
88
QueryKey,

packages/svelte-query/src/createMutation.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { derived, get, readable } from 'svelte/store'
2-
import { MutationObserver, notifyManager } from '@tanstack/query-core'
2+
import { MutationObserver, noop, notifyManager } from '@tanstack/query-core'
33
import { useQueryClient } from './useQueryClient.js'
4-
import { isSvelteStore, noop } from './utils.js'
4+
import { isSvelteStore } from './utils.js'
55
import type {
66
CreateMutateFunction,
77
CreateMutationOptions,

packages/svelte-query/src/createQueries.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { QueriesObserver, notifyManager } from '@tanstack/query-core'
1+
import { QueriesObserver, noop, notifyManager } from '@tanstack/query-core'
22
import { derived, get, readable } from 'svelte/store'
33
import { useIsRestoring } from './useIsRestoring.js'
44
import { useQueryClient } from './useQueryClient.js'
5-
import { isSvelteStore, noop } from './utils.js'
5+
import { isSvelteStore } from './utils.js'
66
import type { Readable } from 'svelte/store'
77
import type { StoreOrVal } from './types.js'
88
import type {

packages/svelte-query/src/utils.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ export function isSvelteStore<T extends object>(
66
): obj is Readable<T> {
77
return 'subscribe' in obj && typeof obj.subscribe === 'function'
88
}
9-
10-
export function noop(): void {}

0 commit comments

Comments
 (0)