0a4ef30 feat(@angular-devkit/build-angular): karma-coverage w/ app builder

Author: Angular Builds

package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.0.0-next.8+sha-422e847",
+  "version": "19.0.0-next.8+sha-0a4ef30",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#422e847",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#422e847",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#422e847",
-    "@angular/build": "github:angular/angular-build-builds#422e847",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#0a4ef30",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#0a4ef30",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#0a4ef30",
+    "@angular/build": "github:angular/angular-build-builds#0a4ef30",
     "@babel/core": "7.25.2",
     "@babel/generator": "7.25.6",
     "@babel/helper-annotate-as-pure": "7.24.7",
@@ -21,7 +21,7 @@
     "@babel/preset-env": "7.25.4",
     "@babel/runtime": "7.25.6",
     "@discoveryjs/json-ext": "0.6.1",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#422e847",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#0a4ef30",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -77,7 +77,7 @@
     "@angular/localize": "^19.0.0-next.0",
     "@angular/platform-server": "^19.0.0-next.0",
     "@angular/service-worker": "^19.0.0-next.0",
-    "@angular/ssr": "github:angular/angular-ssr-builds#422e847",
+    "@angular/ssr": "github:angular/angular-ssr-builds#0a4ef30",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",
@@ -98,7 +98,7 @@
     "@angular/service-worker": {
       "optional": true
     },
-    "@angular/ssr": "github:angular/angular-ssr-builds#422e847",
+    "@angular/ssr": "github:angular/angular-ssr-builds#0a4ef30",
     "@web/test-runner": {
       "optional": true
     },

src/builders/karma/application_builder.js

@@ -29,12 +29,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = execute;
 exports.writeTestFiles = writeTestFiles;
 const build_1 = require("@angular/build");
 const private_1 = require("@angular/build/private");
 const crypto_1 = require("crypto");
+const fast_glob_1 = __importDefault(require("fast-glob"));
 const fs = __importStar(require("fs/promises"));
 const path = __importStar(require("path"));
 const rxjs_1 = require("rxjs");
@@ -75,8 +79,7 @@ async function getProjectSourceRoot(context) {
     const sourceRoot = (projectMetadata.sourceRoot ?? projectMetadata.root ?? '');
     return path.join(context.workspaceRoot, sourceRoot);
 }
-async function collectEntrypoints(options, context) {
-    const projectSourceRoot = await getProjectSourceRoot(context);
+async function collectEntrypoints(options, context, projectSourceRoot) {
     // Glob for files to test.
     const testFiles = await (0, find_tests_1.findTests)(options.include ?? [], options.exclude ?? [], context.workspaceRoot, projectSourceRoot);
     const entryPoints = new Set([
@@ -95,12 +98,16 @@ async function initializeApplication(options, context, karmaOptions, transforms
         context.logger.warn(`This build is using the application builder but transforms.webpackConfiguration was provided. The transform will be ignored.`);
     }
     const testDir = path.join(context.workspaceRoot, 'dist/test-out', (0, crypto_1.randomUUID)());
+    const projectSourceRoot = await getProjectSourceRoot(context);
     const [karma, [entryPoints, polyfills]] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('karma'))),
-        collectEntrypoints(options, context),
+        collectEntrypoints(options, context, projectSourceRoot),
         fs.rm(testDir, { recursive: true, force: true }),
     ]);
     const outputPath = testDir;
+    const instrumentForCoverage = options.codeCoverage
+        ? createInstrumentationFilter(projectSourceRoot, getInstrumentationExcludedPaths(context.workspaceRoot, options.codeCoverageExclude ?? []))
+        : undefined;
     // Build tests with `application` builder, using test files as entry points.
     const buildOutput = await first((0, private_1.buildApplicationInternal)({
         entryPoints,
@@ -115,6 +122,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
             styles: true,
             vendor: true,
         },
+        instrumentForCoverage,
         styles: options.styles,
         polyfills,
         webWorkerTsConfig: options.webWorkerTsConfig,
@@ -207,3 +215,18 @@ async function first(generator) {
     }
     throw new Error('Expected generator to emit at least once.');
 }
+function createInstrumentationFilter(includedBasePath, excludedPaths) {
+    return (request) => {
+        return (!excludedPaths.has(request) &&
+            !/\.(e2e|spec)\.tsx?$|[\\/]node_modules[\\/]/.test(request) &&
+            request.startsWith(includedBasePath));
+    };
+}
+function getInstrumentationExcludedPaths(root, excludedPaths) {
+    const excluded = new Set();
+    for (const excludeGlob of excludedPaths) {
+        const excludePath = excludeGlob[0] === '/' ? excludeGlob.slice(1) : excludeGlob;
+        fast_glob_1.default.sync(excludePath, { cwd: root }).forEach((p) => excluded.add(path.join(root, p)));
+    }
+    return excluded;
+}

src/utils/normalize-cache.js

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

uniqueId

@@ -1 +1 @@
-Fri Sep 27 2024 18:53:57 GMT+0000 (Coordinated Universal Time)
+Fri Sep 27 2024 19:11:14 GMT+0000 (Coordinated Universal Time)