Merge branch 'main' into peer-types

Author: MatanBobi

package.json

@@ -50,24 +50,28 @@
   "devDependencies": {
     "@testing-library/dom": "^10.0.0",
     "@testing-library/jest-dom": "^5.11.6",
-    "@types/react-dom": "^18.2.25",
+    "@types/react": "^18.3.1",
     "chalk": "^4.1.2",
     "dotenv-cli": "^4.0.0",
     "jest-diff": "^29.7.0",
     "kcd-scripts": "^13.0.0",
     "npm-run-all": "^4.1.5",
-    "react": "^18.3.0",
+    "react": "^18.3.1",
     "react-dom": "^18.3.0",
     "rimraf": "^3.0.2",
     "typescript": "^4.1.2"
   },
   "peerDependencies": {
     "@testing-library/dom": "^10.0.0",
     "@types/react-dom": "^18.0.0",
+    "@types/react": "^18.0.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
   "peerDependenciesMeta": {
+    "@types/react": {
+      "optional": true
+    },
     "@types/react-dom": {
       "optional": true
     }

types/index.d.ts

@@ -7,7 +7,9 @@ import {
   prettyFormat,
   Config as ConfigDTL,
 } from '@testing-library/dom'
-import {act as reactAct} from 'react-dom/test-utils'
+import {act as reactDeprecatedAct} from 'react-dom/test-utils'
+//@ts-ignore
+import {act as reactAct} from 'react'
 
 export * from '@testing-library/dom'
 
@@ -245,10 +247,11 @@ export function renderHook<
 export function cleanup(): void
 
 /**
- * Simply calls ReactDOMTestUtils.act(cb)
+ * Simply calls React.act(cb)
  * If that's not available (older version of react) then it
- * simply calls the given callback immediately
+ * simply calls the deprecated version which is ReactTestUtils.act(cb)
  */
-export const act: typeof reactAct extends undefined
-  ? (callback: () => void) => void
+// IfAny<typeof reactAct, reactDeprecatedAct, reactAct> from https://stackoverflow.com/a/61626123/3406963
+export const act: 0 extends 1 & typeof reactAct
+  ? typeof reactDeprecatedAct
   : typeof reactAct