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

Commit fa5d64b

Browse files
authored
Merge branch 'master' into renovate/jest-24.x
2 parents 6ee1f48 + 8bfb60f commit fa5d64b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@
9292
"cross-env": "6.0.3",
9393
"cypress": "3.7.0",
9494
"dotenv": "8.2.0",
95-
"eslint": "6.7.0",
95+
"eslint": "6.8.0",
9696
"husky": "4.2.1",
9797
"jest": "25.1.0",
9898
"jest-preset-angular": "7.1.1",
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4253,10 +4253,10 @@ eslint-visitor-keys@^1.1.0:
42534253
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
42544254
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
42554255

4256-
eslint@6.7.0:
4257-
version "6.7.0"
4258-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.0.tgz#766162e383b236e61d873697f82c3a3e41392020"
4259-
integrity sha512-dQpj+PaHKHfXHQ2Imcw5d853PTvkUGbHk/MR68KQUl98EgKDCdh4vLRH1ZxhqeQjQFJeg8fgN0UwmNhN3l8dDQ==
4256+
eslint@6.8.0:
4257+
version "6.8.0"
4258+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
4259+
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
42604260
dependencies:
42614261
"@babel/code-frame" "^7.0.0"
42624262
ajv "^6.10.0"
@@ -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)