Skip to content
This repository was archived by the owner on Jan 23, 2024. It is now read-only.

Commit 326a642

Browse files
authored
Merge branch 'master' into renovate/eslint-6.x
2 parents 32aa4e7 + 0fddfdc commit 326a642

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"ng-packagr": "5.7.1",
100100
"prettier": "1.19.1",
101101
"sonar-scanner": "3.1.0",
102-
"ts-jest": "24.2.0",
102+
"ts-jest": "25.2.0",
103103
"ts-node": "8.5.2",
104104
"tsickle": "0.37.1",
105105
"tslint": "5.20.1",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10531,10 +10531,10 @@ trim-right@^1.0.1:
1053110531
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
1053210532
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
1053310533

10534-
ts-jest@24.2.0:
10535-
version "24.2.0"
10536-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768"
10537-
integrity sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag==
10534+
ts-jest@25.2.0:
10535+
version "25.2.0"
10536+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-25.2.0.tgz#dfd87c2b71ef4867f5a0a44f40cb9c67e02991ac"
10537+
integrity sha512-VaRdb0da46eorLfuHEFf0G3d+jeREcV+Wb/SvW71S4y9Oe8SHWU+m1WY/3RaMknrBsnvmVH0/rRjT8dkgeffNQ==
1053810538
dependencies:
1053910539
bs-logger "0.x"
1054010540
buffer-from "1.x"

0 commit comments

Comments
 (0)