fix(@angular-devkit/build-angular): replace istanbul-instrumenter-loader with coverage-istanbul-loader

Fixes #16576 and fixes #7117

Author: alan-agius4

packages/angular_devkit/build_angular/package.json

@@ -21,12 +21,12 @@
     "caniuse-lite": "1.0.30001019",
     "circular-dependency-plugin": "5.2.0",
     "clean-css": "4.2.1",
+    "coverage-istanbul-loader": "2.0.3",
     "copy-webpack-plugin": "5.1.1",
     "core-js": "3.2.1",
     "file-loader": "4.2.0",
     "find-cache-dir": "3.0.0",
     "glob": "7.1.4",
-    "istanbul-instrumenter-loader": "3.0.1",
     "jest-worker": "24.9.0",
     "karma-source-map-support": "1.4.0",
     "less": "3.9.0",

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

@@ -29,7 +29,6 @@ export function getTestConfig(
   const extraRules: webpack.Rule[] = [];
   const extraPlugins: webpack.Plugin[] = [];
 
-  // if (buildOptions.codeCoverage && CliConfig.fromProject()) {
   if (buildOptions.codeCoverage) {
     const codeCoverageExclude = buildOptions.codeCoverageExclude;
     const exclude: (string | RegExp)[] = [
@@ -47,8 +46,8 @@ export function getTestConfig(
     }
 
     extraRules.push({
-      test: /\.(js|ts)$/,
-      loader: 'istanbul-instrumenter-loader',
+      test: /\.(jsx?|tsx?)$/,
+      loader: require.resolve('coverage-istanbul-loader'),
       options: { esModules: true },
       enforce: 'post',
       exclude,