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

feat: support Jest 25 v2 #1355

Merged
merged 11 commits into from
Jan 23, 2020
Merged

feat: support Jest 25 v2 #1355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ffc2cfe
feat: support Jest 25
haoqunjiang Sep 17, 2019
10507d2
chore: update dependencies
haoqunjiang Sep 25, 2019
255a7c7
test: update test files to use jest 25
haoqunjiang Sep 25, 2019
111b305
Merge branch 'master' into jest25
kulshekhar Sep 26, 2019
308fb72
Merge branch 'master' of https://github.com/kibertoad/ts-jest into je…
Jan 22, 2020
ed52e58
chore: Resolve conflicts
Jan 22, 2020
ea0ea50
fix: Try to fix snapshots
Jan 22, 2020
82445bb
fix: Try to fix snapshots v2
Jan 22, 2020
a644574
chore: Fix version checks
Jan 22, 2020
9dc14f2
chore: Fix tests for version checks
Jan 22, 2020
154f1d6
fix: Fix tests for version checks v2
Jan 22, 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
5,645 changes: 3,799 additions & 1,846 deletions e2e/__templates__/default/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions e2e/__templates__/default/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"version": "0.0.0-tmpl.0",
"private": true,
"devDependencies": {
"@types/jest": "24.0.25",
"@types/jest": "24.9.0",
"@types/node": "10.17.13",
"jest": "24.9.0",
"typescript": "3.7.4"
"jest": "25.1.0",
"typescript": "3.7.5"
},
"wantedDependencies": {
"@types/jest": "latest",
Expand Down
5,661 changes: 3,802 additions & 1,859 deletions e2e/__templates__/with-babel-7-string-config/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions e2e/__templates__/with-babel-7-string-config/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"version": "0.0.0-tmpl.0",
"private": true,
"devDependencies": {
"@babel/core": "7.7.7",
"@types/jest": "24.0.25",
"@babel/core": "7.8.3",
"@types/jest": "24.9.0",
"@types/node": "10.17.13",
"babel-jest": "24.9.0",
"jest": "24.9.0",
"typescript": "3.7.4"
"babel-jest": "25.1.0",
"jest": "25.1.0",
"typescript": "3.7.5"
},
"wantedDependencies": {
"@babel/core": "7",
Expand Down
5,907 changes: 3,918 additions & 1,989 deletions e2e/__templates__/with-babel-7/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions e2e/__templates__/with-babel-7/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"version": "0.0.0-tmpl.0",
"private": true,
"devDependencies": {
"@babel/core": "7.7.7",
"@types/jest": "24.0.25",
"@babel/core": "7.8.3",
"@types/jest": "24.9.0",
"@types/node": "10.17.13",
"babel-jest": "24.9.0",
"jest": "24.9.0",
"typescript": "3.7.4"
"babel-jest": "25.1.0",
"jest": "25.1.0",
"typescript": "3.7.5"
},
"wantedDependencies": {
"@babel/core": "7",
Expand Down
Loading