Merge pull request #3177 from Methuselah96/redux-alpha-fix-type-errors

Author: markerikson

packages/toolkit/src/tests/configureStore.test.ts

@@ -270,7 +270,7 @@ describe('configureStore', async () => {
       let dummyEnhancerCalled = false
 
       const dummyEnhancer: StoreEnhancer =
-        (createStore: StoreEnhancerStoreCreator) =>
+        (createStore) =>
         (reducer, ...args: any[]) => {
           dummyEnhancerCalled = true
 

packages/toolkit/src/tests/configureStore.typetest.ts

@@ -159,9 +159,9 @@ const _anyMiddleware: any = () => () => () => {}
   })
 
   {
-    type SomePropertyStoreEnhancer = StoreEnhancer<{ someProperty: string }>
-
-    const somePropertyStoreEnhancer: SomePropertyStoreEnhancer = (next) => {
+    const somePropertyStoreEnhancer: StoreEnhancer<{ someProperty: string }> = (
+      next
+    ) => {
       return (reducer, preloadedState) => {
         return {
           ...next(reducer, preloadedState),
@@ -170,13 +170,9 @@ const _anyMiddleware: any = () => () => () => {}
       }
     }
 
-    type AnotherPropertyStoreEnhancer = StoreEnhancer<{
+    const anotherPropertyStoreEnhancer: StoreEnhancer<{
       anotherProperty: number
-    }>
-
-    const anotherPropertyStoreEnhancer: AnotherPropertyStoreEnhancer = (
-      next
-    ) => {
+    }> = (next) => {
       return (reducer, preloadedState) => {
         return {
           ...next(reducer, preloadedState),
@@ -187,7 +183,10 @@ const _anyMiddleware: any = () => () => () => {}
 
     const store = configureStore({
       reducer: () => 0,
-      enhancers: [somePropertyStoreEnhancer, anotherPropertyStoreEnhancer],
+      enhancers: [
+        somePropertyStoreEnhancer,
+        anotherPropertyStoreEnhancer,
+      ] as const,
     })
 
     expectType<Dispatch & ThunkDispatch<number, undefined, AnyAction>>(

packages/toolkit/src/tsHelpers.ts

@@ -101,8 +101,14 @@ export type ExtractDispatchExtensions<M> = M extends MiddlewareArray<
   ? ExtractDispatchFromMiddlewareTuple<[...M], {}>
   : never
 
-export type ExtractStoreExtensions<E> = E extends any[]
-  ? UnionToIntersection<E[number] extends StoreEnhancer<infer Ext> ? Ext extends {} ? Ext : {} : {}>
+export type ExtractStoreExtensions<E> = E extends readonly any[]
+  ? UnionToIntersection<
+      E[number] extends StoreEnhancer<infer Ext>
+        ? Ext extends {}
+          ? Ext
+          : {}
+        : {}
+    >
   : {}
 
 /**