Skip to content

Commit 5940934

Browse files
ymqyeps1lon
andauthored
Update to Jest 29 (#26088)
## Summary - yarn.lock diff +-6249, **small pr** - use jest-environment-jsdom by default - uncaught error from jsdom is an error object instead of strings - abortSignal.reason is read-only in jsdom and node, https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/reason ## How did you test this change? ci green --------- Co-authored-by: Sebastian Silbermann <[email protected]>
1 parent 28fcae0 commit 5940934

File tree

66 files changed

+2981
-3806
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+2981
-3806
lines changed

fixtures/dom/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"classnames": "^2.2.5",
1212
"codemirror": "^5.40.0",
1313
"core-js": "^2.4.1",
14-
"jest-diff": "^25.1.0",
14+
"jest-diff": "^29.4.1",
1515
"prop-types": "^15.6.0",
1616
"query-string": "^4.2.3",
1717
"react": "^15.4.1",

fixtures/dom/src/toWarnDev.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// copied from scripts/jest/matchers/toWarnDev.js
22
'use strict';
33

4-
const jestDiff = require('jest-diff').default;
4+
const {diff: jestDiff} = require('jest-diff');
55
const util = require('util');
66

77
function shouldIgnoreConsoleError(format, args) {

fixtures/dom/yarn.lock

Lines changed: 48 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,17 @@
77
resolved "https://registry.yarnpkg.com/@babel/standalone/-/standalone-7.12.10.tgz#f77f6750d0ab88c7c23234dd2d2f3800f170a573"
88
integrity sha512-e3sJ7uwwjiGWv7qeATKrP+Mjltr6JEurPh3yR0dBb9ie2YDnKl52lO82f+Ha+HAtyxTHfsPIXwgFmWKsCT2zOQ==
99

10-
"@jest/types@^25.5.0":
11-
version "25.5.0"
12-
resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
13-
integrity sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==
10+
"@jest/schemas@^29.4.0":
11+
version "29.4.0"
12+
resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.4.0.tgz#0d6ad358f295cc1deca0b643e6b4c86ebd539f17"
13+
integrity sha512-0E01f/gOZeNTG76i5eWWSupvSHaIINrTie7vCyjiYFKgzNdyEGd12BUv4oNBFHOqlHDbtoJi3HrQ38KCC90NsQ==
1414
dependencies:
15-
"@types/istanbul-lib-coverage" "^2.0.0"
16-
"@types/istanbul-reports" "^1.1.1"
17-
"@types/yargs" "^15.0.0"
18-
chalk "^3.0.0"
15+
"@sinclair/typebox" "^0.25.16"
1916

20-
"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
21-
version "2.0.3"
22-
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
23-
integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
24-
25-
"@types/istanbul-lib-report@*":
26-
version "3.0.0"
27-
resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
28-
integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
29-
dependencies:
30-
"@types/istanbul-lib-coverage" "*"
31-
32-
"@types/istanbul-reports@^1.1.1":
33-
version "1.1.2"
34-
resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz#e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"
35-
integrity sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==
36-
dependencies:
37-
"@types/istanbul-lib-coverage" "*"
38-
"@types/istanbul-lib-report" "*"
39-
40-
"@types/yargs-parser@*":
41-
version "15.0.0"
42-
resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
43-
integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
44-
45-
"@types/yargs@^15.0.0":
46-
version "15.0.11"
47-
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.11.tgz#361d7579ecdac1527687bcebf9946621c12ab78c"
48-
integrity sha512-jfcNBxHFYJ4nPIacsi3woz1+kvUO6s1CyeEhtnDHBjHUMNj5UlW2GynmnSgiJJEdNg9yW5C8lfoNRZrHGv5EqA==
49-
dependencies:
50-
"@types/yargs-parser" "*"
17+
"@sinclair/typebox@^0.25.16":
18+
version "0.25.21"
19+
resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.25.21.tgz#763b05a4b472c93a8db29b2c3e359d55b29ce272"
20+
integrity sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==
5121

5222
abab@^1.0.3:
5323
version "1.0.4"
@@ -184,11 +154,6 @@ ansi-regex@^3.0.0:
184154
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
185155
integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
186156

187-
ansi-regex@^5.0.0:
188-
version "5.0.0"
189-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
190-
integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
191-
192157
ansi-styles@^2.2.1:
193158
version "2.2.1"
194159
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -201,13 +166,18 @@ ansi-styles@^3.0.0, ansi-styles@^3.2.1:
201166
dependencies:
202167
color-convert "^1.9.0"
203168

204-
ansi-styles@^4.0.0, ansi-styles@^4.1.0:
169+
ansi-styles@^4.1.0:
205170
version "4.3.0"
206171
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
207172
integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
208173
dependencies:
209174
color-convert "^2.0.1"
210175

176+
ansi-styles@^5.0.0:
177+
version "5.2.0"
178+
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
179+
integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
180+
211181
anymatch@^1.3.0:
212182
version "1.3.2"
213183
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
@@ -1655,10 +1625,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
16551625
escape-string-regexp "^1.0.5"
16561626
supports-color "^5.3.0"
16571627

1658-
chalk@^3.0.0:
1659-
version "3.0.0"
1660-
resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
1661-
integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
1628+
chalk@^4.0.0:
1629+
version "4.1.2"
1630+
resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
1631+
integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
16621632
dependencies:
16631633
ansi-styles "^4.1.0"
16641634
supports-color "^7.1.0"
@@ -2409,10 +2379,10 @@ [email protected]:
24092379
address "^1.0.1"
24102380
debug "^2.6.0"
24112381

2412-
diff-sequences@^25.2.6:
2413-
version "25.2.6"
2414-
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd"
2415-
integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==
2382+
diff-sequences@^29.3.1:
2383+
version "29.3.1"
2384+
resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
2385+
integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
24162386

24172387
diff@^3.2.0:
24182388
version "3.5.0"
@@ -4599,15 +4569,15 @@ jest-diff@^20.0.3:
45994569
jest-matcher-utils "^20.0.3"
46004570
pretty-format "^20.0.3"
46014571

4602-
jest-diff@^25.1.0:
4603-
version "25.5.0"
4604-
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9"
4605-
integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==
4572+
jest-diff@^29.4.1:
4573+
version "29.4.1"
4574+
resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.4.1.tgz#9a6dc715037e1fa7a8a44554e7d272088c4029bd"
4575+
integrity sha512-uazdl2g331iY56CEyfbNA0Ut7Mn2ulAG5vUaEHXycf1L6IPyuImIxSz4F0VYBKi7LYIuxOwTZzK3wh5jHzASMw==
46064576
dependencies:
4607-
chalk "^3.0.0"
4608-
diff-sequences "^25.2.6"
4609-
jest-get-type "^25.2.6"
4610-
pretty-format "^25.5.0"
4577+
chalk "^4.0.0"
4578+
diff-sequences "^29.3.1"
4579+
jest-get-type "^29.2.0"
4580+
pretty-format "^29.4.1"
46114581

46124582
jest-docblock@^20.0.3:
46134583
version "20.0.3"
@@ -4631,10 +4601,10 @@ jest-environment-node@^20.0.3:
46314601
jest-mock "^20.0.3"
46324602
jest-util "^20.0.3"
46334603

4634-
jest-get-type@^25.2.6:
4635-
version "25.2.6"
4636-
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877"
4637-
integrity sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==
4604+
jest-get-type@^29.2.0:
4605+
version "29.2.0"
4606+
resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
4607+
integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
46384608

46394609
jest-haste-map@^20.0.4:
46404610
version "20.0.5"
@@ -6359,15 +6329,14 @@ pretty-format@^20.0.3:
63596329
ansi-regex "^2.1.1"
63606330
ansi-styles "^3.0.0"
63616331

6362-
pretty-format@^25.5.0:
6363-
version "25.5.0"
6364-
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
6365-
integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
6332+
pretty-format@^29.4.1:
6333+
version "29.4.1"
6334+
resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.4.1.tgz#0da99b532559097b8254298da7c75a0785b1751c"
6335+
integrity sha512-dt/Z761JUVsrIKaY215o1xQJBGlSmTx/h4cSqXqjHLnU1+Kt+mavVE7UgqJJO5ukx5HjSswHfmXz4LjS2oIJfg==
63666336
dependencies:
6367-
"@jest/types" "^25.5.0"
6368-
ansi-regex "^5.0.0"
6369-
ansi-styles "^4.0.0"
6370-
react-is "^16.12.0"
6337+
"@jest/schemas" "^29.4.0"
6338+
ansi-styles "^5.0.0"
6339+
react-is "^18.0.0"
63716340

63726341
private@^0.1.6, private@^0.1.7, private@^0.1.8:
63736342
version "0.1.8"
@@ -6595,11 +6564,16 @@ react-error-overlay@^4.0.1:
65956564
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.1.tgz#417addb0814a90f3a7082eacba7cee588d00da89"
65966565
integrity sha512-xXUbDAZkU08aAkjtUvldqbvI04ogv+a1XdHxvYuHPYKIVk/42BIOD0zSKTHAWV4+gDy3yGm283z2072rA2gdtw==
65976566

6598-
react-is@^16.12.0, react-is@^16.8.1:
6567+
react-is@^16.8.1:
65996568
version "16.13.1"
66006569
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
66016570
integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
66026571

6572+
react-is@^18.0.0:
6573+
version "18.2.0"
6574+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
6575+
integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
6576+
66036577
react-scripts@^1.0.11:
66046578
version "1.1.5"
66056579
resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-1.1.5.tgz#3041610ab0826736b52197711a4c4e3756e97768"

fixtures/legacy-jsx-runtimes/package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
"dependencies": {
33
"@babel/plugin-transform-modules-commonjs": "^7.10.4",
44
"@babel/preset-react": "^7.10.4",
5-
"jest": "^26.5.3"
5+
"jest": "^29.4.1"
66
},
77
"jest": {
8-
"setupFilesAfterEnv": ["./setupTests.js"]
8+
"setupFilesAfterEnv": [
9+
"./setupTests.js"
10+
]
911
},
1012
"scripts": {
1113
"install-all": "cd react-14 && yarn && cd ../react-15 && yarn && cd ../react-16 && yarn && cd ../react-17 && yarn && cd ..",
1214
"lint": "node lint-runtimes.js",
1315
"pretest": "yarn install-all && yarn lint",
14-
"test-jsxdev-dev": "BABEL_ENV=development NODE_ENV=development jest",
15-
"test-jsx-dev": "BABEL_ENV=production NODE_ENV=development jest",
16-
"test-jsx-prod": "BABEL_ENV=production NODE_ENV=production jest",
16+
"test-jsxdev-dev": "BABEL_ENV=development NODE_ENV=development jest --env=jsdom",
17+
"test-jsx-dev": "BABEL_ENV=production NODE_ENV=development jest --env=jsdom",
18+
"test-jsx-prod": "BABEL_ENV=production NODE_ENV=production jest --env=jsdom",
1719
"test": "yarn test-jsxdev-dev && yarn test-jsx-dev && yarn test-jsx-prod"
1820
}
1921
}

fixtures/legacy-jsx-runtimes/setupTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
const expect = global.expect;
77

8-
const jestDiff = require('jest-diff').default;
8+
const {diff: jestDiff} = require('jest-diff');
99
const util = require('util');
1010

1111
function shouldIgnoreConsoleError(format, args) {

0 commit comments

Comments
 (0)