Integrate the listener middleware into the RTK package

.codesandbox/ci.json

@@ -12,13 +12,11 @@
   "packages": [
     "packages/toolkit",
     "packages/rtk-query-graphql-request-base-query",
-    "packages/action-listener-middleware",
     "packages/rtk-query-codegen-openapi"
   ],
   "publishDirectory": {
     "@reduxjs/toolkit": "packages/toolkit",
     "@rtk-query/graphql-request-base-query": "packages/rtk-query-graphql-request-base-query",
-    "@rtk-incubator/action-listener-middleware": "packages/action-listener-middleware",
     "@rtk-query/codegen-openapi": "packages/rtk-query-codegen-openapi"
   }
 }

.github/workflows/tests.yml

@@ -96,7 +96,7 @@ jobs:
       fail-fast: false
       matrix:
         node: ['14.x']
-        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', 'next']
+        ts: ['4.1', '4.2', '4.3', '4.4', '4.5', '4.6.1-rc', 'next']
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2

package.json

@@ -47,7 +47,7 @@
     "test": "yarn test:packages",
     "build:examples": "yarn workspaces foreach --include '@reduxjs/*' --include '@examples-query-react/*' --include '@examples-action-listener/*' -vtp run build",
     "build:docs": "yarn workspace website run build",
-    "build:packages": "yarn workspaces foreach --include '@reduxjs/*' --include '@rtk-query/*' --include '@rtk-incubator/*' --topological-dev run build",
+    "build:packages": "yarn workspaces foreach --include '@reduxjs/*' --include '@rtk-query/*' --topological-dev run build",
     "test:packages": "yarn workspaces foreach --include '@reduxjs/*' --include '@rtk-query/*'  --include '@rtk-incubator/*' run test",
     "dev:docs": "yarn workspace website run start"
   }

packages/toolkit/src/createAction.ts

@@ -81,7 +81,7 @@ export type _ActionCreatorWithPreparedPayload<
  *
  * @inheritdoc {redux#ActionCreator}
  */
-interface BaseActionCreator<P, T extends string, M = never, E = never> {
+export interface BaseActionCreator<P, T extends string, M = never, E = never> {
   type: T
   match: (action: Action<unknown>) => action is PayloadAction<P, T, M, E>
 }

packages/toolkit/src/devtoolsExtension.ts

@@ -173,13 +173,17 @@ export interface EnhancerOptions {
   traceLimit?: number
 }
 
+type Compose = typeof compose
+
+interface ComposeWithDevTools {
+  (options: EnhancerOptions): Compose
+  <StoreExt>(...funcs: StoreEnhancer<StoreExt>[]): StoreEnhancer<StoreExt>
+}
+
 /**
  * @public
  */
-export const composeWithDevTools: {
-  (options: EnhancerOptions): typeof compose
-  <StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>): StoreEnhancer<StoreExt>
-} =
+export const composeWithDevTools: ComposeWithDevTools =
   typeof window !== 'undefined' &&
   (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
     ? (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__

packages/toolkit/src/index.ts

@@ -150,3 +150,34 @@ export type {
 export { nanoid } from './nanoid'
 
 export { default as isPlainObject } from './isPlainObject'
+
+export type {
+  ListenerEffect,
+  ListenerMiddleware,
+  ListenerEffectAPI,
+  ListenerMiddlewareInstance,
+  CreateListenerMiddlewareOptions,
+  ListenerErrorHandler,
+  TypedStartListening,
+  TypedAddListener,
+  TypedStopListening,
+  TypedRemoveListener,
+  Unsubscribe,
+  ForkedTaskExecutor,
+  ForkedTask,
+  ForkedTaskAPI,
+  AsyncTaskExecutor,
+  SyncTaskExecutor,
+  TaskCancelled,
+  TaskRejected,
+  TaskResolved,
+  TaskResult,
+} from './listenerMiddleware/index'
+
+export {
+  createListenerMiddleware,
+  addListener,
+  removeListener,
+  removeAllListeners,
+  TaskAbortError,
+} from './listenerMiddleware/index'

packages/action-listener-middleware/src/index.ts → packages/toolkit/src/listenerMiddleware/index.ts

@@ -1,21 +1,14 @@
-import type {
-  Middleware,
-  Dispatch,
-  AnyAction,
-  Action,
-  ThunkDispatch,
-  MiddlewareAPI,
-} from '@reduxjs/toolkit'
-import { createAction, nanoid } from '@reduxjs/toolkit'
+import type { Dispatch, AnyAction, MiddlewareAPI } from 'redux'
+import type { ThunkDispatch } from 'redux-thunk'
+import { createAction } from '../createAction'
+import { nanoid } from '../nanoid'
 
 import type {
   ListenerMiddleware,
   ListenerMiddlewareInstance,
   AddListenerOverloads,
   AnyListenerPredicate,
   CreateListenerMiddlewareOptions,
-  TypedActionCreator,
-  TypedStartListening,
   TypedAddListener,
   TypedCreateListenerEntry,
   FallbackAddListenerOptions,
@@ -27,7 +20,6 @@ import type {
   ForkedTaskExecutor,
   ForkedTask,
   TypedRemoveListener,
-  TypedStopListening,
   TaskResult,
 } from './types'
 import {