From 091c32eeb079ce11d25f94d797eeebbee01f90b8 Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 26 May 2023 18:14:59 +1000
Subject: [PATCH 1/4] Switch to moduleResolution bundler

---
 .../svelte-query/src/HydrationBoundary.svelte  |  2 +-
 .../src/QueryClientProvider.svelte             |  2 +-
 .../src/__tests__/CreateMutation.svelte        |  6 +++---
 .../src/__tests__/CreateQueries.svelte         |  6 +++---
 .../src/__tests__/CreateQuery.svelte           |  6 +++---
 .../src/__tests__/createQueries.test.ts        |  2 +-
 .../src/__tests__/createQuery.test.ts          |  4 ++--
 packages/svelte-query/src/__tests__/utils.ts   |  2 +-
 packages/svelte-query/src/createBaseQuery.ts   | 10 +++++-----
 .../svelte-query/src/createInfiniteQuery.ts    |  4 ++--
 packages/svelte-query/src/createMutation.ts    |  6 +++---
 packages/svelte-query/src/createQueries.ts     |  8 +++-----
 packages/svelte-query/src/createQuery.ts       |  4 ++--
 packages/svelte-query/src/index.ts             | 18 +++++++++---------
 packages/svelte-query/src/useHydrate.ts        |  2 +-
 packages/svelte-query/src/useIsFetching.ts     |  2 +-
 packages/svelte-query/src/useIsMutating.ts     |  2 +-
 packages/svelte-query/src/useQueryClient.ts    |  2 +-
 packages/svelte-query/src/utils.ts             |  2 +-
 packages/svelte-query/tsconfig.json            |  6 ++----
 20 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/packages/svelte-query/src/HydrationBoundary.svelte b/packages/svelte-query/src/HydrationBoundary.svelte
index 2d106da00e..5795cbae39 100644
--- a/packages/svelte-query/src/HydrationBoundary.svelte
+++ b/packages/svelte-query/src/HydrationBoundary.svelte
@@ -4,7 +4,7 @@
     HydrateOptions,
     QueryClient,
   } from '@tanstack/query-core'
-  import { useHydrate } from './useHydrate'
+  import { useHydrate } from './useHydrate.ts'
 
   export let state: DehydratedState
   export let options: HydrateOptions | undefined = undefined
diff --git a/packages/svelte-query/src/QueryClientProvider.svelte b/packages/svelte-query/src/QueryClientProvider.svelte
index 86ce96ecea..27059e12a2 100644
--- a/packages/svelte-query/src/QueryClientProvider.svelte
+++ b/packages/svelte-query/src/QueryClientProvider.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte'
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from './context'
+  import { setQueryClientContext } from './context.ts'
 
   export let client = new QueryClient()
 
diff --git a/packages/svelte-query/src/__tests__/CreateMutation.svelte b/packages/svelte-query/src/__tests__/CreateMutation.svelte
index ac48f8fe85..8a38083e38 100644
--- a/packages/svelte-query/src/__tests__/CreateMutation.svelte
+++ b/packages/svelte-query/src/__tests__/CreateMutation.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context'
-  import { createMutation } from '../createMutation'
-  import type { CreateMutationOptions } from '../types'
+  import { setQueryClientContext } from '../context.ts'
+  import { createMutation } from '../createMutation.ts'
+  import type { CreateMutationOptions } from '../types.ts'
 
   export let options: CreateMutationOptions
 
diff --git a/packages/svelte-query/src/__tests__/CreateQueries.svelte b/packages/svelte-query/src/__tests__/CreateQueries.svelte
index b0d5535ac8..634101741c 100644
--- a/packages/svelte-query/src/__tests__/CreateQueries.svelte
+++ b/packages/svelte-query/src/__tests__/CreateQueries.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context'
-  import { createQueries } from '../createQueries'
-  import type { QueriesOptions } from '../createQueries'
+  import { setQueryClientContext } from '../context.ts'
+  import { createQueries } from '../createQueries.ts'
+  import type { QueriesOptions } from '../createQueries.ts'
 
   export let options: { queries: [...QueriesOptions<any>] }
 
diff --git a/packages/svelte-query/src/__tests__/CreateQuery.svelte b/packages/svelte-query/src/__tests__/CreateQuery.svelte
index c702c66814..b8ebacd2c3 100644
--- a/packages/svelte-query/src/__tests__/CreateQuery.svelte
+++ b/packages/svelte-query/src/__tests__/CreateQuery.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context'
-  import { createQuery } from '../createQuery'
-  import type { CreateQueryOptions } from '../types'
+  import { setQueryClientContext } from '../context.ts'
+  import { createQuery } from '../createQuery.ts'
+  import type { CreateQueryOptions } from '../types.ts'
 
   export let options: CreateQueryOptions<any>
 
diff --git a/packages/svelte-query/src/__tests__/createQueries.test.ts b/packages/svelte-query/src/__tests__/createQueries.test.ts
index c4b5c84b82..6badfd688f 100644
--- a/packages/svelte-query/src/__tests__/createQueries.test.ts
+++ b/packages/svelte-query/src/__tests__/createQueries.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { render, waitFor } from '@testing-library/svelte'
 import CreateQueries from './CreateQueries.svelte'
-import { sleep } from './utils'
+import { sleep } from './utils.ts'
 
 describe('createQueries', () => {
   it('Render and wait for success', async () => {
diff --git a/packages/svelte-query/src/__tests__/createQuery.test.ts b/packages/svelte-query/src/__tests__/createQuery.test.ts
index 47460e3d06..5d9590785e 100644
--- a/packages/svelte-query/src/__tests__/createQuery.test.ts
+++ b/packages/svelte-query/src/__tests__/createQuery.test.ts
@@ -2,8 +2,8 @@ import { describe, it, expect } from 'vitest'
 import { render, waitFor } from '@testing-library/svelte'
 import { writable } from 'svelte/store'
 import CreateQuery from './CreateQuery.svelte'
-import { sleep } from './utils'
-import type { CreateQueryOptions } from '../types'
+import { sleep } from './utils.ts'
+import type { CreateQueryOptions } from '../types.ts'
 
 describe('createQuery', () => {
   it('Render and wait for success', async () => {
diff --git a/packages/svelte-query/src/__tests__/utils.ts b/packages/svelte-query/src/__tests__/utils.ts
index 67488053f2..dd5b566a39 100644
--- a/packages/svelte-query/src/__tests__/utils.ts
+++ b/packages/svelte-query/src/__tests__/utils.ts
@@ -1,6 +1,6 @@
 import { vi } from 'vitest'
 import { act } from '@testing-library/svelte'
-import { QueryClient, type QueryClientConfig } from '../index'
+import { QueryClient, type QueryClientConfig } from '../index.ts'
 
 export function createQueryClient(config?: QueryClientConfig): QueryClient {
   return new QueryClient(config)
diff --git a/packages/svelte-query/src/createBaseQuery.ts b/packages/svelte-query/src/createBaseQuery.ts
index 46130a002a..6a33b92ae2 100644
--- a/packages/svelte-query/src/createBaseQuery.ts
+++ b/packages/svelte-query/src/createBaseQuery.ts
@@ -1,9 +1,9 @@
-import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
-import { notifyManager } from '@tanstack/query-core'
-import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
-import { useQueryClient } from './useQueryClient'
 import { derived, get, readable, writable } from 'svelte/store'
-import { isWritable } from './utils'
+import { notifyManager } from '@tanstack/query-core'
+import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
+import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types.ts'
+import { useQueryClient } from './useQueryClient.ts'
+import { isWritable } from './utils.ts'
 
 export function createBaseQuery<
   TQueryFnData,
diff --git a/packages/svelte-query/src/createInfiniteQuery.ts b/packages/svelte-query/src/createInfiniteQuery.ts
index 78df0ec427..76be34b4f3 100644
--- a/packages/svelte-query/src/createInfiniteQuery.ts
+++ b/packages/svelte-query/src/createInfiniteQuery.ts
@@ -9,8 +9,8 @@ import { InfiniteQueryObserver } from '@tanstack/query-core'
 import type {
   CreateInfiniteQueryOptions,
   CreateInfiniteQueryResult,
-} from './types'
-import { createBaseQuery } from './createBaseQuery'
+} from './types.ts'
+import { createBaseQuery } from './createBaseQuery.ts'
 
 export function createInfiniteQuery<
   TQueryFnData,
diff --git a/packages/svelte-query/src/createMutation.ts b/packages/svelte-query/src/createMutation.ts
index 58004ea29a..a2f63e59ae 100644
--- a/packages/svelte-query/src/createMutation.ts
+++ b/packages/svelte-query/src/createMutation.ts
@@ -5,9 +5,9 @@ import type {
   CreateMutateFunction,
   CreateMutationOptions,
   CreateMutationResult,
-} from './types'
-import { useQueryClient } from './useQueryClient'
-import { isWritable } from './utils'
+} from './types.ts'
+import { useQueryClient } from './useQueryClient.ts'
+import { isWritable } from './utils.ts'
 
 export function createMutation<
   TData = unknown,
diff --git a/packages/svelte-query/src/createQueries.ts b/packages/svelte-query/src/createQueries.ts
index d54cb265fc..0037c36701 100644
--- a/packages/svelte-query/src/createQueries.ts
+++ b/packages/svelte-query/src/createQueries.ts
@@ -8,13 +8,11 @@ import type {
   QueriesObserverOptions,
   QueryObserverOptions,
 } from '@tanstack/query-core'
-
 import { notifyManager, QueriesObserver } from '@tanstack/query-core'
 import { derived, get, readable, writable, type Readable } from 'svelte/store'
-
-import type { WritableOrVal } from './types'
-import { useQueryClient } from './useQueryClient'
-import { isWritable } from './utils'
+import type { WritableOrVal } from './types.ts'
+import { useQueryClient } from './useQueryClient.ts'
+import { isWritable } from './utils.ts'
 
 // This defines the `CreateQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
 // `placeholderData` function does not have a parameter
diff --git a/packages/svelte-query/src/createQuery.ts b/packages/svelte-query/src/createQuery.ts
index ba12a3764d..4e5271b506 100644
--- a/packages/svelte-query/src/createQuery.ts
+++ b/packages/svelte-query/src/createQuery.ts
@@ -1,11 +1,11 @@
 import { QueryObserver } from '@tanstack/query-core'
 import type { QueryKey, QueryClient, DefaultError } from '@tanstack/query-core'
-import { createBaseQuery } from './createBaseQuery'
+import { createBaseQuery } from './createBaseQuery.ts'
 import type {
   DefinedCreateQueryResult,
   CreateQueryOptions,
   CreateQueryResult,
-} from './types'
+} from './types.ts'
 
 type UndefinedInitialDataOptions<
   TQueryFnData = unknown,
diff --git a/packages/svelte-query/src/index.ts b/packages/svelte-query/src/index.ts
index c6d4e9e1a7..672dd8a2e4 100644
--- a/packages/svelte-query/src/index.ts
+++ b/packages/svelte-query/src/index.ts
@@ -4,14 +4,14 @@
 export * from '@tanstack/query-core'
 
 // Svelte Query
-export * from './types'
-export { createQuery } from './createQuery'
-export { createQueries } from './createQueries'
-export { createInfiniteQuery } from './createInfiniteQuery'
-export { createMutation } from './createMutation'
-export { useQueryClient } from './useQueryClient'
-export { useIsFetching } from './useIsFetching'
-export { useIsMutating } from './useIsMutating'
-export { useHydrate } from './useHydrate'
+export * from './types.ts'
+export { createQuery } from './createQuery.ts'
+export { createQueries } from './createQueries.ts'
+export { createInfiniteQuery } from './createInfiniteQuery.ts'
+export { createMutation } from './createMutation.ts'
+export { useQueryClient } from './useQueryClient.ts'
+export { useIsFetching } from './useIsFetching.ts'
+export { useIsMutating } from './useIsMutating.ts'
+export { useHydrate } from './useHydrate.ts'
 export { default as HydrationBoundary } from './HydrationBoundary.svelte'
 export { default as QueryClientProvider } from './QueryClientProvider.svelte'
diff --git a/packages/svelte-query/src/useHydrate.ts b/packages/svelte-query/src/useHydrate.ts
index 709b4a468c..382c86afd2 100644
--- a/packages/svelte-query/src/useHydrate.ts
+++ b/packages/svelte-query/src/useHydrate.ts
@@ -3,7 +3,7 @@ import {
   type QueryClient,
   hydrate,
 } from '@tanstack/query-core'
-import { useQueryClient } from './useQueryClient'
+import { useQueryClient } from './useQueryClient.ts'
 
 export function useHydrate(
   state?: unknown,
diff --git a/packages/svelte-query/src/useIsFetching.ts b/packages/svelte-query/src/useIsFetching.ts
index 86d5e2b23f..287e558dd2 100644
--- a/packages/svelte-query/src/useIsFetching.ts
+++ b/packages/svelte-query/src/useIsFetching.ts
@@ -4,7 +4,7 @@ import {
   notifyManager,
 } from '@tanstack/query-core'
 import { type Readable, readable } from 'svelte/store'
-import { useQueryClient } from './useQueryClient'
+import { useQueryClient } from './useQueryClient.ts'
 
 export function useIsFetching(
   filters?: QueryFilters,
diff --git a/packages/svelte-query/src/useIsMutating.ts b/packages/svelte-query/src/useIsMutating.ts
index c4293fa744..a3e1d700fc 100644
--- a/packages/svelte-query/src/useIsMutating.ts
+++ b/packages/svelte-query/src/useIsMutating.ts
@@ -4,7 +4,7 @@ import {
   notifyManager,
 } from '@tanstack/query-core'
 import { type Readable, readable } from 'svelte/store'
-import { useQueryClient } from './useQueryClient'
+import { useQueryClient } from './useQueryClient.ts'
 
 export function useIsMutating(
   filters?: MutationFilters,
diff --git a/packages/svelte-query/src/useQueryClient.ts b/packages/svelte-query/src/useQueryClient.ts
index 4e8b2bcf94..3fee610393 100644
--- a/packages/svelte-query/src/useQueryClient.ts
+++ b/packages/svelte-query/src/useQueryClient.ts
@@ -1,5 +1,5 @@
 import type { QueryClient } from '@tanstack/query-core'
-import { getQueryClientContext } from './context'
+import { getQueryClientContext } from './context.ts'
 
 export function useQueryClient(queryClient?: QueryClient): QueryClient {
   const client = getQueryClientContext()
diff --git a/packages/svelte-query/src/utils.ts b/packages/svelte-query/src/utils.ts
index 8ce19a7f43..c436fb6333 100644
--- a/packages/svelte-query/src/utils.ts
+++ b/packages/svelte-query/src/utils.ts
@@ -1,5 +1,5 @@
 import type { Writable } from 'svelte/store'
-import type { WritableOrVal } from './types'
+import type { WritableOrVal } from './types.ts'
 
 export function isWritable<T extends object>(
   obj: WritableOrVal<T>,
diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json
index e1f81ad88f..c23fe85b27 100644
--- a/packages/svelte-query/tsconfig.json
+++ b/packages/svelte-query/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowImportingTsExtensions": true,
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "checkJs": true,
@@ -7,12 +8,10 @@
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "lib": ["esnext", "DOM", "DOM.Iterable"],
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "module": "esnext",
     "noEmit": true,
-    "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noImplicitThis": true,
     "noUncheckedIndexedAccess": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
@@ -20,7 +19,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "strictNullChecks": true,
     "target": "esnext",
     "types": ["vitest/globals", "@testing-library/jest-dom"]
   },

From 2c88ec4f95adbe3a064abe0d23559b80f76b2447 Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 26 May 2023 18:15:47 +1000
Subject: [PATCH 2/4] Update tsconfig for svelte-query-devtools

---
 packages/svelte-query-devtools/tsconfig.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/svelte-query-devtools/tsconfig.json b/packages/svelte-query-devtools/tsconfig.json
index 54936037f3..0e5e3c2671 100644
--- a/packages/svelte-query-devtools/tsconfig.json
+++ b/packages/svelte-query-devtools/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowImportingTsExtensions": true,
     "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "checkJs": true,
@@ -7,12 +8,10 @@
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
     "lib": ["esnext", "DOM", "DOM.Iterable"],
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "module": "esnext",
     "noEmit": true,
-    "noImplicitAny": true,
     "noImplicitReturns": true,
-    "noImplicitThis": true,
     "noUncheckedIndexedAccess": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
@@ -20,7 +19,6 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "strictNullChecks": true,
     "target": "esnext"
   },
   "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.svelte", ".eslintrc.cjs", "vite.config.ts"]

From 9efdbcfbfc0d5010ebdebb758a66ace48b6b433b Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 26 May 2023 18:22:48 +1000
Subject: [PATCH 3/4] Remove custom vite resolve

---
 packages/svelte-query-devtools/vite.config.ts  | 10 +---------
 .../svelte-query/src/HydrationBoundary.svelte  |  2 +-
 .../src/QueryClientProvider.svelte             |  2 +-
 .../src/__tests__/CreateMutation.svelte        |  6 +++---
 .../src/__tests__/CreateQueries.svelte         |  6 +++---
 .../src/__tests__/CreateQuery.svelte           |  6 +++---
 .../src/__tests__/createQueries.test.ts        |  2 +-
 .../src/__tests__/createQuery.test.ts          |  4 ++--
 packages/svelte-query/src/__tests__/utils.ts   |  2 +-
 packages/svelte-query/src/createBaseQuery.ts   |  6 +++---
 .../svelte-query/src/createInfiniteQuery.ts    |  4 ++--
 packages/svelte-query/src/createMutation.ts    |  6 +++---
 packages/svelte-query/src/createQueries.ts     |  6 +++---
 packages/svelte-query/src/createQuery.ts       |  4 ++--
 packages/svelte-query/src/index.ts             | 18 +++++++++---------
 packages/svelte-query/src/useHydrate.ts        |  2 +-
 packages/svelte-query/src/useIsFetching.ts     |  2 +-
 packages/svelte-query/src/useIsMutating.ts     |  2 +-
 packages/svelte-query/src/useQueryClient.ts    |  2 +-
 packages/svelte-query/src/utils.ts             |  2 +-
 packages/svelte-query/vite.config.ts           |  6 ------
 21 files changed, 43 insertions(+), 57 deletions(-)

diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts
index 5bb8de98a9..fb626ace23 100644
--- a/packages/svelte-query-devtools/vite.config.ts
+++ b/packages/svelte-query-devtools/vite.config.ts
@@ -1,14 +1,6 @@
 import { svelte } from '@sveltejs/vite-plugin-svelte';
-import path from 'path';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-  plugins: [svelte()],
-  resolve: {
-    alias: {
-      "@tanstack/query-core": path.resolve(__dirname, '..', 'query-core', 'src'),
-      "@tanstack/query-devtools": path.resolve(__dirname, '..', 'query-devtools', 'src'),
-      "@tanstack/svelte-query": path.resolve(__dirname, '..', 'svelte-query', 'src'),
-    }
-  }
+  plugins: [svelte()]
 });
diff --git a/packages/svelte-query/src/HydrationBoundary.svelte b/packages/svelte-query/src/HydrationBoundary.svelte
index 5795cbae39..2d106da00e 100644
--- a/packages/svelte-query/src/HydrationBoundary.svelte
+++ b/packages/svelte-query/src/HydrationBoundary.svelte
@@ -4,7 +4,7 @@
     HydrateOptions,
     QueryClient,
   } from '@tanstack/query-core'
-  import { useHydrate } from './useHydrate.ts'
+  import { useHydrate } from './useHydrate'
 
   export let state: DehydratedState
   export let options: HydrateOptions | undefined = undefined
diff --git a/packages/svelte-query/src/QueryClientProvider.svelte b/packages/svelte-query/src/QueryClientProvider.svelte
index 27059e12a2..86ce96ecea 100644
--- a/packages/svelte-query/src/QueryClientProvider.svelte
+++ b/packages/svelte-query/src/QueryClientProvider.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount, onDestroy } from 'svelte'
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from './context.ts'
+  import { setQueryClientContext } from './context'
 
   export let client = new QueryClient()
 
diff --git a/packages/svelte-query/src/__tests__/CreateMutation.svelte b/packages/svelte-query/src/__tests__/CreateMutation.svelte
index 8a38083e38..ac48f8fe85 100644
--- a/packages/svelte-query/src/__tests__/CreateMutation.svelte
+++ b/packages/svelte-query/src/__tests__/CreateMutation.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context.ts'
-  import { createMutation } from '../createMutation.ts'
-  import type { CreateMutationOptions } from '../types.ts'
+  import { setQueryClientContext } from '../context'
+  import { createMutation } from '../createMutation'
+  import type { CreateMutationOptions } from '../types'
 
   export let options: CreateMutationOptions
 
diff --git a/packages/svelte-query/src/__tests__/CreateQueries.svelte b/packages/svelte-query/src/__tests__/CreateQueries.svelte
index 634101741c..b0d5535ac8 100644
--- a/packages/svelte-query/src/__tests__/CreateQueries.svelte
+++ b/packages/svelte-query/src/__tests__/CreateQueries.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context.ts'
-  import { createQueries } from '../createQueries.ts'
-  import type { QueriesOptions } from '../createQueries.ts'
+  import { setQueryClientContext } from '../context'
+  import { createQueries } from '../createQueries'
+  import type { QueriesOptions } from '../createQueries'
 
   export let options: { queries: [...QueriesOptions<any>] }
 
diff --git a/packages/svelte-query/src/__tests__/CreateQuery.svelte b/packages/svelte-query/src/__tests__/CreateQuery.svelte
index b8ebacd2c3..c702c66814 100644
--- a/packages/svelte-query/src/__tests__/CreateQuery.svelte
+++ b/packages/svelte-query/src/__tests__/CreateQuery.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import { QueryClient } from '@tanstack/query-core'
-  import { setQueryClientContext } from '../context.ts'
-  import { createQuery } from '../createQuery.ts'
-  import type { CreateQueryOptions } from '../types.ts'
+  import { setQueryClientContext } from '../context'
+  import { createQuery } from '../createQuery'
+  import type { CreateQueryOptions } from '../types'
 
   export let options: CreateQueryOptions<any>
 
diff --git a/packages/svelte-query/src/__tests__/createQueries.test.ts b/packages/svelte-query/src/__tests__/createQueries.test.ts
index 6badfd688f..c4b5c84b82 100644
--- a/packages/svelte-query/src/__tests__/createQueries.test.ts
+++ b/packages/svelte-query/src/__tests__/createQueries.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { render, waitFor } from '@testing-library/svelte'
 import CreateQueries from './CreateQueries.svelte'
-import { sleep } from './utils.ts'
+import { sleep } from './utils'
 
 describe('createQueries', () => {
   it('Render and wait for success', async () => {
diff --git a/packages/svelte-query/src/__tests__/createQuery.test.ts b/packages/svelte-query/src/__tests__/createQuery.test.ts
index 5d9590785e..47460e3d06 100644
--- a/packages/svelte-query/src/__tests__/createQuery.test.ts
+++ b/packages/svelte-query/src/__tests__/createQuery.test.ts
@@ -2,8 +2,8 @@ import { describe, it, expect } from 'vitest'
 import { render, waitFor } from '@testing-library/svelte'
 import { writable } from 'svelte/store'
 import CreateQuery from './CreateQuery.svelte'
-import { sleep } from './utils.ts'
-import type { CreateQueryOptions } from '../types.ts'
+import { sleep } from './utils'
+import type { CreateQueryOptions } from '../types'
 
 describe('createQuery', () => {
   it('Render and wait for success', async () => {
diff --git a/packages/svelte-query/src/__tests__/utils.ts b/packages/svelte-query/src/__tests__/utils.ts
index dd5b566a39..67488053f2 100644
--- a/packages/svelte-query/src/__tests__/utils.ts
+++ b/packages/svelte-query/src/__tests__/utils.ts
@@ -1,6 +1,6 @@
 import { vi } from 'vitest'
 import { act } from '@testing-library/svelte'
-import { QueryClient, type QueryClientConfig } from '../index.ts'
+import { QueryClient, type QueryClientConfig } from '../index'
 
 export function createQueryClient(config?: QueryClientConfig): QueryClient {
   return new QueryClient(config)
diff --git a/packages/svelte-query/src/createBaseQuery.ts b/packages/svelte-query/src/createBaseQuery.ts
index 6a33b92ae2..0a23085284 100644
--- a/packages/svelte-query/src/createBaseQuery.ts
+++ b/packages/svelte-query/src/createBaseQuery.ts
@@ -1,9 +1,9 @@
 import { derived, get, readable, writable } from 'svelte/store'
 import { notifyManager } from '@tanstack/query-core'
 import type { QueryClient, QueryKey, QueryObserver } from '@tanstack/query-core'
-import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types.ts'
-import { useQueryClient } from './useQueryClient.ts'
-import { isWritable } from './utils.ts'
+import type { CreateBaseQueryOptions, CreateBaseQueryResult } from './types'
+import { useQueryClient } from './useQueryClient'
+import { isWritable } from './utils'
 
 export function createBaseQuery<
   TQueryFnData,
diff --git a/packages/svelte-query/src/createInfiniteQuery.ts b/packages/svelte-query/src/createInfiniteQuery.ts
index 76be34b4f3..78df0ec427 100644
--- a/packages/svelte-query/src/createInfiniteQuery.ts
+++ b/packages/svelte-query/src/createInfiniteQuery.ts
@@ -9,8 +9,8 @@ import { InfiniteQueryObserver } from '@tanstack/query-core'
 import type {
   CreateInfiniteQueryOptions,
   CreateInfiniteQueryResult,
-} from './types.ts'
-import { createBaseQuery } from './createBaseQuery.ts'
+} from './types'
+import { createBaseQuery } from './createBaseQuery'
 
 export function createInfiniteQuery<
   TQueryFnData,
diff --git a/packages/svelte-query/src/createMutation.ts b/packages/svelte-query/src/createMutation.ts
index a2f63e59ae..58004ea29a 100644
--- a/packages/svelte-query/src/createMutation.ts
+++ b/packages/svelte-query/src/createMutation.ts
@@ -5,9 +5,9 @@ import type {
   CreateMutateFunction,
   CreateMutationOptions,
   CreateMutationResult,
-} from './types.ts'
-import { useQueryClient } from './useQueryClient.ts'
-import { isWritable } from './utils.ts'
+} from './types'
+import { useQueryClient } from './useQueryClient'
+import { isWritable } from './utils'
 
 export function createMutation<
   TData = unknown,
diff --git a/packages/svelte-query/src/createQueries.ts b/packages/svelte-query/src/createQueries.ts
index 0037c36701..7d8c7c3169 100644
--- a/packages/svelte-query/src/createQueries.ts
+++ b/packages/svelte-query/src/createQueries.ts
@@ -10,9 +10,9 @@ import type {
 } from '@tanstack/query-core'
 import { notifyManager, QueriesObserver } from '@tanstack/query-core'
 import { derived, get, readable, writable, type Readable } from 'svelte/store'
-import type { WritableOrVal } from './types.ts'
-import { useQueryClient } from './useQueryClient.ts'
-import { isWritable } from './utils.ts'
+import type { WritableOrVal } from './types'
+import { useQueryClient } from './useQueryClient'
+import { isWritable } from './utils'
 
 // This defines the `CreateQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
 // `placeholderData` function does not have a parameter
diff --git a/packages/svelte-query/src/createQuery.ts b/packages/svelte-query/src/createQuery.ts
index 4e5271b506..ba12a3764d 100644
--- a/packages/svelte-query/src/createQuery.ts
+++ b/packages/svelte-query/src/createQuery.ts
@@ -1,11 +1,11 @@
 import { QueryObserver } from '@tanstack/query-core'
 import type { QueryKey, QueryClient, DefaultError } from '@tanstack/query-core'
-import { createBaseQuery } from './createBaseQuery.ts'
+import { createBaseQuery } from './createBaseQuery'
 import type {
   DefinedCreateQueryResult,
   CreateQueryOptions,
   CreateQueryResult,
-} from './types.ts'
+} from './types'
 
 type UndefinedInitialDataOptions<
   TQueryFnData = unknown,
diff --git a/packages/svelte-query/src/index.ts b/packages/svelte-query/src/index.ts
index 672dd8a2e4..c6d4e9e1a7 100644
--- a/packages/svelte-query/src/index.ts
+++ b/packages/svelte-query/src/index.ts
@@ -4,14 +4,14 @@
 export * from '@tanstack/query-core'
 
 // Svelte Query
-export * from './types.ts'
-export { createQuery } from './createQuery.ts'
-export { createQueries } from './createQueries.ts'
-export { createInfiniteQuery } from './createInfiniteQuery.ts'
-export { createMutation } from './createMutation.ts'
-export { useQueryClient } from './useQueryClient.ts'
-export { useIsFetching } from './useIsFetching.ts'
-export { useIsMutating } from './useIsMutating.ts'
-export { useHydrate } from './useHydrate.ts'
+export * from './types'
+export { createQuery } from './createQuery'
+export { createQueries } from './createQueries'
+export { createInfiniteQuery } from './createInfiniteQuery'
+export { createMutation } from './createMutation'
+export { useQueryClient } from './useQueryClient'
+export { useIsFetching } from './useIsFetching'
+export { useIsMutating } from './useIsMutating'
+export { useHydrate } from './useHydrate'
 export { default as HydrationBoundary } from './HydrationBoundary.svelte'
 export { default as QueryClientProvider } from './QueryClientProvider.svelte'
diff --git a/packages/svelte-query/src/useHydrate.ts b/packages/svelte-query/src/useHydrate.ts
index 382c86afd2..709b4a468c 100644
--- a/packages/svelte-query/src/useHydrate.ts
+++ b/packages/svelte-query/src/useHydrate.ts
@@ -3,7 +3,7 @@ import {
   type QueryClient,
   hydrate,
 } from '@tanstack/query-core'
-import { useQueryClient } from './useQueryClient.ts'
+import { useQueryClient } from './useQueryClient'
 
 export function useHydrate(
   state?: unknown,
diff --git a/packages/svelte-query/src/useIsFetching.ts b/packages/svelte-query/src/useIsFetching.ts
index 287e558dd2..86d5e2b23f 100644
--- a/packages/svelte-query/src/useIsFetching.ts
+++ b/packages/svelte-query/src/useIsFetching.ts
@@ -4,7 +4,7 @@ import {
   notifyManager,
 } from '@tanstack/query-core'
 import { type Readable, readable } from 'svelte/store'
-import { useQueryClient } from './useQueryClient.ts'
+import { useQueryClient } from './useQueryClient'
 
 export function useIsFetching(
   filters?: QueryFilters,
diff --git a/packages/svelte-query/src/useIsMutating.ts b/packages/svelte-query/src/useIsMutating.ts
index a3e1d700fc..c4293fa744 100644
--- a/packages/svelte-query/src/useIsMutating.ts
+++ b/packages/svelte-query/src/useIsMutating.ts
@@ -4,7 +4,7 @@ import {
   notifyManager,
 } from '@tanstack/query-core'
 import { type Readable, readable } from 'svelte/store'
-import { useQueryClient } from './useQueryClient.ts'
+import { useQueryClient } from './useQueryClient'
 
 export function useIsMutating(
   filters?: MutationFilters,
diff --git a/packages/svelte-query/src/useQueryClient.ts b/packages/svelte-query/src/useQueryClient.ts
index 3fee610393..4e8b2bcf94 100644
--- a/packages/svelte-query/src/useQueryClient.ts
+++ b/packages/svelte-query/src/useQueryClient.ts
@@ -1,5 +1,5 @@
 import type { QueryClient } from '@tanstack/query-core'
-import { getQueryClientContext } from './context.ts'
+import { getQueryClientContext } from './context'
 
 export function useQueryClient(queryClient?: QueryClient): QueryClient {
   const client = getQueryClientContext()
diff --git a/packages/svelte-query/src/utils.ts b/packages/svelte-query/src/utils.ts
index c436fb6333..8ce19a7f43 100644
--- a/packages/svelte-query/src/utils.ts
+++ b/packages/svelte-query/src/utils.ts
@@ -1,5 +1,5 @@
 import type { Writable } from 'svelte/store'
-import type { WritableOrVal } from './types.ts'
+import type { WritableOrVal } from './types'
 
 export function isWritable<T extends object>(
   obj: WritableOrVal<T>,
diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts
index 00f3373f40..b8ebe53eba 100644
--- a/packages/svelte-query/vite.config.ts
+++ b/packages/svelte-query/vite.config.ts
@@ -1,14 +1,8 @@
 import { svelte } from '@sveltejs/vite-plugin-svelte';
-import path from 'path';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
   plugins: [svelte()],
-  resolve: {
-    alias: {
-      "@tanstack/query-core": path.resolve(__dirname, '..', 'query-core', 'src'),
-    }
-  },
   test: {
     name: 'svelte-query',
     watch: false,

From 6447f58c1f9256141dd1d3a89bca0d4cca3c8b81 Mon Sep 17 00:00:00 2001
From: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
Date: Fri, 26 May 2023 18:47:18 +1000
Subject: [PATCH 4/4] Fix test:lib

---
 packages/svelte-query-devtools/vite.config.ts | 10 +++++++++-
 packages/svelte-query/vite.config.ts          |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts
index fb626ace23..2235b6b2b0 100644
--- a/packages/svelte-query-devtools/vite.config.ts
+++ b/packages/svelte-query-devtools/vite.config.ts
@@ -1,6 +1,14 @@
+import { resolve } from 'node:path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
-  plugins: [svelte()]
+  plugins: [svelte()],
+  resolve: {
+    alias: {
+      "@tanstack/query-core": resolve(__dirname, '..', 'query-core', 'src'),
+      "@tanstack/query-devtools": resolve(__dirname, '..', 'query-devtools', 'src'),
+      "@tanstack/svelte-query": resolve(__dirname, '..', 'svelte-query', 'src'),
+    }
+  }
 });
diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts
index b8ebe53eba..1c26042f0d 100644
--- a/packages/svelte-query/vite.config.ts
+++ b/packages/svelte-query/vite.config.ts
@@ -1,8 +1,14 @@
+import { resolve } from 'node:path';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { defineConfig } from 'vite';
 
 export default defineConfig({
   plugins: [svelte()],
+  resolve: {
+    alias: {
+      "@tanstack/query-core": resolve(__dirname, '..', 'query-core', 'src'),
+    }
+  },
   test: {
     name: 'svelte-query',
     watch: false,