Fix potential TS 4.7-related syntax issues

Author: markerikson

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/query/tests/buildHooks.test.tsx

@@ -963,15 +963,15 @@ describe('hooks tests', () => {
         const unwrappedErrorResult =
           screen.getByTestId('unwrappedError')?.textContent
 
-        errorResult &&
-          unwrappedErrorResult &&
+        if (errorResult && unwrappedErrorResult) {
           expect(JSON.parse(errorResult)).toMatchObject({
             status: 500,
             data: null,
-          }) &&
+          })
           expect(JSON.parse(unwrappedErrorResult)).toMatchObject(
             JSON.parse(errorResult)
           )
+        }
       })
 
       expect(screen.getByTestId('result').textContent).toBe('')
@@ -1015,14 +1015,14 @@ describe('hooks tests', () => {
         const unwrappedDataResult =
           screen.getByTestId('unwrappedResult')?.textContent
 
-        dataResult &&
-          unwrappedDataResult &&
+        if (dataResult && unwrappedDataResult) {
           expect(JSON.parse(dataResult)).toMatchObject({
             name: 'Timmy',
-          }) &&
+          })
           expect(JSON.parse(unwrappedDataResult)).toMatchObject(
             JSON.parse(dataResult)
           )
+        }
       })
 
       expect(screen.getByTestId('error').textContent).toBe('')