Use isomorphic act if available

Author: eps1lon

src/__tests__/no-act.js

@@ -12,7 +12,15 @@ afterEach(() => {
   consoleErrorMock.mockRestore()
 })
 
+// no react-dom/test-utils also means no isomorphic act since isomorphic act got released after test-utils act
 jest.mock('react-dom/test-utils', () => ({}))
+jest.mock('react', () => {
+  const ReactActual = jest.requireActual('react')
+
+  delete ReactActual.unstable_act
+
+  return ReactActual
+})
 
 test('act works even when there is no act from test utils', () => {
   const callback = jest.fn()

src/act-compat.js

@@ -2,8 +2,9 @@ import * as React from 'react'
 import ReactDOM from 'react-dom'
 import * as testUtils from 'react-dom/test-utils'
 
-const reactAct = testUtils.act
-const actSupported = reactAct !== undefined
+const isomorphicAct = React.unstable_act
+const domAct = testUtils.act
+const actSupported = domAct !== undefined
 
 // act is supported [email protected]
 // so for versions that don't have act from test utils
@@ -14,7 +15,7 @@ function actPolyfill(cb) {
   ReactDOM.render(<div />, document.createElement('div'))
 }
 
-const act = reactAct || actPolyfill
+const act = isomorphicAct || domAct || actPolyfill
 
 let youHaveBeenWarned = false
 let isAsyncActSupported = null
@@ -50,7 +51,7 @@ function asyncAct(cb) {
         }
         let cbReturn, result
         try {
-          result = reactAct(() => {
+          result = domAct(() => {
             cbReturn = cb()
             return cbReturn
           })

src/pure.js

@@ -14,10 +14,7 @@ configureDTL({
   eventWrapper: cb => {
     let result
     act(() => {
-      // TODO: Remove ReactDOM.flushSync once `act` flushes the microtask queue.
-      // Otherwise `act` wrapping updates that schedule microtask would need to be followed with `await null` to flush the microtask queue manually
-      // See https://github.com/reactwg/react-18/discussions/21#discussioncomment-796755
-      result = ReactDOM.flushSync(cb)
+      result = cb()
     })
     return result
   },

tests/setup-env.js

@@ -1,5 +1 @@
 import '@testing-library/jest-dom/extend-expect'
-
-// TODO: Can be removed in a future React release: https://github.com/reactwg/react-18/discussions/23#discussioncomment-798952
-// eslint-disable-next-line import/no-extraneous-dependencies -- need the version from React not an explicitly declared one
-jest.mock('scheduler', () => require('scheduler/unstable_mock'))