From 05eed818aecf43f37a07ec5dce82b9080dddef92 Mon Sep 17 00:00:00 2001
From: Sergey Lutov <doublemakers@gmail.com>
Date: Thu, 14 Apr 2022 18:02:01 +0300
Subject: [PATCH] fix(compose): generic types

---
 .../src/browser/extension/inject/pageScript.ts | 18 +++++++++---------
 packages/redux-devtools-extension/src/index.ts | 14 +++++++-------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/extension/src/browser/extension/inject/pageScript.ts b/extension/src/browser/extension/inject/pageScript.ts
index a0d48399..bd2548be 100644
--- a/extension/src/browser/extension/inject/pageScript.ts
+++ b/extension/src/browser/extension/inject/pageScript.ts
@@ -600,8 +600,8 @@ const extensionCompose =
   };
 
 interface ReduxDevtoolsExtensionCompose {
-  (config: Config): (...funcs: StoreEnhancer[]) => StoreEnhancer;
-  (...funcs: StoreEnhancer[]): StoreEnhancer;
+  (config: Config): <StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>) => StoreEnhancer<StoreExt>;
+  <StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>): StoreEnhancer<StoreExt>;
 }
 
 declare global {
@@ -610,20 +610,20 @@ declare global {
   }
 }
 
-function reduxDevtoolsExtensionCompose(
+function reduxDevtoolsExtensionCompose<StoreExt>(
   config: Config
-): (...funcs: StoreEnhancer[]) => StoreEnhancer;
-function reduxDevtoolsExtensionCompose(
-  ...funcs: StoreEnhancer[]
-): StoreEnhancer;
-function reduxDevtoolsExtensionCompose(...funcs: [Config] | StoreEnhancer[]) {
+): (...funcs: Array<StoreEnhancer<StoreExt>>) => StoreEnhancer<StoreExt>;
+function reduxDevtoolsExtensionCompose<StoreExt>(
+  ...funcs: Array<StoreEnhancer<StoreExt>>
+): StoreEnhancer<StoreExt>;
+function reduxDevtoolsExtensionCompose<StoreExt>(...funcs: [Config] | Array<StoreEnhancer<StoreExt>>) {
   if (funcs.length === 0) {
     return __REDUX_DEVTOOLS_EXTENSION__();
   }
   if (funcs.length === 1 && typeof funcs[0] === 'object') {
     return extensionCompose(funcs[0]);
   }
-  return extensionCompose({})(...(funcs as StoreEnhancer[]));
+  return extensionCompose({})(...(funcs as Array<StoreEnhancer<StoreExt>>));
 }
 
 window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ = reduxDevtoolsExtensionCompose;
diff --git a/packages/redux-devtools-extension/src/index.ts b/packages/redux-devtools-extension/src/index.ts
index 140909cf..cc3f29c9 100644
--- a/packages/redux-devtools-extension/src/index.ts
+++ b/packages/redux-devtools-extension/src/index.ts
@@ -195,8 +195,8 @@ interface ReduxDevtoolsExtension {
 }
 
 export interface ReduxDevtoolsExtensionCompose {
-  (config: Config): (...funcs: StoreEnhancer[]) => StoreEnhancer;
-  (...funcs: StoreEnhancer[]): StoreEnhancer;
+  (config: Config): <StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>) => StoreEnhancer<StoreExt>;
+  <StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>): StoreEnhancer<StoreExt>;
 }
 
 declare global {
@@ -206,14 +206,14 @@ declare global {
   }
 }
 
-function extensionComposeStub(
+function extensionComposeStub<StoreExt>(
   config: Config
-): (...funcs: StoreEnhancer[]) => StoreEnhancer;
-function extensionComposeStub(...funcs: StoreEnhancer[]): StoreEnhancer;
-function extensionComposeStub(...funcs: [Config] | StoreEnhancer[]) {
+): (...funcs: Array<StoreEnhancer<StoreExt>>) => StoreEnhancer<StoreExt>;
+function extensionComposeStub<StoreExt>(...funcs: Array<StoreEnhancer<StoreExt>>): StoreEnhancer<StoreExt>;
+function extensionComposeStub<StoreExt>(...funcs: [Config] | Array<StoreEnhancer<StoreExt>>) {
   if (funcs.length === 0) return undefined;
   if (typeof funcs[0] === 'object') return compose;
-  return compose(...(funcs as StoreEnhancer[]));
+  return compose(...(funcs as Array<StoreEnhancer<StoreExt>>));
 }
 
 export const composeWithDevTools: ReduxDevtoolsExtensionCompose =