@angular-devkit/build-angular 19.0.0-next.8 → 19.0.0-next.9

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2017 Google, Inc.
+Copyright (c) 2010-2024 Google LLC. https://angular.dev/license
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "19.0.0-next.8",
+  "version": "19.0.0-next.9",
   "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": "0.1900.0-next.8",
-    "@angular-devkit/build-webpack": "0.1900.0-next.8",
-    "@angular-devkit/core": "19.0.0-next.8",
-    "@angular/build": "19.0.0-next.8",
+    "@angular-devkit/architect": "0.1900.0-next.9",
+    "@angular-devkit/build-webpack": "0.1900.0-next.9",
+    "@angular-devkit/core": "19.0.0-next.9",
+    "@angular/build": "19.0.0-next.9",
     "@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": "19.0.0-next.8",
+    "@ngtools/webpack": "19.0.0-next.9",
     "@vitejs/plugin-basic-ssl": "1.1.0",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.20",
@@ -53,17 +53,17 @@
     "postcss-loader": "8.1.1",
     "resolve-url-loader": "5.0.0",
     "rxjs": "7.8.1",
-    "sass": "1.79.3",
+    "sass": "1.79.4",
     "sass-loader": "16.0.2",
     "semver": "7.6.3",
     "source-map-loader": "5.0.0",
     "source-map-support": "0.5.21",
-    "terser": "5.33.0",
+    "terser": "5.34.1",
     "tree-kill": "1.2.2",
     "tslib": "2.7.0",
     "vite": "5.4.8",
     "watchpack": "2.4.2",
-    "webpack": "5.94.0",
+    "webpack": "5.95.0",
     "webpack-dev-middleware": "7.4.2",
     "webpack-dev-server": "5.1.0",
     "webpack-merge": "6.0.1",
@@ -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": "^19.0.0-next.8",
+    "@angular/ssr": "^19.0.0-next.9",
     "@web/test-runner": "^0.19.0",
     "browser-sync": "^3.0.2",
     "jest": "^29.5.0",

package/src/builders/karma/application_builder.js

@@ -29,16 +29,19 @@ 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");
-const read_tsconfig_1 = require("../../utils/read-tsconfig");
 const schema_1 = require("../browser-esbuild/schema");
 const find_tests_1 = require("./find-tests");
 class ApplicationBuildError extends Error {
@@ -47,8 +50,56 @@ class ApplicationBuildError extends Error {
         this.name = 'ApplicationBuildError';
     }
 }
+function injectKarmaReporter(context, buildOptions, karmaConfig, subscriber) {
+    const reporterName = 'angular-progress-notifier';
+    class ProgressNotifierReporter {
+        emitter;
+        static $inject = ['emitter'];
+        constructor(emitter) {
+            this.emitter = emitter;
+            this.startWatchingBuild();
+        }
+        startWatchingBuild() {
+            void (async () => {
+                for await (const buildOutput of (0, private_1.buildApplicationInternal)({
+                    ...buildOptions,
+                    watch: true,
+                }, context)) {
+                    if (buildOutput.kind === private_1.ResultKind.Failure) {
+                        subscriber.next({ success: false, message: 'Build failed' });
+                    }
+                    else if (buildOutput.kind === private_1.ResultKind.Incremental ||
+                        buildOutput.kind === private_1.ResultKind.Full) {
+                        await writeTestFiles(buildOutput.files, buildOptions.outputPath);
+                        this.emitter.refreshFiles();
+                    }
+                }
+            })();
+        }
+        onRunComplete = function (_browsers, results) {
+            if (results.exitCode === 0) {
+                subscriber.next({ success: true });
+            }
+            else {
+                subscriber.next({ success: false });
+            }
+        };
+    }
+    karmaConfig.reporters ??= [];
+    karmaConfig.reporters.push(reporterName);
+    karmaConfig.plugins ??= [];
+    karmaConfig.plugins.push({
+        [`reporter:${reporterName}`]: [
+            'factory',
+            Object.assign((...args) => new ProgressNotifierReporter(...args), ProgressNotifierReporter),
+        ],
+    });
+}
 function execute(options, context, karmaOptions, transforms = {}) {
-    return (0, rxjs_1.from)(initializeApplication(options, context, karmaOptions, transforms)).pipe((0, rxjs_1.switchMap)(([karma, karmaConfig]) => new rxjs_1.Observable((subscriber) => {
+    return (0, rxjs_1.from)(initializeApplication(options, context, karmaOptions, transforms)).pipe((0, rxjs_1.switchMap)(([karma, karmaConfig, buildOptions]) => new rxjs_1.Observable((subscriber) => {
+        if (options.watch) {
+            injectKarmaReporter(context, buildOptions, karmaConfig, subscriber);
+        }
         // Complete the observable once the Karma server returns.
         const karmaServer = new karma.Server(karmaConfig, (exitCode) => {
             subscriber.next({ success: exitCode === 0 });
@@ -76,41 +127,36 @@ 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);
+function normalizePolyfills(polyfills) {
+    if (typeof polyfills === 'string') {
+        return [polyfills];
+    }
+    return polyfills ?? [];
+}
+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([
         ...testFiles,
         '@angular-devkit/build-angular/src/builders/karma/init_test_bed.js',
     ]);
-    // Extract `zone.js/testing` to a separate entry point because it needs to be loaded after Jasmine.
-    const [polyfills, hasZoneTesting] = extractZoneTesting(options.polyfills);
-    if (hasZoneTesting) {
-        entryPoints.add('zone.js/testing');
-    }
-    const tsConfigPath = path.resolve(context.workspaceRoot, options.tsConfig);
-    const tsConfig = await (0, read_tsconfig_1.readTsconfig)(tsConfigPath);
-    const localizePackageInitEntryPoint = '@angular/localize/init';
-    const hasLocalizeType = tsConfig.options.types?.some((t) => t === '@angular/localize' || t === localizePackageInitEntryPoint);
-    if (hasLocalizeType) {
-        polyfills.push(localizePackageInitEntryPoint);
-    }
-    return [entryPoints, polyfills];
+    return entryPoints;
 }
 async function initializeApplication(options, context, karmaOptions, transforms = {}) {
     if (transforms.webpackConfiguration) {
         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 [karma, [entryPoints, polyfills]] = await Promise.all([
+    const outputPath = path.join(context.workspaceRoot, 'dist/test-out', (0, crypto_1.randomUUID)());
+    const projectSourceRoot = await getProjectSourceRoot(context);
+    const [karma, entryPoints] = await Promise.all([
         Promise.resolve().then(() => __importStar(require('karma'))),
-        collectEntrypoints(options, context),
-        fs.rm(testDir, { recursive: true, force: true }),
+        collectEntrypoints(options, context, projectSourceRoot),
+        fs.rm(outputPath, { recursive: true, force: true }),
     ]);
-    const outputPath = testDir;
-    // Build tests with `application` builder, using test files as entry points.
-    const buildOutput = await first((0, private_1.buildApplicationInternal)({
+    const instrumentForCoverage = options.codeCoverage
+        ? createInstrumentationFilter(projectSourceRoot, getInstrumentationExcludedPaths(context.workspaceRoot, options.codeCoverageExclude ?? []))
+        : undefined;
+    const buildOptions = {
         entryPoints,
         tsConfig: options.tsConfig,
         outputPath,
@@ -123,10 +169,13 @@ async function initializeApplication(options, context, karmaOptions, transforms
             styles: true,
             vendor: true,
         },
+        instrumentForCoverage,
         styles: options.styles,
-        polyfills,
+        polyfills: normalizePolyfills(options.polyfills),
         webWorkerTsConfig: options.webWorkerTsConfig,
-    }, context));
+    };
+    // Build tests with `application` builder, using test files as entry points.
+    const buildOutput = await first((0, private_1.buildApplicationInternal)(buildOptions, context));
     if (buildOutput.kind === private_1.ResultKind.Failure) {
         throw new ApplicationBuildError('Build failed');
     }
@@ -134,22 +183,19 @@ async function initializeApplication(options, context, karmaOptions, transforms
         throw new ApplicationBuildError('A full build result is required from the application builder.');
     }
     // Write test files
-    await writeTestFiles(buildOutput.files, testDir);
+    await writeTestFiles(buildOutput.files, buildOptions.outputPath);
     karmaOptions.files ??= [];
     karmaOptions.files.push(
     // Serve polyfills first.
-    { pattern: `${testDir}/polyfills.js`, type: 'module' }, 
+    { pattern: `${outputPath}/polyfills.js`, type: 'module' }, 
     // Allow loading of chunk-* files but don't include them all on load.
-    { pattern: `${testDir}/chunk-*.js`, type: 'module', included: false }, 
-    // Allow loading of worker-* files but don't include them all on load.
-    { pattern: `${testDir}/worker-*.js`, type: 'module', included: false }, 
-    // `zone.js/testing`, served but not included on page load.
-    { pattern: `${testDir}/testing.js`, type: 'module', included: false }, 
+    { pattern: `${outputPath}/{chunk,worker}-*.js`, type: 'module', included: false });
+    karmaOptions.files.push(
     // Serve remaining JS on page load, these are the test entrypoints.
-    { pattern: `${testDir}/*.js`, type: 'module' });
+    { pattern: `${outputPath}/*.js`, type: 'module' });
     if (options.styles?.length) {
         // Serve CSS outputs on page load, these are the global styles.
-        karmaOptions.files.push({ pattern: `${testDir}/*.css`, type: 'css' });
+        karmaOptions.files.push({ pattern: `${outputPath}/*.css`, type: 'css' });
     }
     const parsedKarmaConfig = await karma.config.parseConfig(options.karmaConfig && path.resolve(context.workspaceRoot, options.karmaConfig), transforms.karmaOptions ? transforms.karmaOptions(karmaOptions) : karmaOptions, { promiseConfig: true, throwErrors: true });
     // Remove the webpack plugin/framework:
@@ -173,7 +219,7 @@ async function initializeApplication(options, context, karmaOptions, transforms
         !parsedKarmaConfig.reporters?.some((r) => r === 'coverage' || r === 'coverage-istanbul')) {
         parsedKarmaConfig.reporters = (parsedKarmaConfig.reporters ?? []).concat(['coverage']);
     }
-    return [karma, parsedKarmaConfig];
+    return [karma, parsedKarmaConfig, buildOptions];
 }
 async function writeTestFiles(files, testDir) {
     const directoryExists = new Set();
@@ -199,15 +245,6 @@ async function writeTestFiles(files, testDir) {
         }
     });
 }
-function extractZoneTesting(polyfills) {
-    if (typeof polyfills === 'string') {
-        polyfills = [polyfills];
-    }
-    polyfills ??= [];
-    const polyfillsWithoutZoneTesting = polyfills.filter((polyfill) => polyfill !== 'zone.js/testing');
-    const hasZoneTesting = polyfills.length !== polyfillsWithoutZoneTesting.length;
-    return [polyfillsWithoutZoneTesting, hasZoneTesting];
-}
 /** Returns the first item yielded by the given generator and cancels the execution. */
 async function first(generator) {
     for await (const value of generator) {
@@ -215,3 +252,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;
+}

package/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';
+const VERSION = '19.0.0-next.9';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&