From 2f8a7fe1ae4e0976ab7a4b36424f6daa333e29f3 Mon Sep 17 00:00:00 2001
From: Wonsuk Choi <sukvvon@gmail.com>
Date: Sat, 11 Apr 2026 13:05:41 +0900
Subject: [PATCH 1/2] test(svelte-query): unify queryClient passing to
 'setQueryClientContext' and rename test components

---
 .../svelte-query/tests/ProviderWrapper.svelte | 14 ----------
 ...entComponent.svelte => BaseExample.svelte} |  4 +--
 ...hildComponent.svelte => QueryChild.svelte} |  0
 .../QueryClientProvider.svelte.test.ts        |  4 +--
 .../createInfiniteQuery/BaseExample.svelte    | 17 ++++++------
 ...ient.svelte => ChangeClientExample.svelte} | 18 ++++++-------
 .../createInfiniteQuery/SelectExample.svelte  | 23 ++++++++--------
 .../createInfiniteQuery.svelte.test.ts        |  4 +--
 .../createQueries/IsRestoringExample.svelte   | 19 ++++++-------
 .../createQuery/IsRestoringExample.svelte     | 15 +++++------
 .../tests/useIsFetching/BaseExample.svelte    | 27 ++++++++++++++-----
 .../tests/useIsFetching/FetchStatus.svelte    |  6 -----
 .../tests/useIsFetching/Query.svelte          | 16 -----------
 .../tests/useIsMutating/BaseExample.svelte    | 23 +++++++++++-----
 .../tests/useIsMutating/MutatingStatus.svelte |  6 -----
 .../tests/useIsMutating/Query.svelte          | 11 --------
 16 files changed, 84 insertions(+), 123 deletions(-)
 delete mode 100644 packages/svelte-query/tests/ProviderWrapper.svelte
 rename packages/svelte-query/tests/QueryClientProvider/{ParentComponent.svelte => BaseExample.svelte} (78%)
 rename packages/svelte-query/tests/QueryClientProvider/{ChildComponent.svelte => QueryChild.svelte} (100%)
 rename packages/svelte-query/tests/createInfiniteQuery/{ChangeClient.svelte => ChangeClientExample.svelte} (62%)
 delete mode 100644 packages/svelte-query/tests/useIsFetching/FetchStatus.svelte
 delete mode 100644 packages/svelte-query/tests/useIsFetching/Query.svelte
 delete mode 100644 packages/svelte-query/tests/useIsMutating/MutatingStatus.svelte
 delete mode 100644 packages/svelte-query/tests/useIsMutating/Query.svelte

diff --git a/packages/svelte-query/tests/ProviderWrapper.svelte b/packages/svelte-query/tests/ProviderWrapper.svelte
deleted file mode 100644
index b61d2d99daf..00000000000
--- a/packages/svelte-query/tests/ProviderWrapper.svelte
+++ /dev/null
@@ -1,14 +0,0 @@
-<script lang="ts">
-  import { QueryClient } from '@tanstack/query-core'
-  import { QueryClientProvider } from '../src/index.js'
-  import { Snippet } from 'svelte'
-
-  const {
-    queryClient = new QueryClient(),
-    children,
-  }: { queryClient?: QueryClient; children: Snippet } = $props()
-</script>
-
-<QueryClientProvider client={queryClient}>
-  {@render children()}
-</QueryClientProvider>
diff --git a/packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte b/packages/svelte-query/tests/QueryClientProvider/BaseExample.svelte
similarity index 78%
rename from packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte
rename to packages/svelte-query/tests/QueryClientProvider/BaseExample.svelte
index c7b6fa0c5bf..847135b1a71 100644
--- a/packages/svelte-query/tests/QueryClientProvider/ParentComponent.svelte
+++ b/packages/svelte-query/tests/QueryClientProvider/BaseExample.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
   import { QueryClientProvider } from '../../src/index.js'
-  import ChildComponent from './ChildComponent.svelte'
+  import QueryChild from './QueryChild.svelte'
   import type { QueryClient } from '@tanstack/query-core'
 
   let { queryClient }: { queryClient: QueryClient } = $props()
 </script>
 
 <QueryClientProvider client={queryClient}>
-  <ChildComponent />
+  <QueryChild />
 </QueryClientProvider>
diff --git a/packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte b/packages/svelte-query/tests/QueryClientProvider/QueryChild.svelte
similarity index 100%
rename from packages/svelte-query/tests/QueryClientProvider/ChildComponent.svelte
rename to packages/svelte-query/tests/QueryClientProvider/QueryChild.svelte
diff --git a/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.svelte.test.ts b/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.svelte.test.ts
index 754e492fccd..151bc2bf921 100644
--- a/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.svelte.test.ts
+++ b/packages/svelte-query/tests/QueryClientProvider/QueryClientProvider.svelte.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest'
 import { render } from '@testing-library/svelte'
 import { QueryClient } from '@tanstack/query-core'
-import ParentComponent from './ParentComponent.svelte'
+import BaseExample from './BaseExample.svelte'
 
 describe('QueryClientProvider', () => {
   beforeEach(() => {
@@ -16,7 +16,7 @@ describe('QueryClientProvider', () => {
     const queryClient = new QueryClient()
     const queryCache = queryClient.getQueryCache()
 
-    const rendered = render(ParentComponent, {
+    const rendered = render(BaseExample, {
       props: {
         queryClient: queryClient,
       },
diff --git a/packages/svelte-query/tests/createInfiniteQuery/BaseExample.svelte b/packages/svelte-query/tests/createInfiniteQuery/BaseExample.svelte
index 6c64621d86b..a2c7c1aef79 100644
--- a/packages/svelte-query/tests/createInfiniteQuery/BaseExample.svelte
+++ b/packages/svelte-query/tests/createInfiniteQuery/BaseExample.svelte
@@ -3,21 +3,20 @@
   import { QueryClient } from '@tanstack/query-core'
   import { queryKey, sleep } from '@tanstack/query-test-utils'
   import { createInfiniteQuery } from '../../src/index.js'
+  import { setQueryClientContext } from '../../src/context.js'
   import type { QueryObserverResult } from '@tanstack/query-core'
 
   let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
 
   const queryClient = new QueryClient()
+  setQueryClientContext(queryClient)
 
-  const query = createInfiniteQuery(
-    () => ({
-      queryKey: queryKey(),
-      queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
-      getNextPageParam: (lastPage) => lastPage + 1,
-      initialPageParam: 0,
-    }),
-    () => queryClient,
-  )
+  const query = createInfiniteQuery(() => ({
+    queryKey: queryKey(),
+    queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
+    getNextPageParam: (lastPage) => lastPage + 1,
+    initialPageParam: 0,
+  }))
 
   $effect(() => {
     // @ts-expect-error
diff --git a/packages/svelte-query/tests/createInfiniteQuery/ChangeClient.svelte b/packages/svelte-query/tests/createInfiniteQuery/ChangeClientExample.svelte
similarity index 62%
rename from packages/svelte-query/tests/createInfiniteQuery/ChangeClient.svelte
rename to packages/svelte-query/tests/createInfiniteQuery/ChangeClientExample.svelte
index 1993dca149e..41dfd6434c4 100644
--- a/packages/svelte-query/tests/createInfiniteQuery/ChangeClient.svelte
+++ b/packages/svelte-query/tests/createInfiniteQuery/ChangeClientExample.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
   import { createInfiniteQuery } from '../../src/index.js'
+  import { setQueryClientContext } from '../../src/context.js'
   import { sleep } from '@tanstack/query-test-utils'
 
   let { queryClient }: { queryClient: QueryClient } = $props()
@@ -9,15 +10,14 @@
 
   let firstPage = $state(0)
 
-  const query = createInfiniteQuery(
-    () => ({
-      queryKey: queryKey,
-      queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
-      getNextPageParam: (lastPage) => lastPage + 1,
-      initialPageParam: firstPage,
-    }),
-    () => queryClient,
-  )
+  setQueryClientContext(queryClient)
+
+  const query = createInfiniteQuery(() => ({
+    queryKey: queryKey,
+    queryFn: ({ pageParam }) => sleep(10).then(() => pageParam),
+    getNextPageParam: (lastPage) => lastPage + 1,
+    initialPageParam: firstPage,
+  }))
 </script>
 
 <button
diff --git a/packages/svelte-query/tests/createInfiniteQuery/SelectExample.svelte b/packages/svelte-query/tests/createInfiniteQuery/SelectExample.svelte
index 1e4e5b0d2a7..e76fbe61aa3 100644
--- a/packages/svelte-query/tests/createInfiniteQuery/SelectExample.svelte
+++ b/packages/svelte-query/tests/createInfiniteQuery/SelectExample.svelte
@@ -2,26 +2,25 @@
   import { untrack } from 'svelte'
   import { QueryClient } from '@tanstack/query-core'
   import { createInfiniteQuery } from '../../src/index.js'
+  import { setQueryClientContext } from '../../src/context.js'
   import type { QueryObserverResult } from '@tanstack/query-core'
   import { queryKey, sleep } from '@tanstack/query-test-utils'
 
   let { states }: { states: { value: Array<QueryObserverResult> } } = $props()
 
   const queryClient = new QueryClient()
+  setQueryClientContext(queryClient)
 
-  const query = createInfiniteQuery(
-    () => ({
-      queryKey: queryKey(),
-      queryFn: () => sleep(10).then(() => ({ count: 1 })),
-      select: (data) => ({
-        pages: data.pages.map((x) => `count: ${x.count}`),
-        pageParams: data.pageParams,
-      }),
-      getNextPageParam: () => undefined,
-      initialPageParam: 0,
+  const query = createInfiniteQuery(() => ({
+    queryKey: queryKey(),
+    queryFn: () => sleep(10).then(() => ({ count: 1 })),
+    select: (data) => ({
+      pages: data.pages.map((x) => `count: ${x.count}`),
+      pageParams: data.pageParams,
     }),
-    () => queryClient,
-  )
+    getNextPageParam: () => undefined,
+    initialPageParam: 0,
+  }))
 
   $effect(() => {
     // @ts-expect-error
diff --git a/packages/svelte-query/tests/createInfiniteQuery/createInfiniteQuery.svelte.test.ts b/packages/svelte-query/tests/createInfiniteQuery/createInfiniteQuery.svelte.test.ts
index 344cd902b81..ad72510e3c0 100644
--- a/packages/svelte-query/tests/createInfiniteQuery/createInfiniteQuery.svelte.test.ts
+++ b/packages/svelte-query/tests/createInfiniteQuery/createInfiniteQuery.svelte.test.ts
@@ -4,7 +4,7 @@ import { QueryClient } from '@tanstack/query-core'
 import { ref } from '../utils.svelte.js'
 import BaseExample from './BaseExample.svelte'
 import SelectExample from './SelectExample.svelte'
-import ChangeClient from './ChangeClient.svelte'
+import ChangeClientExample from './ChangeClientExample.svelte'
 import type { QueryObserverResult } from '@tanstack/query-core'
 
 describe('createInfiniteQuery', () => {
@@ -133,7 +133,7 @@ describe('createInfiniteQuery', () => {
   it('should be able to set new pages with the query client', async () => {
     const queryClient = new QueryClient()
 
-    const rendered = render(ChangeClient, {
+    const rendered = render(ChangeClientExample, {
       props: {
         queryClient,
       },
diff --git a/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte b/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
index 835d46ceba0..87c8fc4dd4b 100644
--- a/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
+++ b/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
   import { queryKey } from '@tanstack/query-test-utils'
-  import { setIsRestoringContext } from '../../src/context.js'
+  import { setIsRestoringContext, setQueryClientContext } from '../../src/context.js'
   import { createQueries } from '../../src/index.js'
 
   let {
@@ -13,18 +13,15 @@
   } = $props()
 
   const queryClient = new QueryClient()
-
+  setQueryClientContext(queryClient)
   setIsRestoringContext({ current: true })
 
-  const result = createQueries(
-    () => ({
-      queries: [
-        { queryKey: queryKey(), queryFn: queryFn1 },
-        { queryKey: queryKey(), queryFn: queryFn2 },
-      ],
-    }),
-    () => queryClient,
-  )
+  const result = createQueries(() => ({
+    queries: [
+      { queryKey: queryKey(), queryFn: queryFn1 },
+      { queryKey: queryKey(), queryFn: queryFn2 },
+    ],
+  }))
 </script>
 
 <div>
diff --git a/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte b/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
index 18e1d574610..56eb32f330b 100644
--- a/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
+++ b/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
   import { queryKey } from '@tanstack/query-test-utils'
-  import { setIsRestoringContext } from '../../src/context.js'
+  import { setIsRestoringContext, setQueryClientContext } from '../../src/context.js'
   import { createQuery } from '../../src/index.js'
 
   let {
@@ -11,16 +11,13 @@
   } = $props()
 
   const queryClient = new QueryClient()
-
+  setQueryClientContext(queryClient)
   setIsRestoringContext({ current: true })
 
-  const query = createQuery(
-    () => ({
-      queryKey: queryKey(),
-      queryFn,
-    }),
-    () => queryClient,
-  )
+  const query = createQuery(() => ({
+    queryKey: queryKey(),
+    queryFn,
+  }))
 </script>
 
 <div>
diff --git a/packages/svelte-query/tests/useIsFetching/BaseExample.svelte b/packages/svelte-query/tests/useIsFetching/BaseExample.svelte
index 522955c79b5..7d227b7b0ea 100644
--- a/packages/svelte-query/tests/useIsFetching/BaseExample.svelte
+++ b/packages/svelte-query/tests/useIsFetching/BaseExample.svelte
@@ -1,11 +1,24 @@
 <script lang="ts">
-  import ProviderWrapper from '../ProviderWrapper.svelte'
-  import FetchStatus from './FetchStatus.svelte'
-  import Query from './Query.svelte'
+  import { QueryClient } from '@tanstack/query-core'
+  import { queryKey, sleep } from '@tanstack/query-test-utils'
+  import { setQueryClientContext } from '../../src/context.js'
+  import { createQuery, useIsFetching } from '../../src/index.js'
+
+  const queryClient = new QueryClient()
+  setQueryClientContext(queryClient)
+
+  let ready = $state(false)
+
+  const query = createQuery(() => ({
+    queryKey: queryKey(),
+    queryFn: () => sleep(10).then(() => 'test'),
+    enabled: ready,
+  }))
+
+  const isFetching = useIsFetching()
 </script>
 
-<ProviderWrapper>
-  <FetchStatus />
+<button onclick={() => (ready = true)}>setReady</button>
 
-  <Query />
-</ProviderWrapper>
+<div>isFetching: {isFetching.current}</div>
+<div>Data: {query.data ?? 'undefined'}</div>
diff --git a/packages/svelte-query/tests/useIsFetching/FetchStatus.svelte b/packages/svelte-query/tests/useIsFetching/FetchStatus.svelte
deleted file mode 100644
index 5b10705709e..00000000000
--- a/packages/svelte-query/tests/useIsFetching/FetchStatus.svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script lang="ts">
-  import { useIsFetching } from '../../src/index.js'
-  const isFetching = useIsFetching()
-</script>
-
-<div>isFetching: {isFetching.current}</div>
diff --git a/packages/svelte-query/tests/useIsFetching/Query.svelte b/packages/svelte-query/tests/useIsFetching/Query.svelte
deleted file mode 100644
index 6dd05ba5250..00000000000
--- a/packages/svelte-query/tests/useIsFetching/Query.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-<script lang="ts">
-  import { createQuery } from '../../src/index.js'
-  import { queryKey, sleep } from '@tanstack/query-test-utils'
-
-  let ready = $state(false)
-
-  const query = createQuery(() => ({
-    queryKey: queryKey(),
-    queryFn: () => sleep(10).then(() => 'test'),
-    enabled: ready,
-  }))
-</script>
-
-<button onclick={() => (ready = true)}>setReady</button>
-
-<div>Data: {query.data ?? 'undefined'}</div>
diff --git a/packages/svelte-query/tests/useIsMutating/BaseExample.svelte b/packages/svelte-query/tests/useIsMutating/BaseExample.svelte
index e2e46622c7e..90cfe98f8e9 100644
--- a/packages/svelte-query/tests/useIsMutating/BaseExample.svelte
+++ b/packages/svelte-query/tests/useIsMutating/BaseExample.svelte
@@ -1,11 +1,20 @@
 <script lang="ts">
-  import ProviderWrapper from '../ProviderWrapper.svelte'
-  import MutatingStatus from './MutatingStatus.svelte'
-  import Query from './Query.svelte'
+  import { QueryClient } from '@tanstack/query-core'
+  import { queryKey, sleep } from '@tanstack/query-test-utils'
+  import { setQueryClientContext } from '../../src/context.js'
+  import { createMutation, useIsMutating } from '../../src/index.js'
+
+  const queryClient = new QueryClient()
+  setQueryClientContext(queryClient)
+
+  const mutation = createMutation(() => ({
+    mutationKey: queryKey(),
+    mutationFn: () => sleep(10).then(() => 'data'),
+  }))
+
+  const isMutating = useIsMutating()
 </script>
 
-<ProviderWrapper>
-  <MutatingStatus />
+<button onclick={() => mutation.mutate()}>Trigger</button>
 
-  <Query />
-</ProviderWrapper>
+<div>isMutating: {isMutating.current}</div>
diff --git a/packages/svelte-query/tests/useIsMutating/MutatingStatus.svelte b/packages/svelte-query/tests/useIsMutating/MutatingStatus.svelte
deleted file mode 100644
index a747ed83261..00000000000
--- a/packages/svelte-query/tests/useIsMutating/MutatingStatus.svelte
+++ /dev/null
@@ -1,6 +0,0 @@
-<script lang="ts">
-  import { useIsMutating } from '../../src/index.js'
-  const isMutating = useIsMutating()
-</script>
-
-<div>isMutating: {isMutating.current}</div>
diff --git a/packages/svelte-query/tests/useIsMutating/Query.svelte b/packages/svelte-query/tests/useIsMutating/Query.svelte
deleted file mode 100644
index 9ac53da16e3..00000000000
--- a/packages/svelte-query/tests/useIsMutating/Query.svelte
+++ /dev/null
@@ -1,11 +0,0 @@
-<script lang="ts">
-  import { createMutation } from '../../src/index.js'
-  import { queryKey, sleep } from '@tanstack/query-test-utils'
-
-  const mutation = createMutation(() => ({
-    mutationKey: queryKey(),
-    mutationFn: () => sleep(10).then(() => 'data'),
-  }))
-</script>
-
-<button onclick={() => mutation.mutate()}>Trigger</button>

From 0037749506a916807b60646c3bb8cfaa9aa0e0b6 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2026 04:08:20 +0000
Subject: [PATCH 2/2] ci: apply automated fixes

---
 .../tests/createQueries/IsRestoringExample.svelte            | 5 ++++-
 .../svelte-query/tests/createQuery/IsRestoringExample.svelte | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte b/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
index 87c8fc4dd4b..5c0a4ba56e8 100644
--- a/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
+++ b/packages/svelte-query/tests/createQueries/IsRestoringExample.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
   import { queryKey } from '@tanstack/query-test-utils'
-  import { setIsRestoringContext, setQueryClientContext } from '../../src/context.js'
+  import {
+    setIsRestoringContext,
+    setQueryClientContext,
+  } from '../../src/context.js'
   import { createQueries } from '../../src/index.js'
 
   let {
diff --git a/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte b/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
index 56eb32f330b..1596ae63be1 100644
--- a/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
+++ b/packages/svelte-query/tests/createQuery/IsRestoringExample.svelte
@@ -1,7 +1,10 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
   import { queryKey } from '@tanstack/query-test-utils'
-  import { setIsRestoringContext, setQueryClientContext } from '../../src/context.js'
+  import {
+    setIsRestoringContext,
+    setQueryClientContext,
+  } from '../../src/context.js'
   import { createQuery } from '../../src/index.js'
 
   let {