Reverted changes to all spec files of this branch.

Author: apepper

test/components/Provider.spec.tsx

@@ -1,8 +1,7 @@
 /*eslint-disable react/prop-types*/
 
-import * as React from 'react'
-import { Component, Dispatch, StrictMode } from 'react'
-import { render, unmountComponentAtNode } from 'react-dom'
+import React, { Component, Dispatch } from 'react'
+import ReactDOM from 'react-dom'
 import { createStore } from 'redux'
 import { Provider, connect, ReactReduxContext } from '../../src/index'
 import * as rtl from '@testing-library/react'
@@ -312,18 +311,18 @@ describe('React', () => {
     })
 
     it('works in <StrictMode> without warnings (React 16.3+)', () => {
-      if (!StrictMode) {
+      if (!React.StrictMode) {
         return
       }
       const spy = jest.spyOn(console, 'error').mockImplementation(() => {})
       const store = createStore(() => ({}))
 
       rtl.render(
-        <StrictMode>
+        <React.StrictMode>
           <Provider store={store}>
             <div />
           </Provider>
-        </StrictMode>
+        </React.StrictMode>
       )
 
       expect(spy).not.toHaveBeenCalled()
@@ -344,15 +343,15 @@ describe('React', () => {
       }
 
       const div = document.createElement('div')
-      render(
+      ReactDOM.render(
         <Provider store={store}>
           <div />
         </Provider>,
         div
       )
 
       expect(spy).toHaveBeenCalledTimes(0)
-      unmountComponentAtNode(div)
+      ReactDOM.unmountComponentAtNode(div)
       expect(spy).toHaveBeenCalledTimes(1)
     })
 

test/components/hooks.spec.tsx

@@ -1,14 +1,13 @@
 /*eslint-disable react/prop-types*/
 
-import * as React from 'react'
-import { useState, useEffect, version as reactVersion } from 'react'
+import React from 'react'
 import { createStore } from 'redux'
 import { Provider as ProviderMock, connect } from '../../src/index'
 import * as rtl from '@testing-library/react'
 import '@testing-library/jest-dom/extend-expect'
 import type { AnyAction } from 'redux'
 
-const IS_REACT_18 = reactVersion.startsWith('18')
+const IS_REACT_18 = React.version.startsWith('18')
 
 describe('React', () => {
   describe('connect', () => {
@@ -62,11 +61,11 @@ describe('React', () => {
       })
 
       const component1 = (props: Omit<RootStateType, 'byId'>) => {
-        const [state, setState] = useState({ list: props.list })
+        const [state, setState] = React.useState({ list: props.list })
 
         component1StateList = state.list
 
-        useEffect(() => {
+        React.useEffect(() => {
           setState((prevState) => ({ ...prevState, list: props.list }))
         }, [props.list])
 

test/integration/dynamic-reducers.spec.tsx

@@ -1,8 +1,7 @@
 /*eslint-disable react/prop-types*/
 
-import * as React from 'react'
-import { createContext } from 'react'
-import { renderToString } from 'react-dom/server'
+import React from 'react'
+import ReactDOMServer from 'react-dom/server'
 import { createStore, combineReducers } from 'redux'
 import { connect, Provider, ReactReduxContext } from '../../src/index'
 import * as rtl from '@testing-library/react'
@@ -30,7 +29,9 @@ describe('React', () => {
     because it's the popular approach, this test targets nr 3.
   */
   describe('dynamic reducers', () => {
-    const InjectReducersContext = createContext<((r: any) => void) | null>(null)
+    const InjectReducersContext = React.createContext<
+      ((r: any) => void) | null
+    >(null)
 
     type Reducer = (s: any) => any
 
@@ -184,7 +185,7 @@ describe('React', () => {
       // @ts-ignore
       console.error.mockImplementation(() => {})
 
-      const markup = renderToString(
+      const markup = ReactDOMServer.renderToString(
         <Provider store={store}>
           <InjectReducersContext.Provider value={injectReducers}>
             <InitialGreeting />

test/tsconfig.test.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "module": "esnext",
     "moduleResolution": "node",

test/typetests/react-redux-types.typetest.tsx

@@ -1,13 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars, no-inner-declarations */
-import {
-  createElement,
-  Component,
-  ComponentType,
-  ReactElement,
-  ReactNode,
-} from 'react'
-import * as React from 'react'
-import { render } from 'react-dom'
+import { Component, ReactElement } from 'react'
+import React from 'react'
+import ReactDOM from 'react-dom'
 import {
   configureStore,
   createSlice,
@@ -97,15 +91,15 @@ connect<ICounterStateProps, ICounterDispatchProps, {}, {}, CounterState>(
 )(Counter)
 
 class App extends Component<any, any> {
-  render(): ReactNode {
+  render(): React.ReactNode {
     // ...
     return null
   }
 }
 
 const targetEl = document.getElementById('root')
 
-render(
+ReactDOM.render(
   <Provider store={store}>
     <App />
   </Provider>,
@@ -135,7 +129,7 @@ type AddTodoAction = ReturnType<typeof addTodo>
 declare var todoActionCreators: { [type: string]: (...args: any[]) => any }
 declare var counterActionCreators: { [type: string]: (...args: any[]) => any }
 
-render(
+ReactDOM.render(
   <Provider store={store}>
     <MyRootComponent />
   </Provider>,
@@ -252,7 +246,7 @@ class TestComponent extends Component<TestProp, TestState> {}
 const WrappedTestComponent = connect()(TestComponent)
 
 // return value of the connect()(TestComponent) is of the type TestComponent
-let ATestComponent: ComponentType<TestProp>
+let ATestComponent: React.ComponentType<TestProp>
 ATestComponent = TestComponent
 ATestComponent = WrappedTestComponent
 
@@ -277,8 +271,11 @@ function HelloMessage(props: HelloMessageProps) {
   return <div>Hello {props.name}</div>
 }
 let ConnectedHelloMessage = connect()(HelloMessage)
-render(<HelloMessage name="Sebastian" />, document.getElementById('content'))
-render(
+ReactDOM.render(
+  <HelloMessage name="Sebastian" />,
+  document.getElementById('content')
+)
+ReactDOM.render(
   <ConnectedHelloMessage name="Sebastian" />,
   document.getElementById('content')
 )
@@ -327,7 +324,7 @@ namespace TestTOwnPropsInference {
     state: string
   }
 
-  class OwnPropsComponent extends Component<OwnProps & StateProps, {}> {
+  class OwnPropsComponent extends React.Component<OwnProps & StateProps, {}> {
     render() {
       return <div />
     }
@@ -355,28 +352,28 @@ namespace TestTOwnPropsInference {
   )(OwnPropsComponent)
 
   // @ts-expect-error
-  createElement(ConnectedWithoutOwnProps, { anything: 'goes!' })
+  React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' })
 
   // This compiles, as expected.
-  createElement(ConnectedWithOwnProps, { own: 'string' })
+  React.createElement(ConnectedWithOwnProps, { own: 'string' })
 
   // This should not compile, which is good.
   // @ts-expect-error
-  createElement(ConnectedWithOwnProps, { missingOwn: true })
+  React.createElement(ConnectedWithOwnProps, { missingOwn: true })
 
   // This compiles, as expected.
-  createElement(ConnectedWithTypeHint, { own: 'string' })
+  React.createElement(ConnectedWithTypeHint, { own: 'string' })
 
   // This should not compile, which is good.
   // @ts-expect-error
-  createElement(ConnectedWithTypeHint, { missingOwn: true })
+  React.createElement(ConnectedWithTypeHint, { missingOwn: true })
 
   interface AllProps {
     own: string
     state: string
   }
 
-  class AllPropsComponent extends Component<AllProps & DispatchProp> {
+  class AllPropsComponent extends React.Component<AllProps & DispatchProp> {
     render() {
       return <div />
     }