Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Jest 26 #8955

Merged
merged 9 commits into from
Jun 1, 2020
Merged

Upgrade to Jest 26 #8955

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0b67cfa
Update Jest to 26
ianschmitz May 4, 2020
068f8f0
Upgrade to Jest 26.0.1
ianschmitz May 6, 2020
79a58a1
Merge remote-tracking branch 'upstream/master' into jest-26
ianschmitz May 6, 2020
f7a9345
Merge remote-tracking branch 'upstream/master' into jest-26
ianschmitz May 13, 2020
746dd73
Use jest-circus test runner by default
ianschmitz May 13, 2020
bcf9078
Try resolving test runner to fix behavior tests
ianschmitz May 15, 2020
02b626a
Run TypeScript verification in new context
ianschmitz May 29, 2020
759318a
Merge remote-tracking branch 'upstream/master' into jest-26
ianschmitz May 29, 2020
16368a7
Delete globalThis if polyfilled
ianschmitz May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update Jest to 26
  • Loading branch information
@ianschmitz
ianschmitz committed May 4, 2020
commit 0b67cfaf26a3b929fd2712e0a7d0db389be16d31
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"get-port": "^4.2.0",
"globby": "^9.1.0",
"husky": "^1.3.1",
"jest": "25.5.4",
"jest": "26.0.0",
"lerna": "3.20.2",
"lerna-changelog": "~0.8.2",
"lint-staged": "^8.0.4",
Expand Down
2 changes: 1 addition & 1 deletion packages/babel-plugin-named-asset-import/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"babel-plugin-tester": "^8.0.1",
"jest": "25.5.4"
"jest": "26.0.0"
},
"scripts": {
"test": "jest"
Expand Down
2 changes: 1 addition & 1 deletion packages/confusing-browser-globals/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"index.js"
],
"devDependencies": {
"jest": "25.5.4"
"jest": "26.0.0"
}
}
2,119 changes: 1,203 additions & 916 deletions packages/create-react-app/yarn.lock.cached
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/react-dev-utils/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
},
"devDependencies": {
"cross-env": "^6.0.3",
"jest": "25.5.4"
"jest": "26.0.0"
},
"scripts": {
"test": "cross-env FORCE_COLOR=true jest"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-error-overlay/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@babel/core": "7.9.6",
"anser": "1.4.9",
"babel-eslint": "10.1.0",
"babel-jest": "^25.2.6",
"babel-jest": "^26.0.0",
"babel-loader": "8.1.0",
"babel-preset-react-app": "^9.1.2",
"chalk": "2.4.2",
Expand All @@ -52,7 +52,7 @@
"eslint-plugin-react": "7.19.0",
"flow-bin": "^0.116.0",
"html-entities": "1.3.1",
"jest": "25.5.4",
"jest": "26.0.0",
"jest-fetch-mock": "2.1.2",
"object-assign": "4.1.1",
"promise": "8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-scripts/fixtures/kitchensink/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"package": {
"dependencies": {
"bootstrap": "4.3.1",
"jest": "25.5.4",
"jest": "26.0.0",
"node-sass": "4.x",
"normalize.css": "7.0.0",
"prop-types": "15.7.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/react-scripts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@typescript-eslint/eslint-plugin": "^2.10.0",
"@typescript-eslint/parser": "^2.10.0",
"babel-eslint": "10.1.0",
"babel-jest": "^25.2.6",
"babel-jest": "^26.0.0",
"babel-loader": "8.1.0",
"babel-plugin-named-asset-import": "^0.3.6",
"babel-preset-react-app": "^9.1.2",
Expand All @@ -55,8 +55,8 @@
"fs-extra": "^8.1.0",
"html-webpack-plugin": "4.3.0",
"identity-obj-proxy": "3.0.0",
"jest": "25.5.4",
"jest-resolve": "25.5.1",
"jest": "26.0.0",
"jest-resolve": "26.0.0",
"jest-watch-typeahead": "0.5.0",
"mini-css-extract-plugin": "0.9.0",
"optimize-css-assets-webpack-plugin": "5.0.3",
Expand Down