From a25cc468df83d12002885d4c3c08831430827c0a Mon Sep 17 00:00:00 2001
From: hardfist <1562502418@qq.com>
Date: Wed, 31 Mar 2021 13:53:15 +0800
Subject: [PATCH] fix: fix type export problem & but api-extractor fails

---
 package.json |  7 ++++---
 src/index.ts | 32 +++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 85c28761aa..216b79b039 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   "main": "dist/index.js",
   "module": "dist/redux-toolkit.esm.js",
   "unpkg": "dist/redux-toolkit.umd.min.js",
-  "types": "dist/typings.d.ts",
+  "types": "dist/index.d.ts",
   "author": "Mark Erikson <mark@isquaredsoftware.com>",
   "license": "MIT",
   "devDependencies": {
@@ -54,7 +54,7 @@
   },
   "scripts": {
     "build-ci": "node scripts/build.js && tsc && tsc -p src/query/tsconfig.json && api-extractor run",
-    "build": "node scripts/build.js && tsc && tsc -p src/query/tsconfig.json   && api-extractor run --local",
+    "build": "node scripts/build.js && tsc && tsc -p src/query/tsconfig.json ",
     "dev": "tsdx watch  --format cjs,esm,system,umd",
     "format": "prettier --write \"src/**/*.ts\" \"**/*.md\"",
     "format:check": "prettier --list-different \"src/**/*.ts\" \"docs/*/**.md\"",
@@ -66,6 +66,7 @@
   "files": [
     "dist/*.js",
     "dist/*.js.map",
+    "dist/*.d.ts",
     "dist/typings.d.ts",
     "src",
     "query"
@@ -96,4 +97,4 @@
     "doc": "docs",
     "example": "example"
   }
-}
+}
\ No newline at end of file
diff --git a/src/index.ts b/src/index.ts
index 8f44779977..d87f52b53a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -2,21 +2,21 @@ import { enableES5 } from 'immer'
 export * from 'redux'
 export {
   default as createNextState,
-  Draft,
   current,
   freeze,
   original,
   isDraft,
 } from 'immer'
-export {
-  createSelector,
+export type { Draft } from 'immer'
+export { createSelector } from 'reselect'
+export type {
   Selector,
   OutputParametricSelector,
   OutputSelector,
   ParametricSelector,
 } from 'reselect'
 export { createDraftSafeSelector } from './createDraftSafeSelector'
-export { ThunkAction, ThunkDispatch } from 'redux-thunk'
+export type { ThunkAction, ThunkDispatch } from 'redux-thunk'
 
 // We deliberately enable Immer's ES5 support, on the grounds that
 // we assume RTK will be used with React Native and other Proxy-less
@@ -27,6 +27,8 @@ enableES5()
 export {
   // js
   configureStore,
+} from './configureStore'
+export type {
   // types
   ConfigureEnhancersCallback,
   ConfigureStoreOptions,
@@ -36,6 +38,8 @@ export {
   // js
   createAction,
   getType,
+} from './createAction'
+export type {
   // types
   PayloadAction,
   PayloadActionCreator,
@@ -49,6 +53,8 @@ export {
 export {
   // js
   createReducer,
+} from './createReducer'
+export type {
   // types
   Actions,
   CaseReducer,
@@ -57,6 +63,9 @@ export {
 export {
   // js
   createSlice,
+} from './createSlice'
+
+export type {
   // types
   CreateSliceOptions,
   Slice,
@@ -70,6 +79,8 @@ export {
   // js
   createImmutableStateInvariantMiddleware,
   isImmutableDefault,
+} from './immutableStateInvariantMiddleware'
+export type {
   // types
   ImmutableStateInvariantMiddlewareOptions,
 } from './immutableStateInvariantMiddleware'
@@ -78,6 +89,8 @@ export {
   createSerializableStateInvariantMiddleware,
   findNonSerializableValue,
   isPlain,
+} from './serializableStateInvariantMiddleware'
+export type {
   // types
   SerializableStateInvariantMiddlewareOptions,
 } from './serializableStateInvariantMiddleware'
@@ -85,14 +98,14 @@ export {
   // js
   getDefaultMiddleware,
 } from './getDefaultMiddleware'
-export {
+export type {
   // types
   ActionReducerMapBuilder,
 } from './mapBuilders'
 export { MiddlewareArray } from './utils'
 
 export { createEntityAdapter } from './entities/create_adapter'
-export {
+export type {
   Dictionary,
   EntityState,
   EntityAdapter,
@@ -104,14 +117,13 @@ export {
   Comparer,
 } from './entities/models'
 
-export {
+export { createAsyncThunk, unwrapResult } from './createAsyncThunk'
+export type {
   AsyncThunk,
   AsyncThunkOptions,
   AsyncThunkAction,
   AsyncThunkPayloadCreatorReturnValue,
   AsyncThunkPayloadCreator,
-  createAsyncThunk,
-  unwrapResult,
   SerializedError,
 } from './createAsyncThunk'
 
@@ -124,6 +136,8 @@ export {
   isFulfilled,
   isAsyncThunkAction,
   isRejectedWithValue,
+} from './matchers'
+export type {
   // types
   ActionMatchingAllOf,
   ActionMatchingAnyOf,