Skip to content

Commit 81d057a

Browse files
alan-agius4Keen Yee Liau
authored andcommitted
refactor(@angular-devkit/build-angular): use @jsdevtools/coverage-istanbul-loader instead of coverage-istanbul-loader
`coverage-istanbul-loader` has been deprecated in favor of `@jsdevtools/coverage-istanbul-loader`
1 parent 730ce62 commit 81d057a

File tree

3 files changed

+20
-94
lines changed

3 files changed

+20
-94
lines changed

packages/angular_devkit/build_angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"@babel/core": "7.8.6",
1515
"@babel/preset-env": "7.8.6",
1616
"@babel/template": "7.8.6",
17+
"@jsdevtools/coverage-istanbul-loader": "3.0.0",
1718
"@ngtools/webpack": "0.0.0",
1819
"ajv": "6.12.0",
1920
"autoprefixer": "9.7.4",
@@ -23,7 +24,6 @@
2324
"caniuse-lite": "^1.0.30001032",
2425
"cssnano": "4.1.10",
2526
"circular-dependency-plugin": "5.2.0",
26-
"coverage-istanbul-loader": "2.0.3",
2727
"copy-webpack-plugin": "5.1.1",
2828
"core-js": "3.6.4",
2929
"file-loader": "5.1.0",

packages/angular_devkit/build_angular/src/angular-cli-files/models/webpack-configs/test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export function getTestConfig(
3838

3939
extraRules.push({
4040
test: /\.(jsx?|tsx?)$/,
41-
loader: require.resolve('coverage-istanbul-loader'),
41+
loader: require.resolve('@jsdevtools/coverage-istanbul-loader'),
4242
options: { esModules: true },
4343
enforce: 'post',
4444
exclude,

yarn.lock

Lines changed: 18 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,17 @@
921921
resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd"
922922
integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==
923923

924+
"@jsdevtools/[email protected]":
925+
version "3.0.0"
926+
resolved "https://registry.yarnpkg.com/@jsdevtools/coverage-istanbul-loader/-/coverage-istanbul-loader-3.0.0.tgz#2e8b8ce7af34786000794e850693b90866465c11"
927+
integrity sha512-NhRFmiDaBZehB0t9Ce1FJGnmF6QLfduZQUyoTasCeSFRup1mKJ8JhAZzYuJhjixy475KLRWxMW9oLLOiLim2NQ==
928+
dependencies:
929+
convert-source-map "^1.7.0"
930+
istanbul-lib-instrument "^4.0.1"
931+
loader-utils "^1.4.0"
932+
merge-source-map "^1.1.0"
933+
schema-utils "^2.6.4"
934+
924935
"@mark.probst/unicode-properties@~1.1.0":
925936
version "1.1.0"
926937
resolved "https://registry.yarnpkg.com/@mark.probst/unicode-properties/-/unicode-properties-1.1.0.tgz#5caafeab4737df93163d6d288007df33f9939b80"
@@ -3584,17 +3595,6 @@ cosmiconfig@^6.0.0:
35843595
path-type "^4.0.0"
35853596
yaml "^1.7.2"
35863597

3587-
3588-
version "2.0.3"
3589-
resolved "https://registry.yarnpkg.com/coverage-istanbul-loader/-/coverage-istanbul-loader-2.0.3.tgz#87d42f03fa0fd3fa8743ec76945d9d67f105722a"
3590-
integrity sha512-LiGRvyIuzVYs3M1ZYK1tF0HekjH0DJ8zFdUwAZq378EJzqOgToyb1690dp3TAUlP6Y+82uu42LRjuROVeJ54CA==
3591-
dependencies:
3592-
convert-source-map "^1.7.0"
3593-
istanbul-lib-instrument "^4.0.0"
3594-
loader-utils "^1.2.3"
3595-
merge-source-map "^1.1.0"
3596-
schema-utils "^2.6.1"
3597-
35983598
create-ecdh@^4.0.0:
35993599
version "4.0.3"
36003600
resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
@@ -4128,11 +4128,6 @@ destroy@~1.0.4:
41284128
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
41294129
integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
41304130

4131-
detect-libc@^1.0.2:
4132-
version "1.0.3"
4133-
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
4134-
integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
4135-
41364131
detect-node@^2.0.4:
41374132
version "2.0.4"
41384133
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -5046,13 +5041,6 @@ fs-extra@^8.1.0:
50465041
jsonfile "^4.0.0"
50475042
universalify "^0.1.0"
50485043

5049-
fs-minipass@^1.2.5:
5050-
version "1.2.7"
5051-
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
5052-
integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
5053-
dependencies:
5054-
minipass "^2.6.0"
5055-
50565044
fs-minipass@^2.0.0, fs-minipass@^2.1.0:
50575045
version "2.1.0"
50585046
resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -5716,7 +5704,7 @@ husky@^4.0.10:
57165704
slash "^3.0.0"
57175705
which-pm-runs "^1.0.0"
57185706

5719-
[email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
5707+
[email protected], iconv-lite@^0.4.24, iconv-lite@~0.4.13:
57205708
version "0.4.24"
57215709
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
57225710
integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5733,7 +5721,7 @@ iferr@^0.1.5:
57335721
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
57345722
integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
57355723

5736-
ignore-walk@^3.0.1, ignore-walk@^3.0.3:
5724+
ignore-walk@^3.0.3:
57375725
version "3.0.3"
57385726
resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
57395727
integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
@@ -6397,7 +6385,7 @@ istanbul-lib-instrument@^3.3.0:
63976385
istanbul-lib-coverage "^2.0.5"
63986386
semver "^6.0.0"
63996387

6400-
istanbul-lib-instrument@^4.0.0:
6388+
istanbul-lib-instrument@^4.0.1:
64016389
version "4.0.1"
64026390
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
64036391
integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
@@ -7639,28 +7627,13 @@ minipass-sized@^1.0.3:
76397627
dependencies:
76407628
minipass "^3.0.0"
76417629

7642-
minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
7643-
version "2.9.0"
7644-
resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
7645-
integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
7646-
dependencies:
7647-
safe-buffer "^5.1.2"
7648-
yallist "^3.0.0"
7649-
76507630
minipass@^3.0.0, minipass@^3.0.1, minipass@^3.1.0, minipass@^3.1.1:
76517631
version "3.1.1"
76527632
resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
76537633
integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==
76547634
dependencies:
76557635
yallist "^4.0.0"
76567636

7657-
minizlib@^1.2.1:
7658-
version "1.3.3"
7659-
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
7660-
integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
7661-
dependencies:
7662-
minipass "^2.9.0"
7663-
76647637
minizlib@^2.0.0, minizlib@^2.1.0:
76657638
version "2.1.0"
76667639
resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.0.tgz#fd52c645301ef09a63a2c209697c294c6ce02cf3"
@@ -7801,15 +7774,6 @@ ncp@~2.0.0:
78017774
resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
78027775
integrity sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=
78037776

7804-
needle@^2.2.1:
7805-
version "2.3.2"
7806-
resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz#3342dea100b7160960a450dc8c22160ac712a528"
7807-
integrity sha512-DUzITvPVDUy6vczKKYTnWc/pBZ0EnjMJnQ3y+Jo5zfKFimJs7S3HFCxCRZYB9FUZcrzUQr3WsmvZgddMEIZv6w==
7808-
dependencies:
7809-
debug "^3.2.6"
7810-
iconv-lite "^0.4.4"
7811-
sax "^1.2.4"
7812-
78137777
78147778
version "0.6.2"
78157779
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -7901,22 +7865,6 @@ node-libs-browser@^2.2.1:
79017865
util "^0.11.0"
79027866
vm-browserify "^1.0.1"
79037867

7904-
node-pre-gyp@*:
7905-
version "0.14.0"
7906-
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
7907-
integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
7908-
dependencies:
7909-
detect-libc "^1.0.2"
7910-
mkdirp "^0.5.1"
7911-
needle "^2.2.1"
7912-
nopt "^4.0.1"
7913-
npm-packlist "^1.1.6"
7914-
npmlog "^4.0.2"
7915-
rc "^1.2.7"
7916-
rimraf "^2.6.1"
7917-
semver "^5.3.0"
7918-
tar "^4.4.2"
7919-
79207868
node-releases@^1.1.50:
79217869
version "1.1.50"
79227870
resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -8025,15 +7973,6 @@ [email protected], npm-package-arg@^8.0.0:
80257973
semver "^5.6.0"
80267974
validate-npm-package-name "^3.0.0"
80277975

8028-
npm-packlist@^1.1.6:
8029-
version "1.4.8"
8030-
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
8031-
integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
8032-
dependencies:
8033-
ignore-walk "^3.0.1"
8034-
npm-bundled "^1.0.1"
8035-
npm-normalize-package-bin "^1.0.1"
8036-
80377976
npm-packlist@^2.1.0:
80387977
version "2.1.0"
80397978
resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.1.0.tgz#ab9c8de31df6d55b78ae94eb5c47f145bc304dc0"
@@ -8093,7 +8032,7 @@ npm-run-path@^2.0.0:
80938032
dependencies:
80948033
path-key "^2.0.0"
80958034

8096-
"npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.2:
8035+
"npmlog@2 || ^3.1.0 || ^4.0.0":
80978036
version "4.1.2"
80988037
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
80998038
integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -9436,7 +9375,7 @@ [email protected]:
94369375
loader-utils "^1.2.3"
94379376
schema-utils "^2.5.0"
94389377

9439-
rc@^1.2.7, rc@^1.2.8:
9378+
rc@^1.2.8:
94409379
version "1.2.8"
94419380
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
94429381
integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -10080,7 +10019,7 @@ saucelabs@^1.5.0:
1008010019
dependencies:
1008110020
https-proxy-agent "^2.2.1"
1008210021

10083-
sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
10022+
sax@>=0.6.0, sax@~1.2.4:
1008410023
version "1.2.4"
1008510024
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
1008610025
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -11042,19 +10981,6 @@ tapable@^1.0.0, tapable@^1.1.3:
1104210981
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
1104310982
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
1104410983

11045-
tar@^4.4.2:
11046-
version "4.4.13"
11047-
resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
11048-
integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
11049-
dependencies:
11050-
chownr "^1.1.1"
11051-
fs-minipass "^1.2.5"
11052-
minipass "^2.8.6"
11053-
minizlib "^1.2.1"
11054-
mkdirp "^0.5.0"
11055-
safe-buffer "^5.1.2"
11056-
yallist "^3.0.3"
11057-
1105810984
tar@^6.0.0, tar@^6.0.1:
1105910985
version "6.0.1"
1106010986
resolved "https://registry.yarnpkg.com/tar/-/tar-6.0.1.tgz#7b3bd6c313cb6e0153770108f8d70ac298607efa"
@@ -12268,7 +12194,7 @@ yallist@^2.1.2:
1226812194
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
1226912195
integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
1227012196

12271-
yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
12197+
yallist@^3.0.2:
1227212198
version "3.1.1"
1227312199
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
1227412200
integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==

0 commit comments

Comments
 (0)