86e031d fix(@angular-devkit/build-angular): use istanbul-lib-instrument directly for karma code coverage

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "18.0.4+sha-bdd168f",
+  "version": "18.0.4+sha-86e031d",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular/build": "github:angular/angular-build-builds#bdd168f",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#bdd168f",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#bdd168f",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#bdd168f",
+    "@angular/build": "github:angular/angular-build-builds#86e031d",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#86e031d",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#86e031d",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#86e031d",
     "@babel/core": "7.24.5",
     "@babel/generator": "7.24.5",
     "@babel/helper-annotate-as-pure": "7.22.5",
@@ -21,12 +21,11 @@
     "@babel/preset-env": "7.24.5",
     "@babel/runtime": "7.24.5",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#bdd168f",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#86e031d",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.19",
     "babel-loader": "9.1.3",
-    "babel-plugin-istanbul": "6.1.1",
     "browserslist": "^4.21.5",
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.22",
@@ -36,6 +35,7 @@
     "https-proxy-agent": "7.0.4",
     "http-proxy-middleware": "3.0.0",
     "inquirer": "9.2.22",
+    "istanbul-lib-instrument": "6.0.2",
     "jsonc-parser": "3.2.1",
     "karma-source-map-support": "1.4.0",
     "less": "4.2.0",

src/tools/babel/plugins/add-code-coverage.d.ts

@@ -0,0 +1,16 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+/// <reference path="../../../../../../../../../../packages/angular_devkit/build_angular/src/babel-bazel.d.ts" />
+/// <reference types="@angular/compiler-cli/private/babel" />
+import { PluginObj } from '@babel/core';
+/**
+ * A babel plugin factory function for adding istanbul instrumentation.
+ *
+ * @returns A babel plugin object instance.
+ */
+export default function (): PluginObj;

src/tools/babel/plugins/add-code-coverage.js

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const core_1 = require("@babel/core");
+const istanbul_lib_instrument_1 = require("istanbul-lib-instrument");
+const node_assert_1 = __importDefault(require("node:assert"));
+/**
+ * A babel plugin factory function for adding istanbul instrumentation.
+ *
+ * @returns A babel plugin object instance.
+ */
+function default_1() {
+    const visitors = new WeakMap();
+    return {
+        visitor: {
+            Program: {
+                enter(path, state) {
+                    const visitor = (0, istanbul_lib_instrument_1.programVisitor)(core_1.types, state.filename, {
+                        // Babel returns a Converter object from the `convert-source-map` package
+                        inputSourceMap: state.file.inputMap?.toObject(),
+                    });
+                    visitors.set(path, visitor);
+                    visitor.enter(path);
+                },
+                exit(path) {
+                    const visitor = visitors.get(path);
+                    (0, node_assert_1.default)(visitor, 'Instrumentation visitor should always be present for program path.');
+                    visitor.exit(path);
+                    visitors.delete(path);
+                },
+            },
+        },
+    };
+}
+exports.default = default_1;

src/tools/babel/plugins/types.d.ts

@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+declare module 'istanbul-lib-instrument' {
+  export interface Visitor {
+    enter(path: import('@babel/core').NodePath<types.Program>): void;
+    exit(path: import('@babel/core').NodePath<types.Program>): void;
+  }
+
+  export function programVisitor(
+    types: typeof import('@babel/core').types,
+    filePath?: string,
+    options?: { inputSourceMap?: object | null },
+  ): Visitor;
+}

src/tools/babel/presets/application.js

@@ -157,13 +157,7 @@ function default_1(api, options) {
         ]);
     }
     if (options.instrumentCode) {
-        plugins.push([
-            require('babel-plugin-istanbul').default,
-            {
-                inputSourceMap: options.instrumentCode.inputSourceMap ?? false,
-                cwd: options.instrumentCode.includedBasePath,
-            },
-        ]);
+        plugins.push(require('../plugins/add-code-coverage').default);
     }
     if (needRuntimeTransform) {
         // Babel equivalent to TypeScript's `importHelpers` option

src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = void 0;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '18.0.4+sha-bdd168f';
+const VERSION = '18.0.4+sha-86e031d';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

uniqueId

@@ -1 +1 @@
-Tue Jun 18 2024 14:02:34 GMT+0000 (Coordinated Universal Time)
+Tue Jun 18 2024 14:18:34 GMT+0000 (Coordinated Universal Time)