From 6611d9b44adf096b2ee69e6dec405c5d352f0fca Mon Sep 17 00:00:00 2001
From: Damian Osipiuk <osipiukd+git@gmail.com>
Date: Thu, 29 Jul 2021 11:57:28 +0200
Subject: [PATCH] fix(types): fix unwanted dependency on react types

---
 src/devtools/active-query-panel/ActiveQueryPanel.vue | 2 +-
 src/devtools/active-query-panel/QueryActions.vue     | 2 +-
 src/devtools/active-query-panel/QueryDetails.vue     | 2 +-
 src/devtools/components/QueryItem.vue                | 2 +-
 src/devtools/components/QueryStates.vue              | 2 +-
 src/devtools/types.ts                                | 2 +-
 src/useBaseQuery.ts                                  | 5 ++++-
 src/useInfiniteQuery.ts                              | 4 +++-
 src/useIsFetching.ts                                 | 2 +-
 src/useMutation.ts                                   | 7 +++----
 src/useQueries.ts                                    | 5 ++++-
 src/useQuery.ts                                      | 7 ++-----
 src/useQueryClient.ts                                | 2 +-
 src/utils.ts                                         | 2 +-
 types/index.d.ts                                     | 1 +
 15 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/devtools/active-query-panel/ActiveQueryPanel.vue b/src/devtools/active-query-panel/ActiveQueryPanel.vue
index b2dd144..eba74ee 100644
--- a/src/devtools/active-query-panel/ActiveQueryPanel.vue
+++ b/src/devtools/active-query-panel/ActiveQueryPanel.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { defineComponent, PropType, h, isVue2 } from "vue-demi";
 
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 import Explorer from "./Explorer.vue";
 import InfoPanel from "./InfoPanel.vue";
diff --git a/src/devtools/active-query-panel/QueryActions.vue b/src/devtools/active-query-panel/QueryActions.vue
index 29bf1d7..9e1a637 100644
--- a/src/devtools/active-query-panel/QueryActions.vue
+++ b/src/devtools/active-query-panel/QueryActions.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, h, isVue2 } from "vue-demi";
 
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 import InfoPanel from "./InfoPanel.vue";
 
diff --git a/src/devtools/active-query-panel/QueryDetails.vue b/src/devtools/active-query-panel/QueryDetails.vue
index 4dc2df5..3368bea 100644
--- a/src/devtools/active-query-panel/QueryDetails.vue
+++ b/src/devtools/active-query-panel/QueryDetails.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, h, isVue2 } from "vue-demi";
 
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 import InfoPanel from "./InfoPanel.vue";
 
diff --git a/src/devtools/components/QueryItem.vue b/src/devtools/components/QueryItem.vue
index ca97499..7e2fbd3 100644
--- a/src/devtools/components/QueryItem.vue
+++ b/src/devtools/components/QueryItem.vue
@@ -1,7 +1,7 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, h } from "vue-demi";
 
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 import { useTheme } from "../useTheme";
 import { getQueryState, getQueryStatusColor, QueryState } from "../utils";
diff --git a/src/devtools/components/QueryStates.vue b/src/devtools/components/QueryStates.vue
index fd7ca9f..3dd51ea 100644
--- a/src/devtools/components/QueryStates.vue
+++ b/src/devtools/components/QueryStates.vue
@@ -1,6 +1,6 @@
 <script lang="ts">
 import { computed, defineComponent, PropType, h } from "vue-demi";
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 import { useTheme } from "../useTheme";
 import { getQueryState, QueryState, QueryStateLabel } from "../utils";
diff --git a/src/devtools/types.ts b/src/devtools/types.ts
index 4bb8dbd..280a9dc 100644
--- a/src/devtools/types.ts
+++ b/src/devtools/types.ts
@@ -1,4 +1,4 @@
-import type { Query } from "react-query/types";
+import type { Query } from "react-query/types/core";
 
 export type ButtonProps = Partial<HTMLButtonElement>;
 
diff --git a/src/useBaseQuery.ts b/src/useBaseQuery.ts
index f90f7f3..7cb29c1 100644
--- a/src/useBaseQuery.ts
+++ b/src/useBaseQuery.ts
@@ -9,7 +9,10 @@ import {
 } from "vue-demi";
 
 import type { QueryObserver } from "react-query/core";
-import type { UseBaseQueryOptions, UseQueryResult } from "react-query/types";
+import type {
+  UseBaseQueryOptions,
+  UseQueryResult,
+} from "react-query/types/react/types";
 
 import { useQueryClient } from "./useQueryClient";
 import { updateState } from "./utils";
diff --git a/src/useInfiniteQuery.ts b/src/useInfiniteQuery.ts
index 0bb13bf..99b1496 100644
--- a/src/useInfiniteQuery.ts
+++ b/src/useInfiniteQuery.ts
@@ -4,9 +4,11 @@ import type {
   QueryObserver,
   QueryFunction,
   QueryKey,
+} from "react-query/types/core";
+import type {
   UseInfiniteQueryOptions,
   UseInfiniteQueryResult,
-} from "react-query/types";
+} from "react-query/types/react/types";
 
 import { useBaseQuery, UseQueryReturnType } from "./useBaseQuery";
 import { parseQueryArgs } from "./utils";
diff --git a/src/useIsFetching.ts b/src/useIsFetching.ts
index 64b7087..4cbcba5 100644
--- a/src/useIsFetching.ts
+++ b/src/useIsFetching.ts
@@ -1,5 +1,5 @@
 import { onUnmounted, Ref, ref, watchEffect } from "vue-demi";
-import { QueryKey } from "react-query/types";
+import { QueryKey } from "react-query/types/core";
 import { QueryFilters } from "react-query/types/core/utils";
 import { useQueryClient } from "./useQueryClient";
 import { parseFilterArgs } from "./utils";
diff --git a/src/useMutation.ts b/src/useMutation.ts
index 7b766c4..55a7c7c 100644
--- a/src/useMutation.ts
+++ b/src/useMutation.ts
@@ -11,13 +11,12 @@ import {
   MutationObserver,
   MutationObserverResult,
 } from "react-query/core";
-import {
+import { MutationFunction, MutationKey } from "react-query/types/core";
+import type {
   UseMutationOptions,
-  MutationFunction,
-  MutationKey,
   UseMutateFunction,
   UseMutateAsyncFunction,
-} from "react-query/types";
+} from "react-query/types/react/types";
 import { parseMutationArgs, updateState } from "./utils";
 import { useQueryClient } from "./useQueryClient";
 
diff --git a/src/useQueries.ts b/src/useQueries.ts
index bb9e178..b264aa2 100644
--- a/src/useQueries.ts
+++ b/src/useQueries.ts
@@ -1,7 +1,10 @@
 import { QueriesObserver } from "react-query/core";
 import { onUnmounted, reactive, readonly, set, watch } from "vue-demi";
 
-import type { UseQueryOptions, UseQueryResult } from "react-query/types";
+import type {
+  UseQueryOptions,
+  UseQueryResult,
+} from "react-query/types/react/types";
 
 import { useQueryClient } from "./useQueryClient";
 
diff --git a/src/useQuery.ts b/src/useQuery.ts
index 44027f8..d69f008 100644
--- a/src/useQuery.ts
+++ b/src/useQuery.ts
@@ -1,10 +1,7 @@
 import { QueryObserver } from "react-query/core";
 
-import type {
-  QueryFunction,
-  QueryKey,
-  UseQueryOptions,
-} from "react-query/types";
+import type { QueryFunction, QueryKey } from "react-query/types/core";
+import type { UseQueryOptions } from "react-query/types/react/types";
 
 import { useBaseQuery, UseQueryReturnType } from "./useBaseQuery";
 import { parseQueryArgs } from "./utils";
diff --git a/src/useQueryClient.ts b/src/useQueryClient.ts
index 7137e26..981cf45 100644
--- a/src/useQueryClient.ts
+++ b/src/useQueryClient.ts
@@ -1,6 +1,6 @@
 import { getCurrentInstance, inject } from "vue-demi";
 
-import type { QueryClient } from "react-query/types";
+import type { QueryClient } from "react-query/types/core";
 
 export const VUE_QUERY_CLIENT = "VUE_QUERY_CLIENT";
 
diff --git a/src/utils.ts b/src/utils.ts
index 0a0bbae..22a020f 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -6,7 +6,7 @@ import type {
   QueryFunction,
   QueryKey,
   QueryOptions,
-} from "react-query/types";
+} from "react-query/types/core";
 import type { QueryFilters } from "react-query/types/core/utils";
 
 export function isQueryKey(value: unknown): value is QueryKey {
diff --git a/types/index.d.ts b/types/index.d.ts
index 1ec81d9..0d7b4a5 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -1 +1,2 @@
 export * from "react-query/types/core";
+export * from "react-query/types/react/types";