resolve conflict

src/config.ts

@@ -1,9 +1,5 @@
 import { dequal } from 'dequal/lite'
-import {
-  ConfigInterface,
-  RevalidateOptionInterface,
-  revalidateType
-} from './types'
+import { Configuration, RevalidatorOptions, Revalidator } from './types'
 import Cache from './cache'
 import webPreset from './libs/web-preset'
 
@@ -14,9 +10,9 @@ const cache = new Cache()
 function onErrorRetry(
   _: unknown,
   __: string,
-  config: Readonly<Required<ConfigInterface>>,
-  revalidate: revalidateType,
-  opts: Required<RevalidateOptionInterface>
+  config: Readonly<Required<Configuration>>,
+  revalidate: Revalidator,
+  opts: Required<RevalidatorOptions>
 ): void {
   if (!config.isDocumentVisible()) {
     // if it's hidden, stop

src/swr-config-context.ts

@@ -1,8 +1,8 @@
 import { createContext } from 'react'
 
-import { ConfigInterface } from './types'
+import { SWRConfiguration } from './types'
 
-const SWRConfigContext = createContext<Partial<ConfigInterface>>({})
+const SWRConfigContext = createContext<SWRConfiguration>({})
 SWRConfigContext.displayName = 'SWRConfigContext'
 
 export default SWRConfigContext

src/types.ts

@@ -16,8 +16,8 @@ export interface Configuration<
   revalidateOnMount?: boolean
   revalidateOnReconnect: boolean
   shouldRetryOnError: boolean
-  fetcher: Fn
   suspense: boolean
+  fetcher: Fn
   initialData?: Data
 
   isOnline: () => boolean
@@ -50,11 +50,6 @@ export interface Configuration<
   compare: (a: Data | undefined, b: Data | undefined) => boolean
 }
 
-export interface RevalidateOptionInterface {
-  retryCount?: number
-  dedupe?: boolean
-}
-
 export type ValueKey = string | any[] | null
 
 export type Updater<Data = any, Error = any> = (
@@ -125,7 +120,7 @@ export type responseInterface<Data, Error> = {
   ) => Promise<Data | undefined>
   isValidating: boolean
 }
-export type SWRResponse<Data, Error> = {
+export interface SWRResponse<Data, Error> {
   data?: Data
   error?: Error
   revalidate: () => Promise<boolean>
@@ -168,10 +163,8 @@ export type SWRInfiniteResponseInterface<Data = any, Error = any> = SWRResponse<
     size: number | ((size: number) => number)
   ) => Promise<Data[] | undefined>
 }
-export type SWRInfiniteResponse<Data = any, Error = any> = SWRResponse<
-  Data[],
-  Error
-> & {
+export interface SWRInfiniteResponse<Data = any, Error = any>
+  extends SWRResponse<Data[], Error> {
   size: number
   setSize: (
     size: number | ((size: number) => number)

src/use-swr-infinite.ts

@@ -22,11 +22,11 @@ function useSWRInfinite<Data = any, Error = any>(
   ...args:
     | readonly [KeyLoader<Data>]
     | readonly [KeyLoader<Data>, Fetcher<Data>]
-    | readonly [KeyLoader<Data>, Partial<SWRInfiniteConfiguration<Data, Error>>]
+    | readonly [KeyLoader<Data>, SWRInfiniteConfiguration<Data, Error>]
     | readonly [
         KeyLoader<Data>,
         Fetcher<Data>,
-        Partial<SWRInfiniteConfiguration<Data, Error>>
+        SWRInfiniteConfiguration<Data, Error>
       ]
 ): SWRInfiniteResponse<Data, Error> {
   const getKey = args[0]