chore: reorganize entries (#3048)

Author: huozhi

package.json

@@ -11,21 +11,21 @@
     "fetch"
   ],
   "packageManager": "[email protected]",
-  "main": "./dist/core/index.js",
-  "module": "./dist/core/index.mjs",
-  "types": "./dist/core/index.d.ts",
+  "main": "./dist/index/index.js",
+  "module": "./dist/index/index.mjs",
+  "types": "./dist/index/index.d.ts",
   "sideEffects": false,
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "react-server": "./dist/core/react-server.mjs",
+      "react-server": "./dist/index/react-server.mjs",
       "import": {
-        "types": "./dist/core/index.d.mts",
-        "default": "./dist/core/index.mjs"
+        "types": "./dist/index/index.d.mts",
+        "default": "./dist/index/index.mjs"
       },
       "require": {
-        "types": "./dist/core/index.d.ts",
-        "default": "./dist/core/index.js"
+        "types": "./dist/index/index.d.ts",
+        "default": "./dist/index/index.js"
       }
     },
     "./infinite": {

src/core/index.ts

@@ -1,5 +1,5 @@
-import type { Middleware } from '../core'
-import useSWR from '../core'
+import type { Middleware } from '../index'
+import useSWR from '../index'
 import { withMiddleware } from '../_internal'
 
 export const immutable: Middleware = useSWRNext => (key, fetcher, config) => {

src/immutable/index.ts

@@ -1,2 +1,2 @@
-export { unstable_serialize } from '../core/serialize'
+export { unstable_serialize } from './serialize'
 export { SWRConfig } from './config'

src/index/index.react-server.ts

@@ -1,2 +1,30 @@
-export * from '../core'
-export { default } from '../core'
+// useSWR
+import useSWR from './use-swr'
+export default useSWR
+// Core APIs
+export { SWRConfig } from './use-swr'
+export { unstable_serialize } from './serialize'
+export { useSWRConfig } from '../_internal'
+export { mutate } from '../_internal'
+export { preload } from '../_internal'
+
+// Types
+export type {
+  SWRConfiguration,
+  Revalidator,
+  RevalidatorOptions,
+  Key,
+  KeyLoader,
+  KeyedMutator,
+  SWRHook,
+  SWRResponse,
+  Cache,
+  BareFetcher,
+  Fetcher,
+  MutatorCallback,
+  MutatorOptions,
+  Middleware,
+  Arguments,
+  State,
+  ScopedMutator
+} from '../_internal'

src/index/index.ts

@@ -267,7 +267,7 @@ export const useSWRHandler = <Data = any, Error = any>(
   const cachedData = cached.data
 
   const data = isUndefined(cachedData)
-    ? (fallback && isPromiseLike(fallback))
+    ? fallback && isPromiseLike(fallback)
       ? use(fallback)
       : fallback
     : cachedData

src/core/serialize.ts renamed to src/index/serialize.ts

@@ -2,8 +2,8 @@
 // hook where `key` and return type are not like the normal `useSWR` types.
 
 import { useRef, useCallback } from 'react'
-import type { SWRConfig } from '../core'
-import useSWR from '../core'
+import type { SWRConfig } from '../index'
+import useSWR from '../index'
 import {
   isUndefined,
   isFunction,
@@ -37,19 +37,10 @@ import type {
 import { useSyncExternalStore } from 'use-sync-external-store/shim/index.js'
 import { getFirstPageKey } from './serialize'
 
-// const INFINITE_PREFIX = '$inf$'
 const EMPTY_PROMISE = Promise.resolve() as Promise<undefined>
 
-// const getFirstPageKey = (getKey: SWRInfiniteKeyLoader) => {
-//   return serialize(getKey ? getKey(0, null) : null)[0]
-// }
-
 export { unstable_serialize } from './serialize'
 
-// export const unstable_serialize = (getKey: SWRInfiniteKeyLoader) => {
-//   return INFINITE_PREFIX + getFirstPageKey(getKey)
-// }
-
 export const infinite = (<Data, Error>(useSWRNext: SWRHook) =>
   (
     getKey: SWRInfiniteKeyLoader,

src/core/use-swr.ts renamed to src/index/use-swr.ts

@@ -1,5 +1,5 @@
 import { useCallback, useRef } from 'react'
-import useSWR, { useSWRConfig } from '../core'
+import useSWR, { useSWRConfig } from '../index'
 import type { Middleware, Key } from '../_internal'
 import { useStateWithDeps, startTransition } from './state'
 import {

src/infinite/index.ts

@@ -1,4 +1,4 @@
-import type { SWRResponse, Key, Arguments } from '../core'
+import type { SWRResponse, Key, Arguments } from '../index'
 
 type FetcherResponse<Data> = Data | Promise<Data>