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

Commit 100b30a

Browse files
authored
Merge branch 'master' into renovate/cypress-3.x
2 parents e1dac21 + f1554d9 commit 100b30a

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,21 +85,21 @@
8585
"@nrwl/cypress": "8.10.1",
8686
"@nrwl/jest": "8.10.1",
8787
"@nrwl/workspace": "8.10.1",
88-
"@types/jest": "24.0.23",
88+
"@types/jest": "24.9.1",
8989
"@types/node": "8.10.59",
9090
"codelyzer": "5.2.0",
9191
"colors": "1.4.0",
9292
"cross-env": "6.0.3",
9393
"cypress": "3.8.3",
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: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,10 +1653,10 @@
16531653
"@types/istanbul-lib-coverage" "*"
16541654
"@types/istanbul-lib-report" "*"
16551655

1656-
"@types/jest@24.0.23":
1657-
version "24.0.23"
1658-
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.23.tgz#046f8e2ade026fe831623e361a36b6fb9a4463e4"
1659-
integrity sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg==
1656+
"@types/jest@24.9.1":
1657+
version "24.9.1"
1658+
resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534"
1659+
integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==
16601660
dependencies:
16611661
jest-diff "^24.3.0"
16621662

@@ -4254,10 +4254,10 @@ eslint-visitor-keys@^1.1.0:
42544254
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
42554255
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
42564256

4257-
eslint@6.7.0:
4258-
version "6.7.0"
4259-
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.0.tgz#766162e383b236e61d873697f82c3a3e41392020"
4260-
integrity sha512-dQpj+PaHKHfXHQ2Imcw5d853PTvkUGbHk/MR68KQUl98EgKDCdh4vLRH1ZxhqeQjQFJeg8fgN0UwmNhN3l8dDQ==
4257+
eslint@6.8.0:
4258+
version "6.8.0"
4259+
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
4260+
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
42614261
dependencies:
42624262
"@babel/code-frame" "^7.0.0"
42634263
ajv "^6.10.0"
@@ -10537,10 +10537,10 @@ trim-right@^1.0.1:
1053710537
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
1053810538
integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
1053910539

10540-
ts-jest@24.2.0:
10541-
version "24.2.0"
10542-
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-24.2.0.tgz#7abca28c2b4b0a1fdd715cd667d65d047ea4e768"
10543-
integrity sha512-Yc+HLyldlIC9iIK8xEN7tV960Or56N49MDP7hubCZUeI7EbIOTsas6rXCMB4kQjLACJ7eDOF4xWEO5qumpKsag==
10540+
ts-jest@25.2.0:
10541+
version "25.2.0"
10542+
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-25.2.0.tgz#dfd87c2b71ef4867f5a0a44f40cb9c67e02991ac"
10543+
integrity sha512-VaRdb0da46eorLfuHEFf0G3d+jeREcV+Wb/SvW71S4y9Oe8SHWU+m1WY/3RaMknrBsnvmVH0/rRjT8dkgeffNQ==
1054410544
dependencies:
1054510545
bs-logger "0.x"
1054610546
buffer-from "1.x"

0 commit comments

Comments
 (0)