Commit 8e536f8

authored

feat: Enable "missing act" warnings in React 18 by default (#994)

1 parent d8c6b4d commit 8e536f8Copy full SHA for 8e536f8

File tree

3 files changed

+27

-15

lines changed

src
- act-compat.js
- index.js
tests
- setup-env.js

3 files changed

+27

-15

lines changed

`‎src/act-compat.js‎`

Lines changed: 11 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ function getGlobalThis() {`
`32`	`32`	`throw new Error('unable to locate global object')`
`33`	`33`	`}`
`34`	`34`
`35`		`-function setReactActEnvironment(isReactActEnvironment) {`
	`35`	`+function setIsReactActEnvironment(isReactActEnvironment) {`
`36`	`36`	`getGlobalThis().IS_REACT_ACT_ENVIRONMENT = isReactActEnvironment`
`37`	`37`	`}`
`38`	`38`
`@@ -43,7 +43,7 @@ function getIsReactActEnvironment() {`
`43`	`43`	`function withGlobalActEnvironment(actImplementation) {`
`44`	`44`	`return callback => {`
`45`	`45`	`const previousActEnvironment = getIsReactActEnvironment()`
`46`		`- setReactActEnvironment(true)`
	`46`	`+ setIsReactActEnvironment(true)`
`47`	`47`	`try {`
`48`	`48`	// The return value of `act` is always a thenable.
`49`	`49`	`let callbackNeedsToBeAwaited = false`
`@@ -64,24 +64,24 @@ function withGlobalActEnvironment(actImplementation) {`
`64`	`64`	`then: (resolve, reject) => {`
`65`	`65`	`thenable.then(`
`66`	`66`	`returnValue => {`
`67`		`- setReactActEnvironment(previousActEnvironment)`
	`67`	`+ setIsReactActEnvironment(previousActEnvironment)`
`68`	`68`	`resolve(returnValue)`
`69`	`69`	`},`
`70`	`70`	`error => {`
`71`		`- setReactActEnvironment(previousActEnvironment)`
	`71`	`+ setIsReactActEnvironment(previousActEnvironment)`
`72`	`72`	`reject(error)`
`73`	`73`	`},`
`74`	`74`	`)`
`75`	`75`	`},`
`76`	`76`	`}`
`77`	`77`	`} else {`
`78`		`- setReactActEnvironment(previousActEnvironment)`
	`78`	`+ setIsReactActEnvironment(previousActEnvironment)`
`79`	`79`	`return actResult`
`80`	`80`	`}`
`81`	`81`	`} catch (error) {`
`82`	`82`	// Can't be a `finally {}` block since we don't know if we have to immediately restore IS_REACT_ACT_ENVIRONMENT
`83`	`83`	`// or if we have to await the callback first.`
`84`		`- setReactActEnvironment(previousActEnvironment)`
	`84`	`+ setIsReactActEnvironment(previousActEnvironment)`
`85`	`85`	`throw error`
`86`	`86`	`}`
`87`	`87`	`}`
`@@ -203,6 +203,10 @@ function asyncAct(cb) {`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`export default act`
`206`		`-export {asyncAct, setReactActEnvironment, getIsReactActEnvironment}`
	`206`	`+export {`
	`207`	`+ asyncAct,`
	`208`	`+ setIsReactActEnvironment as setReactActEnvironment,`
	`209`	`+ getIsReactActEnvironment,`
	`210`	`+}`
`207`	`211`
`208`	`212`	`/* eslint no-console:0 */`

`‎src/index.js‎`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+import {getIsReactActEnvironment, setReactActEnvironment} from './act-compat'`
`1`	`2`	`import {cleanup} from './pure'`
`2`	`3`
`3`	`4`	`// if we're running in a test runner that supports afterEach`
`@@ -20,6 +21,21 @@ if (typeof process === 'undefined' \|\| !process.env?.RTL_SKIP_AUTO_CLEANUP) {`
`20`	`21`	`cleanup()`
`21`	`22`	`})`
`22`	`23`	`}`
	`24`	`+`
	`25`	`+ // No test setup with other test runners available`
	`26`	`+ /* istanbul ignore else */`
	`27`	`+ if (typeof beforeAll === 'function' && typeof afterAll === 'function') {`
	`28`	`+ // This matches the behavior of React < 18.`
	`29`	`+ let previousIsReactActEnvironment = getIsReactActEnvironment()`
	`30`	`+ beforeAll(() => {`
	`31`	`+ previousIsReactActEnvironment = getIsReactActEnvironment()`
	`32`	`+ setReactActEnvironment(true)`
	`33`	`+ })`
	`34`	`+`
	`35`	`+ afterAll(() => {`
	`36`	`+ setReactActEnvironment(previousIsReactActEnvironment)`
	`37`	`+ })`
	`38`	`+ }`
`23`	`39`	`}`
`24`	`40`
`25`	`41`	`export * from './pure'`

`‎tests/setup-env.js‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1 @@`
`1`	`1`	`import '@testing-library/jest-dom/extend-expect'`
`2`		`-`
`3`		`-beforeEach(() => {`
`4`		`- global.IS_REACT_ACT_ENVIRONMENT = true`
`5`		`-})`
`6`		`-`
`7`		`-afterEach(() => {`
`8`		`- global.IS_REACT_ACT_ENVIRONMENT = false`
`9`		`-})`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 8e536f8

File tree

3 files changed

3 files changed

`‎src/act-compat.js‎`

`‎src/index.js‎`

`‎tests/setup-env.js‎`

0 commit comments