@angular/build 21.0.0-next.5 → 21.0.0-next.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "21.0.0-next.5",
+  "version": "21.0.0-next.7",
   "description": "Official build system for Angular",
   "keywords": [
     "Angular CLI",
@@ -23,7 +23,7 @@
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.3.0",
-    "@angular-devkit/architect": "0.2100.0-next.5",
+    "@angular-devkit/architect": "0.2100.0-next.7",
     "@babel/core": "7.28.4",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -41,16 +41,16 @@
     "parse5-html-rewriting-stream": "8.0.0",
     "picomatch": "4.0.3",
     "piscina": "5.1.3",
-    "rolldown": "1.0.0-beta.39",
-    "sass": "1.93.1",
+    "rolldown": "1.0.0-beta.42",
+    "sass": "1.93.2",
     "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.15",
-    "vite": "7.1.7",
+    "vite": "7.1.9",
     "watchpack": "2.4.4"
   },
   "optionalDependencies": {
-    "lmdb": "3.4.2"
+    "lmdb": "3.4.3"
   },
   "peerDependencies": {
     "@angular/core": "^21.0.0-next.0",
@@ -60,7 +60,7 @@
     "@angular/platform-browser": "^21.0.0-next.0",
     "@angular/platform-server": "^21.0.0-next.0",
     "@angular/service-worker": "^21.0.0-next.0",
-    "@angular/ssr": "^21.0.0-next.5",
+    "@angular/ssr": "^21.0.0-next.7",
     "karma": "^6.4.0",
     "less": "^4.2.0",
     "ng-packagr": "^21.0.0-next.0",
@@ -112,7 +112,7 @@
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
-  "packageManager": "pnpm@10.17.1",
+  "packageManager": "pnpm@10.18.1",
   "engines": {
     "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",

package/src/builders/karma/application_builder.js

@@ -45,6 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.execute = execute;
 const node_crypto_1 = require("node:crypto");
+const node_fs_1 = require("node:fs");
 const fs = __importStar(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const web_1 = require("node:stream/web");
@@ -105,8 +106,14 @@ function execute(options, context, transforms) {
 async function initializeApplication(options, context, karmaOptions, transforms) {
     const karma = await Promise.resolve().then(() => __importStar(require('karma')));
     const projectSourceRoot = await (0, utils_1.getProjectSourceRoot)(context);
+    // Setup temporary output path and ensure it is empty
     const outputPath = node_path_1.default.join(context.workspaceRoot, 'dist/test-out', (0, node_crypto_1.randomUUID)());
     await fs.rm(outputPath, { recursive: true, force: true });
+    // Setup exit cleanup for temporary directory
+    const handleProcessExit = () => (0, node_fs_1.rmSync)(outputPath, { recursive: true, force: true });
+    process.once('exit', handleProcessExit);
+    process.once('SIGINT', handleProcessExit);
+    process.once('uncaughtException', handleProcessExit);
     const { buildOptions, mainName } = await setupBuildOptions(options, context, projectSourceRoot, outputPath);
     const [buildOutput, buildIterator] = await runEsbuild(buildOptions, context, projectSourceRoot);
     const karmaConfig = await configureKarma(karma, context, karmaOptions, options, buildOptions, buildOutput, mainName, transforms);

package/src/builders/unit-test/builder.js

@@ -266,7 +266,15 @@ async function* execute(options, context, extensions) {
     // Get base build options from the buildTarget
     let buildTargetOptions;
     try {
-        buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(normalizedOptions.buildTarget), await context.getBuilderNameForTarget(normalizedOptions.buildTarget)));
+        const builderName = await context.getBuilderNameForTarget(normalizedOptions.buildTarget);
+        if (builderName !== '@angular/build:application' &&
+            // TODO: Add comprehensive support for ng-packagr.
+            builderName !== '@angular/build:ng-packagr') {
+            context.logger.warn(`The 'buildTarget' is configured to use '${builderName}', which is not supported. ` +
+                `The 'unit-test' builder is designed to work with '@angular/build:application'. ` +
+                'Unexpected behavior or build failures may occur.');
+        }
+        buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(normalizedOptions.buildTarget), builderName));
     }
     catch (e) {
         (0, error_1.assertIsError)(e);
@@ -303,8 +311,8 @@ async function* execute(options, context, extensions) {
                 ...buildTargetOptions,
                 ...runnerBuildOptions,
                 watch: normalizedOptions.watch,
-                tsConfig: normalizedOptions.tsConfig,
                 progress: normalizedOptions.buildProgress ?? buildTargetOptions.progress,
+                ...(normalizedOptions.tsConfig ? { tsConfig: normalizedOptions.tsConfig } : {}),
             };
             const dumpDirectory = normalizedOptions.dumpVirtualFiles
                 ? node_path_1.default.join(normalizedOptions.cacheOptions.path, 'unit-test', 'output-files')

package/src/builders/unit-test/options.d.ts

@@ -18,15 +18,28 @@ export declare function normalizeOptions(context: BuilderContext, projectName: s
     exclude: string[] | undefined;
     filter: string | undefined;
     runnerName: import("./schema").Runner;
-    codeCoverage: {
+    coverage: {
+        all: boolean | undefined;
         exclude: string[] | undefined;
+        include: string[] | undefined;
         reporters: [string, Record<string, unknown>][] | undefined;
+        thresholds: import("./schema").CoverageThresholds | undefined;
+        watermarks: {
+            statements?: [number, number];
+            branches?: [number, number];
+            functions?: [number, number];
+            lines?: [number, number];
+        };
     } | undefined;
-    tsConfig: string;
+    tsConfig: string | undefined;
     buildProgress: boolean | undefined;
     reporters: [string, Record<string, unknown>][] | undefined;
     outputFile: string | undefined;
     browsers: string[] | undefined;
+    browserViewport: {
+        width: number;
+        height: number;
+    } | undefined;
     watch: boolean;
     debug: boolean;
     providersFile: string | undefined;

package/src/builders/unit-test/options.js

@@ -13,10 +13,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 exports.injectTestingPolyfills = injectTestingPolyfills;
 const architect_1 = require("@angular-devkit/architect");
+const node_fs_1 = require("node:fs");
 const node_path_1 = __importDefault(require("node:path"));
 const normalize_cache_1 = require("../../utils/normalize-cache");
 const project_metadata_1 = require("../../utils/project-metadata");
 const tty_1 = require("../../utils/tty");
+async function exists(path) {
+    try {
+        await node_fs_1.promises.access(path, node_fs_1.constants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 function normalizeReporterOption(reporters) {
     return reporters?.map((entry) => typeof entry === 'string'
         ? [entry, {}]
@@ -33,7 +43,22 @@ async function normalizeOptions(context, projectName, options) {
     // Target specifier defaults to the current project's build target using a development configuration
     const buildTargetSpecifier = options.buildTarget ?? `::development`;
     const buildTarget = (0, architect_1.targetFromTargetString)(buildTargetSpecifier, projectName, 'build');
-    const { tsConfig, runner, browsers, progress, filter } = options;
+    const { runner, browsers, progress, filter, browserViewport } = options;
+    const [width, height] = browserViewport?.split('x').map(Number) ?? [];
+    let tsConfig = options.tsConfig;
+    if (tsConfig) {
+        const fullTsConfigPath = node_path_1.default.join(workspaceRoot, tsConfig);
+        if (!(await exists(fullTsConfigPath))) {
+            throw new Error(`The specified tsConfig file '${tsConfig}' does not exist.`);
+        }
+    }
+    else {
+        const tsconfigSpecPath = node_path_1.default.join(projectRoot, 'tsconfig.spec.json');
+        if (await exists(tsconfigSpecPath)) {
+            // The application builder expects a path relative to the workspace root.
+            tsConfig = node_path_1.default.relative(workspaceRoot, tsconfigSpecPath);
+        }
+    }
     return {
         // Project/workspace information
         workspaceRoot,
@@ -46,10 +71,16 @@ async function normalizeOptions(context, projectName, options) {
         exclude: options.exclude,
         filter,
         runnerName: runner,
-        codeCoverage: options.codeCoverage
+        coverage: options.coverage
             ? {
-                exclude: options.codeCoverageExclude,
-                reporters: normalizeReporterOption(options.codeCoverageReporters),
+                all: options.coverageAll,
+                exclude: options.coverageExclude,
+                include: options.coverageInclude,
+                reporters: normalizeReporterOption(options.coverageReporters),
+                thresholds: options.coverageThresholds,
+                // The schema generation tool doesn't support tuple types for items, but the schema validation
+                // does ensure that the array has exactly two numbers.
+                watermarks: options.coverageWatermarks,
             }
             : undefined,
         tsConfig,
@@ -57,6 +88,7 @@ async function normalizeOptions(context, projectName, options) {
         reporters: normalizeReporterOption(options.reporters),
         outputFile: options.outputFile,
         browsers,
+        browserViewport: width && height ? { width, height } : undefined,
         watch: options.watch ?? (0, tty_1.isTTY)(),
         debug: options.debug ?? false,
         providersFile: options.providersFile && node_path_1.default.join(workspaceRoot, options.providersFile),

package/src/builders/unit-test/runners/karma/executor.js

@@ -50,15 +50,24 @@ class KarmaExecutor {
     }
     async *execute() {
         const { context, options: unitTestOptions } = this;
+        if (unitTestOptions.browserViewport) {
+            context.logger.warn('The "karma" test runner does not support the "browserViewport" option. The option will be ignored.');
+        }
         if (unitTestOptions.debug) {
             context.logger.warn('The "karma" test runner does not support the "debug" option. The option will be ignored.');
         }
         if (unitTestOptions.setupFiles.length) {
             context.logger.warn('The "karma" test runner does not support the "setupFiles" option. The option will be ignored.');
         }
+        if (unitTestOptions.coverage?.all) {
+            context.logger.warn('The "karma" test runner does not support the "coverageAll" option. The option will be ignored.');
+        }
+        if (unitTestOptions.coverage?.include) {
+            context.logger.warn('The "karma" test runner does not support the "coverageInclude" option. The option will be ignored.');
+        }
         const buildTargetOptions = (await context.validateOptions(await context.getTargetOptions(unitTestOptions.buildTarget), await context.getBuilderNameForTarget(unitTestOptions.buildTarget)));
         const karmaOptions = {
-            tsConfig: unitTestOptions.tsConfig,
+            tsConfig: unitTestOptions.tsConfig ?? buildTargetOptions.tsConfig,
             polyfills: buildTargetOptions.polyfills,
             assets: buildTargetOptions.assets,
             scripts: buildTargetOptions.scripts,
@@ -76,8 +85,8 @@ class KarmaExecutor {
             poll: buildTargetOptions.poll,
             preserveSymlinks: buildTargetOptions.preserveSymlinks,
             browsers: unitTestOptions.browsers?.join(','),
-            codeCoverage: !!unitTestOptions.codeCoverage,
-            codeCoverageExclude: unitTestOptions.codeCoverage?.exclude,
+            codeCoverage: !!unitTestOptions.coverage,
+            codeCoverageExclude: unitTestOptions.coverage?.exclude,
             fileReplacements: buildTargetOptions.fileReplacements,
             reporters: unitTestOptions.reporters?.map((reporter) => {
                 // Karma only supports string reporters.
@@ -104,6 +113,20 @@ class KarmaExecutor {
                     options.client.args ??= [];
                     options.client.args.push('--grep', filter);
                 }
+                // Add coverage options
+                if (unitTestOptions.coverage) {
+                    const { thresholds, watermarks } = unitTestOptions.coverage;
+                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                    const coverageReporter = (options.coverageReporter ??= {});
+                    if (thresholds) {
+                        coverageReporter.check = thresholds.perFile
+                            ? { each: thresholds }
+                            : { global: thresholds };
+                    }
+                    if (watermarks) {
+                        coverageReporter.watermarks = watermarks;
+                    }
+                }
                 return options;
             },
         };

package/src/builders/unit-test/runners/karma/index.js

@@ -26,7 +26,7 @@ const KarmaTestRunner = {
                 checker.check(launcherName);
             }
         }
-        if (options.codeCoverage) {
+        if (options.coverage) {
             checker.check('karma-coverage');
         }
         checker.report();

package/src/builders/unit-test/runners/vitest/browser-provider.d.ts

@@ -9,4 +9,7 @@ export interface BrowserConfiguration {
     browser?: import('vitest/node').BrowserConfigOptions;
     errors?: string[];
 }
-export declare function setupBrowserConfiguration(browsers: string[] | undefined, debug: boolean, projectSourceRoot: string): BrowserConfiguration;
+export declare function setupBrowserConfiguration(browsers: string[] | undefined, debug: boolean, projectSourceRoot: string, viewport: {
+    width: number;
+    height: number;
+} | undefined): BrowserConfiguration;

package/src/builders/unit-test/runners/vitest/browser-provider.js

@@ -28,7 +28,7 @@ function normalizeBrowserName(browserName) {
     const normalized = browserName.toLowerCase();
     return normalized.replace(/headless$/, '');
 }
-function setupBrowserConfiguration(browsers, debug, projectSourceRoot) {
+function setupBrowserConfiguration(browsers, debug, projectSourceRoot, viewport) {
     if (browsers === undefined) {
         return {};
     }
@@ -57,10 +57,14 @@ function setupBrowserConfiguration(browsers, debug, projectSourceRoot) {
     if (errors) {
         return { errors };
     }
+    const isCI = !!process.env['CI'];
+    const headless = isCI || browsers.some((name) => name.toLowerCase().includes('headless'));
     const browser = {
         enabled: true,
         provider,
-        headless: browsers.some((name) => name.toLowerCase().includes('headless')),
+        headless,
+        ui: !headless,
+        viewport,
         instances: browsers.map((browserName) => ({
             browser: normalizeBrowserName(browserName),
         })),

package/src/builders/unit-test/runners/vitest/build-options.js

@@ -55,7 +55,7 @@ function adjustOutputHashing(hashing) {
     }
 }
 async function getVitestBuildOptions(options, baseBuildOptions) {
-    const { workspaceRoot, projectSourceRoot, include, exclude = [], watch, tsConfig, providersFile, } = options;
+    const { workspaceRoot, projectSourceRoot, include, exclude = [], watch, providersFile } = options;
     // Find test files
     const testFiles = await (0, test_discovery_1.findTests)(include, exclude, workspaceRoot, projectSourceRoot);
     if (testFiles.length === 0) {
@@ -87,7 +87,6 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
         sourceMap: { scripts: true, vendor: false, styles: false },
         outputHashing: adjustOutputHashing(baseBuildOptions.outputHashing),
         optimization: false,
-        tsConfig,
         entryPoints,
         externalDependencies: ['vitest', '@vitest/browser/context'],
     };

package/src/builders/unit-test/runners/vitest/executor.d.ts

@@ -11,6 +11,7 @@ import { NormalizedUnitTestBuilderOptions } from '../../options';
 import type { TestExecutor } from '../api';
 export declare class VitestExecutor implements TestExecutor {
     private vitest;
+    private normalizePath;
     private readonly projectName;
     private readonly options;
     private readonly buildResultFiles;

package/src/builders/unit-test/runners/vitest/executor.js

@@ -6,6 +6,39 @@
  * 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 __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -21,6 +54,7 @@ const browser_provider_1 = require("./browser-provider");
 const plugins_1 = require("./plugins");
 class VitestExecutor {
     vitest;
+    normalizePath;
     projectName;
     options;
     buildResultFiles = new Map();
@@ -41,18 +75,19 @@ class VitestExecutor {
         }
     }
     async *execute(buildResult) {
+        this.normalizePath ??= (await Promise.resolve().then(() => __importStar(require('vite')))).normalizePath;
         if (buildResult.kind === results_1.ResultKind.Full) {
             this.buildResultFiles.clear();
             for (const [path, file] of Object.entries(buildResult.files)) {
-                this.buildResultFiles.set(path, file);
+                this.buildResultFiles.set(this.normalizePath(path), file);
             }
         }
         else {
             for (const file of buildResult.removed) {
-                this.buildResultFiles.delete(file.path);
+                this.buildResultFiles.delete(this.normalizePath(file.path));
             }
             for (const [path, file] of Object.entries(buildResult.files)) {
-                this.buildResultFiles.set(path, file);
+                this.buildResultFiles.set(this.normalizePath(path), file);
             }
         }
         // Initialize Vitest if not already present.
@@ -101,7 +136,7 @@ class VitestExecutor {
         return testSetupFiles;
     }
     async initializeVitest() {
-        const { codeCoverage, reporters, outputFile, workspaceRoot, browsers, debug, watch } = this.options;
+        const { coverage, reporters, outputFile, workspaceRoot, browsers, debug, watch, browserViewport, } = this.options;
         let vitestNodeModule;
         try {
             vitestNodeModule = await (0, load_esm_1.loadEsmModule)('vitest/node');
@@ -115,7 +150,7 @@ class VitestExecutor {
         }
         const { startVitest } = vitestNodeModule;
         // Setup vitest browser options if configured
-        const browserOptions = (0, browser_provider_1.setupBrowserConfiguration)(browsers, debug, this.options.projectSourceRoot);
+        const browserOptions = (0, browser_provider_1.setupBrowserConfiguration)(browsers, debug, this.options.projectSourceRoot, browserViewport);
         if (browserOptions.errors?.length) {
             throw new Error(browserOptions.errors.join('\n'));
         }
@@ -148,7 +183,7 @@ class VitestExecutor {
             reporters: reporters ?? ['default'],
             outputFile,
             watch,
-            coverage: generateCoverageOption(codeCoverage, this.projectName),
+            coverage: await generateCoverageOption(coverage, this.projectName),
             ...debugOptions,
         }, {
             server: {
@@ -161,20 +196,41 @@ class VitestExecutor {
     }
 }
 exports.VitestExecutor = VitestExecutor;
-function generateCoverageOption(codeCoverage, projectName) {
-    if (!codeCoverage) {
+async function generateCoverageOption(coverage, projectName) {
+    if (!coverage) {
         return {
             enabled: false,
         };
     }
+    let defaultExcludes = [];
+    if (coverage.exclude) {
+        try {
+            const vitestConfig = await (0, load_esm_1.loadEsmModule)('vitest/config');
+            defaultExcludes = vitestConfig.coverageConfigDefaults.exclude;
+        }
+        catch { }
+    }
     return {
         enabled: true,
+        all: coverage.all,
         excludeAfterRemap: true,
+        include: coverage.include,
         reportsDirectory: (0, path_1.toPosixPath)(node_path_1.default.join('coverage', projectName)),
+        thresholds: coverage.thresholds,
+        watermarks: coverage.watermarks,
         // Special handling for `exclude`/`reporters` due to an undefined value causing upstream failures
-        ...(codeCoverage.exclude ? { exclude: codeCoverage.exclude } : {}),
-        ...(codeCoverage.reporters
-            ? { reporter: codeCoverage.reporters }
+        ...(coverage.exclude
+            ? {
+                exclude: [
+                    // Augment the default exclude https://vitest.dev/config/#coverage-exclude
+                    // with the user defined exclusions
+                    ...coverage.exclude,
+                    ...defaultExcludes,
+                ],
+            }
+            : {}),
+        ...(coverage.reporters
+            ? { reporter: coverage.reporters }
             : {}),
     };
 }

package/src/builders/unit-test/runners/vitest/index.js

@@ -30,7 +30,7 @@ const VitestTestRunner = {
             // JSDOM is used when no browsers are specified
             checker.check('jsdom');
         }
-        if (options.codeCoverage) {
+        if (options.coverage) {
             checker.check('@vitest/coverage-v8');
         }
         checker.report();

package/src/builders/unit-test/schema.d.ts

@@ -2,6 +2,11 @@
  * Unit testing options for Angular applications.
  */
 export type Schema = {
+    /**
+     * Specifies the browser viewport dimensions for browser-based tests in the format
+     * `widthxheight`.
+     */
+    browserViewport?: string;
     /**
      * Specifies the browsers to use for test execution. When not specified, tests are run in a
      * Node.js environment using jsdom. For both Vitest and Karma, browser names ending with
@@ -10,25 +15,45 @@ export type Schema = {
     browsers?: string[];
     /**
      * Specifies the build target to use for the unit test build in the format
-     * `project:target[:configuration]`. You can also pass a comma-separated list of
+     * `project:target[:configuration]`. This defaults to the `build` target of the current
+     * project with the `development` configuration. You can also pass a comma-separated list of
      * configurations. Example: `project:target:production,staging`.
      */
-    buildTarget: string;
+    buildTarget?: string;
     /**
-     * Enables code coverage reporting for tests.
+     * Enables coverage reporting for tests.
      */
-    codeCoverage?: boolean;
+    coverage?: boolean;
     /**
-     * Specifies glob patterns of files to exclude from the code coverage report.
+     * Includes all files that match the `coverageInclude` pattern in the coverage report, not
+     * just those touched by tests.
      */
-    codeCoverageExclude?: string[];
+    coverageAll?: boolean;
     /**
-     * Specifies the reporters to use for code coverage results. Each reporter can be a string
+     * Specifies glob patterns of files to exclude from the coverage report.
+     */
+    coverageExclude?: string[];
+    /**
+     * Specifies glob patterns of files to include in the coverage report.
+     */
+    coverageInclude?: string[];
+    /**
+     * Specifies the reporters to use for coverage results. Each reporter can be a string
      * representing its name, or a tuple containing the name and an options object. Built-in
      * reporters include 'html', 'lcov', 'lcovonly', 'text', 'text-summary', 'cobertura',
      * 'json', and 'json-summary'.
      */
-    codeCoverageReporters?: SchemaCodeCoverageReporter[];
+    coverageReporters?: SchemaCoverageReporter[];
+    /**
+     * Specifies minimum coverage thresholds that must be met. If thresholds are not met, the
+     * builder will exit with an error.
+     */
+    coverageThresholds?: CoverageThresholds;
+    /**
+     * Specifies coverage watermarks for the HTML reporter. These determine the color coding for
+     * high, medium, and low coverage.
+     */
+    coverageWatermarks?: CoverageWatermarks;
     /**
      * Enables debugging mode for tests, allowing the use of the Node Inspector.
      */
@@ -92,20 +117,22 @@ export type Schema = {
      */
     setupFiles?: string[];
     /**
-     * The path to the TypeScript configuration file, relative to the workspace root.
+     * The path to the TypeScript configuration file, relative to the workspace root. Defaults
+     * to `tsconfig.spec.json` in the project root if it exists. If not specified and the
+     * default does not exist, the `tsConfig` from the specified `buildTarget` will be used.
      */
-    tsConfig: string;
+    tsConfig?: string;
     /**
      * Enables watch mode, which re-runs tests when source files change. Defaults to `true` in
      * TTY environments and `false` otherwise.
      */
     watch?: boolean;
 };
-export type SchemaCodeCoverageReporter = CodeCoverageReporterCodeCoverageReporter[] | CoverageReporters;
-export type CodeCoverageReporterCodeCoverageReporter = CoverageReporters | {
+export type SchemaCoverageReporter = CoverageReporterCoverageReporterUnion[] | CoverageReporterEnum;
+export type CoverageReporterCoverageReporterUnion = CoverageReporterEnum | {
     [key: string]: any;
 };
-export declare enum CoverageReporters {
+export declare enum CoverageReporterEnum {
     Cobertura = "cobertura",
     Html = "html",
     Json = "json",
@@ -115,6 +142,54 @@ export declare enum CoverageReporters {
     Text = "text",
     TextSummary = "text-summary"
 }
+/**
+ * Specifies minimum coverage thresholds that must be met. If thresholds are not met, the
+ * builder will exit with an error.
+ */
+export type CoverageThresholds = {
+    /**
+     * Minimum percentage of branches covered.
+     */
+    branches?: number;
+    /**
+     * Minimum percentage of functions covered.
+     */
+    functions?: number;
+    /**
+     * Minimum percentage of lines covered.
+     */
+    lines?: number;
+    /**
+     * When true, thresholds are enforced for each file individually.
+     */
+    perFile?: boolean;
+    /**
+     * Minimum percentage of statements covered.
+     */
+    statements?: number;
+};
+/**
+ * Specifies coverage watermarks for the HTML reporter. These determine the color coding for
+ * high, medium, and low coverage.
+ */
+export type CoverageWatermarks = {
+    /**
+     * The high and low watermarks for branches coverage. `[low, high]`
+     */
+    branches?: number[];
+    /**
+     * The high and low watermarks for functions coverage. `[low, high]`
+     */
+    functions?: number[];
+    /**
+     * The high and low watermarks for lines coverage. `[low, high]`
+     */
+    lines?: number[];
+    /**
+     * The high and low watermarks for statements coverage. `[low, high]`
+     */
+    statements?: number[];
+};
 export type SchemaReporter = ReporterReporter[] | string;
 export type ReporterReporter = {
     [key: string]: any;

package/src/builders/unit-test/schema.js

@@ -2,18 +2,18 @@
 // THIS FILE IS AUTOMATICALLY GENERATED. TO UPDATE THIS FILE YOU NEED TO CHANGE THE
 // CORRESPONDING JSON SCHEMA FILE, THEN RUN devkit-admin build (or bazel build ...).
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Runner = exports.CoverageReporters = void 0;
-var CoverageReporters;
-(function (CoverageReporters) {
-    CoverageReporters["Cobertura"] = "cobertura";
-    CoverageReporters["Html"] = "html";
-    CoverageReporters["Json"] = "json";
-    CoverageReporters["JsonSummary"] = "json-summary";
-    CoverageReporters["Lcov"] = "lcov";
-    CoverageReporters["Lcovonly"] = "lcovonly";
-    CoverageReporters["Text"] = "text";
-    CoverageReporters["TextSummary"] = "text-summary";
-})(CoverageReporters || (exports.CoverageReporters = CoverageReporters = {}));
+exports.Runner = exports.CoverageReporterEnum = void 0;
+var CoverageReporterEnum;
+(function (CoverageReporterEnum) {
+    CoverageReporterEnum["Cobertura"] = "cobertura";
+    CoverageReporterEnum["Html"] = "html";
+    CoverageReporterEnum["Json"] = "json";
+    CoverageReporterEnum["JsonSummary"] = "json-summary";
+    CoverageReporterEnum["Lcov"] = "lcov";
+    CoverageReporterEnum["Lcovonly"] = "lcovonly";
+    CoverageReporterEnum["Text"] = "text";
+    CoverageReporterEnum["TextSummary"] = "text-summary";
+})(CoverageReporterEnum || (exports.CoverageReporterEnum = CoverageReporterEnum = {}));
 /**
  * Specifies the test runner to use for test execution.
  */

package/src/builders/unit-test/schema.json

@@ -6,12 +6,12 @@
   "properties": {
     "buildTarget": {
       "type": "string",
-      "description": "Specifies the build target to use for the unit test build in the format `project:target[:configuration]`. You can also pass a comma-separated list of configurations. Example: `project:target:production,staging`.",
+      "description": "Specifies the build target to use for the unit test build in the format `project:target[:configuration]`. This defaults to the `build` target of the current project with the `development` configuration. You can also pass a comma-separated list of configurations. Example: `project:target:production,staging`.",
       "pattern": "^[^:\\s]*:[^:\\s]*(:[^\\s]+)?$"
     },
     "tsConfig": {
       "type": "string",
-      "description": "The path to the TypeScript configuration file, relative to the workspace root."
+      "description": "The path to the TypeScript configuration file, relative to the workspace root. Defaults to `tsconfig.spec.json` in the project root if it exists. If not specified and the default does not exist, the `tsConfig` from the specified `buildTarget` will be used."
     },
     "runner": {
       "type": "string",
@@ -26,6 +26,11 @@
       },
       "minItems": 1
     },
+    "browserViewport": {
+      "description": "Specifies the browser viewport dimensions for browser-based tests in the format `widthxheight`.",
+      "type": "string",
+      "pattern": "^\\d+x\\d+$"
+    },
     "include": {
       "type": "array",
       "items": {
@@ -54,25 +59,46 @@
       "description": "Enables debugging mode for tests, allowing the use of the Node Inspector.",
       "default": false
     },
-    "codeCoverage": {
+    "coverage": {
       "type": "boolean",
-      "description": "Enables code coverage reporting for tests.",
+      "description": "Enables coverage reporting for tests.",
       "default": false
     },
-    "codeCoverageExclude": {
+    "coverageAll": {
+      "type": "boolean",
+      "description": "Includes all files that match the `coverageInclude` pattern in the coverage report, not just those touched by tests.",
+      "default": true
+    },
+    "coverageInclude": {
       "type": "array",
-      "description": "Specifies glob patterns of files to exclude from the code coverage report.",
+      "description": "Specifies glob patterns of files to include in the coverage report.",
       "items": {
         "type": "string"
       }
     },
-    "codeCoverageReporters": {
+    "coverageExclude": {
       "type": "array",
-      "description": "Specifies the reporters to use for code coverage results. Each reporter can be a string representing its name, or a tuple containing the name and an options object. Built-in reporters include 'html', 'lcov', 'lcovonly', 'text', 'text-summary', 'cobertura', 'json', and 'json-summary'.",
+      "description": "Specifies glob patterns of files to exclude from the coverage report.",
+      "items": {
+        "type": "string"
+      }
+    },
+    "coverageReporters": {
+      "type": "array",
+      "description": "Specifies the reporters to use for coverage results. Each reporter can be a string representing its name, or a tuple containing the name and an options object. Built-in reporters include 'html', 'lcov', 'lcovonly', 'text', 'text-summary', 'cobertura', 'json', and 'json-summary'.",
       "items": {
         "oneOf": [
           {
-            "$ref": "#/definitions/coverage-reporters"
+            "enum": [
+              "html",
+              "lcov",
+              "lcovonly",
+              "text",
+              "text-summary",
+              "cobertura",
+              "json",
+              "json-summary"
+            ]
           },
           {
             "type": "array",
@@ -80,7 +106,16 @@
             "maxItems": 2,
             "items": [
               {
-                "$ref": "#/definitions/coverage-reporters"
+                "enum": [
+                  "html",
+                  "lcov",
+                  "lcovonly",
+                  "text",
+                  "text-summary",
+                  "cobertura",
+                  "json",
+                  "json-summary"
+                ]
               },
               {
                 "type": "object"
@@ -90,6 +125,68 @@
         ]
       }
     },
+    "coverageThresholds": {
+      "type": "object",
+      "description": "Specifies minimum coverage thresholds that must be met. If thresholds are not met, the builder will exit with an error.",
+      "properties": {
+        "perFile": {
+          "type": "boolean",
+          "description": "When true, thresholds are enforced for each file individually."
+        },
+        "statements": {
+          "type": "number",
+          "description": "Minimum percentage of statements covered."
+        },
+        "branches": {
+          "type": "number",
+          "description": "Minimum percentage of branches covered."
+        },
+        "functions": {
+          "type": "number",
+          "description": "Minimum percentage of functions covered."
+        },
+        "lines": {
+          "type": "number",
+          "description": "Minimum percentage of lines covered."
+        }
+      },
+      "additionalProperties": false
+    },
+    "coverageWatermarks": {
+      "type": "object",
+      "description": "Specifies coverage watermarks for the HTML reporter. These determine the color coding for high, medium, and low coverage.",
+      "properties": {
+        "statements": {
+          "type": "array",
+          "description": "The high and low watermarks for statements coverage. `[low, high]`",
+          "items": { "type": "number" },
+          "minItems": 2,
+          "maxItems": 2
+        },
+        "branches": {
+          "type": "array",
+          "description": "The high and low watermarks for branches coverage. `[low, high]`",
+          "items": { "type": "number" },
+          "minItems": 2,
+          "maxItems": 2
+        },
+        "functions": {
+          "type": "array",
+          "description": "The high and low watermarks for functions coverage. `[low, high]`",
+          "items": { "type": "number" },
+          "minItems": 2,
+          "maxItems": 2
+        },
+        "lines": {
+          "type": "array",
+          "description": "The high and low watermarks for lines coverage. `[low, high]`",
+          "items": { "type": "number" },
+          "minItems": 2,
+          "maxItems": 2
+        }
+      },
+      "additionalProperties": false
+    },
     "reporters": {
       "type": "array",
       "description": "Specifies the reporters to use during test execution. Each reporter can be a string representing its name, or a tuple containing the name and an options object. Built-in reporters include 'default', 'verbose', 'dots', 'json', 'junit', 'tap', 'tap-flat', and 'html'. You can also provide a path to a custom reporter.",
@@ -98,10 +195,10 @@
           {
             "anyOf": [
               {
-                "$ref": "#/definitions/reporters-enum"
+                "type": "string"
               },
               {
-                "type": "string"
+                "enum": ["default", "verbose", "dots", "json", "junit", "tap", "tap-flat", "html"]
               }
             ]
           },
@@ -113,10 +210,19 @@
               {
                 "anyOf": [
                   {
-                    "$ref": "#/definitions/reporters-enum"
+                    "type": "string"
                   },
                   {
-                    "type": "string"
+                    "enum": [
+                      "default",
+                      "verbose",
+                      "dots",
+                      "json",
+                      "junit",
+                      "tap",
+                      "tap-flat",
+                      "html"
+                    ]
                   }
                 ]
               },
@@ -161,23 +267,5 @@
     }
   },
   "additionalProperties": false,
-  "required": ["buildTarget", "tsConfig", "runner"],
-  "definitions": {
-    "coverage-reporters": {
-      "enum": [
-        "html",
-        "lcov",
-        "lcovonly",
-        "text",
-        "text-summary",
-        "cobertura",
-        "json",
-        "json-summary"
-      ]
-    },
-    "reporters-enum": {
-      "type": "string",
-      "enum": ["default", "verbose", "dots", "json", "junit", "tap", "tap-flat", "html"]
-    }
-  }
+  "required": ["runner"]
 }

package/src/builders/unit-test/test-discovery.js

@@ -48,6 +48,7 @@ async function findTests(include, exclude, workspaceRoot, projectSourceRoot) {
         const globMatches = await (0, tinyglobby_1.glob)(dynamicPatterns, {
             cwd: projectSourceRoot,
             absolute: true,
+            expandDirectories: false,
             ignore: ['**/node_modules/**', ...normalizedExcludes],
         });
         for (const match of globMatches) {

package/src/tools/babel/plugins/pure-toplevel-functions.d.ts

@@ -8,7 +8,6 @@
 import type { PluginObj } from '@babel/core';
 /**
  * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
- *
  * @returns A babel plugin object instance.
  */
 export default function (): PluginObj;

package/src/tools/babel/plugins/pure-toplevel-functions.js

@@ -47,7 +47,11 @@ exports.default = default_1;
 const helper_annotate_as_pure_1 = __importDefault(require("@babel/helper-annotate-as-pure"));
 const tslib = __importStar(require("tslib"));
 /**
- * A cached set of TypeScript helper function names used by the helper name matcher utility function.
+ * A set of constructor names that are considered to be side-effect free.
+ */
+const sideEffectFreeConstructors = new Set(['InjectionToken']);
+/**
+ * A set of TypeScript helper function names used by the helper name matcher utility function.
  */
 const tslibHelpers = new Set(Object.keys(tslib).filter((h) => h.startsWith('__')));
 /**
@@ -76,13 +80,16 @@ function isBabelHelperName(name) {
 }
 /**
  * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
- *
  * @returns A babel plugin object instance.
  */
 function default_1() {
     return {
         visitor: {
-            CallExpression(path) {
+            CallExpression(path, state) {
+                const { topLevelSafeMode = false } = state.opts;
+                if (topLevelSafeMode) {
+                    return;
+                }
                 // If the expression has a function parent, it is not top-level
                 if (path.getFunctionParent()) {
                     return;
@@ -100,9 +107,18 @@ function default_1() {
                 }
                 (0, helper_annotate_as_pure_1.default)(path);
             },
-            NewExpression(path) {
+            NewExpression(path, state) {
                 // If the expression has a function parent, it is not top-level
-                if (!path.getFunctionParent()) {
+                if (path.getFunctionParent()) {
+                    return;
+                }
+                const { topLevelSafeMode = false } = state.opts;
+                if (!topLevelSafeMode) {
+                    (0, helper_annotate_as_pure_1.default)(path);
+                    return;
+                }
+                const callee = path.get('callee');
+                if (callee.isIdentifier() && sideEffectFreeConstructors.has(callee.node.name)) {
                     (0, helper_annotate_as_pure_1.default)(path);
                 }
             },

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPlugin = createCompilerPlugin;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
+const promises_1 = require("node:fs/promises");
 const path = __importStar(require("node:path"));
 const environment_options_1 = require("../../../utils/environment-options");
 const compilation_1 = require("../../angular/compilation");
@@ -344,11 +345,21 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                     if (!shouldTsIgnoreJs && isJS) {
                         return undefined;
                     }
+                    const diangosticRoot = build.initialOptions.absWorkingDir ?? '';
+                    // Evaluate whether the file requires the Angular compiler transpilation.
+                    // If not, issue a warning but allow bundler to process the file (no type-checking).
+                    const directContents = await (0, promises_1.readFile)(request, 'utf-8');
+                    if (!requiresAngularCompiler(directContents)) {
+                        return {
+                            warnings: [createMissingFileDiagnostic(request, args.path, diangosticRoot, false)],
+                            contents,
+                            loader: 'ts',
+                            resolveDir: path.dirname(request),
+                        };
+                    }
                     // Otherwise return an error
                     return {
-                        errors: [
-                            createMissingFileError(request, args.path, build.initialOptions.absWorkingDir ?? ''),
-                        ],
+                        errors: [createMissingFileDiagnostic(request, args.path, diangosticRoot, true)],
                     };
                 }
                 else if (typeof contents === 'string' && (useTypeScriptTranspilation || isJS)) {
@@ -585,21 +596,34 @@ function bundleWebWorker(build, pluginOptions, workerFile) {
         throw error;
     }
 }
-function createMissingFileError(request, original, root) {
+function createMissingFileDiagnostic(request, original, root, angular) {
     const relativeRequest = path.relative(root, request);
-    const error = {
-        text: `File '${relativeRequest}' is missing from the TypeScript compilation.`,
-        notes: [
-            {
-                text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
-            },
-        ],
-    };
+    const notes = [];
+    if (angular) {
+        notes.push({
+            text: `Files containing Angular metadata ('@Component'/'@Directive'/etc.) must be part of the TypeScript compilation.` +
+                ` You can ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
+        });
+    }
+    else {
+        notes.push({
+            text: `The file will be bundled and included in the output but will not be type-checked at build time.` +
+                ` To remove this message you can add the file to the TypeScript program via the 'files' or 'include' property.`,
+        });
+    }
     const relativeOriginal = path.relative(root, original);
     if (relativeRequest !== relativeOriginal) {
-        error.notes.push({
+        notes.push({
             text: `File is requested from a file replacement of '${relativeOriginal}'.`,
         });
     }
-    return error;
+    const diagnostic = {
+        text: `File '${relativeRequest}' not found in TypeScript compilation.`,
+        notes,
+    };
+    return diagnostic;
+}
+const POTENTIAL_METADATA_REGEX = /@angular\/core|@Component|@Directive|@Injectable|@Pipe|@NgModule/;
+function requiresAngularCompiler(contents) {
+    return POTENTIAL_METADATA_REGEX.test(contents);
 }

package/src/tools/esbuild/javascript-transformer-worker.js

@@ -84,16 +84,10 @@ async function transformWithBabel(filename, data, options) {
         plugins.push(linkerPlugin);
     }
     if (options.advancedOptimizations) {
+        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure } = await Promise.resolve().then(() => __importStar(require('../babel/plugins')));
         const sideEffectFree = options.sideEffects === false;
         const safeAngularPackage = sideEffectFree && /[\\/]node_modules[\\/]@angular[\\/]/.test(filename);
-        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure } = await Promise.resolve().then(() => __importStar(require('../babel/plugins')));
-        if (safeAngularPackage) {
-            plugins.push(markTopLevelPure);
-        }
-        plugins.push(elideAngularMetadata, adjustTypeScriptEnums, [
-            adjustStaticMembers,
-            { wrapDecorators: sideEffectFree },
-        ]);
+        plugins.push([markTopLevelPure, { topLevelSafeMode: !safeAngularPackage }], elideAngularMetadata, adjustTypeScriptEnums, [adjustStaticMembers, { wrapDecorators: sideEffectFree }]);
     }
     // If no additional transformations are needed, return the data directly
     if (plugins.length === 0) {

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

package/src/utils/server-rendering/utils.d.ts

@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { createRequestHandler } from '@angular/ssr';
-import type { createNodeRequestHandler } from '@angular/ssr/node';
+import type { createNodeRequestHandler } from '@angular/ssr/node' with { 'resolution-mode': 'import' };
 export declare function isSsrNodeRequestHandler(value: unknown): value is ReturnType<typeof createNodeRequestHandler>;
 export declare function isSsrRequestHandler(value: unknown): value is ReturnType<typeof createRequestHandler>;

package/src/utils/service-worker.d.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import type { Config, Filesystem } from '@angular/service-worker/config';
+import type { Config, Filesystem } from '@angular/service-worker/config' with { 'resolution-mode': 'import' };
 import { promises as fsPromises } from 'node:fs';
 import { BuildOutputFile } from '../tools/esbuild/bundler-context';
 import { BuildOutputAsset } from '../tools/esbuild/bundler-execution-result';