@angular/build 21.0.0-next.4 → 21.0.0-next.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/build",
-  "version": "21.0.0-next.4",
+  "version": "21.0.0-next.6",
   "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.4",
+    "@angular-devkit/architect": "0.2100.0-next.6",
     "@babel/core": "7.28.4",
     "@babel/helper-annotate-as-pure": "7.27.3",
     "@babel/helper-split-export-declaration": "7.24.7",
@@ -31,7 +31,7 @@
     "@vitejs/plugin-basic-ssl": "2.1.0",
     "beasties": "0.3.5",
     "browserslist": "^4.26.0",
-    "esbuild": "0.25.9",
+    "esbuild": "0.25.10",
     "https-proxy-agent": "7.0.6",
     "istanbul-lib-instrument": "6.0.3",
     "jsonc-parser": "3.3.1",
@@ -41,12 +41,12 @@
     "parse5-html-rewriting-stream": "8.0.0",
     "picomatch": "4.0.3",
     "piscina": "5.1.3",
-    "rolldown": "1.0.0-beta.38",
-    "sass": "1.92.1",
+    "rolldown": "1.0.0-beta.41",
+    "sass": "1.93.2",
     "semver": "7.7.2",
     "source-map-support": "0.5.21",
     "tinyglobby": "0.2.15",
-    "vite": "7.1.5",
+    "vite": "7.1.7",
     "watchpack": "2.4.4"
   },
   "optionalDependencies": {
@@ -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.4",
+    "@angular/ssr": "^21.0.0-next.6",
     "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.0",
+  "packageManager": "pnpm@10.17.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

@@ -155,14 +155,18 @@ async function setupBuildOptions(options, context, projectSourceRoot, outputPath
     return { buildOptions, mainName };
 }
 async function runEsbuild(buildOptions, context, projectSourceRoot) {
+    const usesZoneJS = buildOptions.polyfills?.includes('zone.js');
     const virtualTestBedInit = (0, virtual_module_plugin_1.createVirtualModulePlugin)({
         namespace: 'angular:test-bed-init',
         loadContent: async () => {
             const contents = [
                 // Initialize the Angular testing environment
+                `import { NgModule${usesZoneJS ? ', provideZoneChangeDetection' : ''} } from '@angular/core';`,
                 `import { getTestBed } from '@angular/core/testing';`,
                 `import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';`,
-                `getTestBed().initTestEnvironment(BrowserTestingModule, platformBrowserTesting(), {`,
+                `@NgModule({ providers: [${usesZoneJS ? 'provideZoneChangeDetection(), ' : ''}], })`,
+                `export class TestModule {}`,
+                `getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), {`,
                 `  errorOnUnknownElements: true,`,
                 `  errorOnUnknownProperties: true,`,
                 `});`,

package/src/builders/karma/coverage.js

@@ -17,7 +17,7 @@ const tinyglobby_1 = require("tinyglobby");
 function createInstrumentationFilter(includedBasePath, excludedPaths) {
     return (request) => {
         return (!excludedPaths.has(request) &&
-            !/\.(e2e|spec)\.tsx?$|[\\/]node_modules[\\/]/.test(request) &&
+            !/\.(e2e|spec)\.tsx?$|[\\/]node_modules[\\/]|[\\/]\.angular[\\/]/.test(request) &&
             request.startsWith(includedBasePath));
     };
 }

package/src/builders/karma/find-tests.d.ts

@@ -5,12 +5,4 @@
  * 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
  */
-export declare function findTests(include: string[], exclude: string[], workspaceRoot: string, projectSourceRoot: string): Promise<string[]>;
-interface TestEntrypointsOptions {
-    projectSourceRoot: string;
-    workspaceRoot: string;
-    removeTestExtension?: boolean;
-}
-/** Generate unique bundle names for a set of test files. */
-export declare function getTestEntrypoints(testFiles: string[], { projectSourceRoot, workspaceRoot, removeTestExtension }: TestEntrypointsOptions): Map<string, string>;
-export {};
+export { findTests, getTestEntrypoints } from '../unit-test/test-discovery';

package/src/builders/karma/find-tests.js

@@ -7,109 +7,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTests = findTests;
-exports.getTestEntrypoints = getTestEntrypoints;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const tinyglobby_1 = require("tinyglobby");
-const path_1 = require("../../utils/path");
-/* Go through all patterns and find unique list of files */
-async function findTests(include, exclude, workspaceRoot, projectSourceRoot) {
-    const matchingTestsPromises = include.map((pattern) => findMatchingTests(pattern, exclude, workspaceRoot, projectSourceRoot));
-    const files = await Promise.all(matchingTestsPromises);
-    // Unique file names
-    return [...new Set(files.flat())];
-}
-/** Generate unique bundle names for a set of test files. */
-function getTestEntrypoints(testFiles, { projectSourceRoot, workspaceRoot, removeTestExtension }) {
-    const seen = new Set();
-    return new Map(Array.from(testFiles, (testFile) => {
-        const relativePath = removeRoots(testFile, [projectSourceRoot, workspaceRoot])
-            // Strip leading dots and path separators.
-            .replace(/^[./\\]+/, '')
-            // Replace any path separators with dashes.
-            .replace(/[/\\]/g, '-');
-        let fileName = (0, node_path_1.basename)(relativePath, (0, node_path_1.extname)(relativePath));
-        if (removeTestExtension) {
-            fileName = fileName.replace(/\.(spec|test)$/, '');
-        }
-        const baseName = `spec-${fileName}`;
-        let uniqueName = baseName;
-        let suffix = 2;
-        while (seen.has(uniqueName)) {
-            uniqueName = `${baseName}-${suffix}`.replace(/([^\w](?:spec|test))-([\d]+)$/, '-$2$1');
-            ++suffix;
-        }
-        seen.add(uniqueName);
-        return [uniqueName, testFile];
-    }));
-}
-const removeLeadingSlash = (pattern) => {
-    if (pattern.charAt(0) === '/') {
-        return pattern.substring(1);
-    }
-    return pattern;
-};
-const removeRelativeRoot = (path, root) => {
-    if (path.startsWith(root)) {
-        return path.substring(root.length);
-    }
-    return path;
-};
-function removeRoots(path, roots) {
-    for (const root of roots) {
-        if (path.startsWith(root)) {
-            return path.substring(root.length);
-        }
-    }
-    return (0, node_path_1.basename)(path);
-}
-async function findMatchingTests(pattern, ignore, workspaceRoot, projectSourceRoot) {
-    // normalize pattern, glob lib only accepts forward slashes
-    let normalizedPattern = (0, path_1.toPosixPath)(pattern);
-    normalizedPattern = removeLeadingSlash(normalizedPattern);
-    const relativeProjectRoot = (0, path_1.toPosixPath)((0, node_path_1.relative)(workspaceRoot, projectSourceRoot) + '/');
-    // remove relativeProjectRoot to support relative paths from root
-    // such paths are easy to get when running scripts via IDEs
-    normalizedPattern = removeRelativeRoot(normalizedPattern, relativeProjectRoot);
-    // special logic when pattern does not look like a glob
-    if (!(0, tinyglobby_1.isDynamicPattern)(normalizedPattern)) {
-        if (await isDirectory((0, node_path_1.join)(projectSourceRoot, normalizedPattern))) {
-            normalizedPattern = `${normalizedPattern}/**/*.spec.@(ts|tsx)`;
-        }
-        else {
-            // see if matching spec file exists
-            const fileExt = (0, node_path_1.extname)(normalizedPattern);
-            // Replace extension to `.spec.ext`. Example: `src/app/app.component.ts`-> `src/app/app.component.spec.ts`
-            const potentialSpec = (0, node_path_1.join)(projectSourceRoot, (0, node_path_1.dirname)(normalizedPattern), `${(0, node_path_1.basename)(normalizedPattern, fileExt)}.spec${fileExt}`);
-            if (await exists(potentialSpec)) {
-                return [potentialSpec];
-            }
-        }
-    }
-    // normalize the patterns in the ignore list
-    const normalizedIgnorePatternList = ignore.map((pattern) => removeRelativeRoot(removeLeadingSlash((0, path_1.toPosixPath)(pattern)), relativeProjectRoot));
-    return (0, tinyglobby_1.glob)(normalizedPattern, {
-        cwd: projectSourceRoot,
-        absolute: true,
-        ignore: ['**/node_modules/**', ...normalizedIgnorePatternList],
-    });
-}
-async function isDirectory(path) {
-    try {
-        const stats = await node_fs_1.promises.stat(path);
-        return stats.isDirectory();
-    }
-    catch {
-        return false;
-    }
-}
-async function exists(path) {
-    try {
-        await node_fs_1.promises.access(path, node_fs_1.constants.F_OK);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
+exports.getTestEntrypoints = exports.findTests = void 0;
+// This file is a compatibility layer that re-exports the test discovery logic from its new location.
+// This is necessary to avoid breaking the Karma builder, which still depends on this file.
+var test_discovery_1 = require("../unit-test/test-discovery");
+Object.defineProperty(exports, "findTests", { enumerable: true, get: function () { return test_discovery_1.findTests; } });
+Object.defineProperty(exports, "getTestEntrypoints", { enumerable: true, get: function () { return test_discovery_1.getTestEntrypoints; } });

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

@@ -107,6 +107,7 @@ const application_1 = require("../application");
 const results_1 = require("../application/results");
 const options_1 = require("./options");
 const dependency_checker_1 = require("./runners/dependency-checker");
+const test_discovery_1 = require("./test-discovery");
 async function loadTestRunner(runnerName) {
     // Harden against directory traversal
     if (!/^[a-zA-Z0-9-]+$/.test(runnerName)) {
@@ -226,6 +227,15 @@ async function* execute(options, context, extensions) {
         yield { success: false };
         return;
     }
+    if (normalizedOptions.listTests) {
+        const testFiles = await (0, test_discovery_1.findTests)(normalizedOptions.include, normalizedOptions.exclude ?? [], normalizedOptions.workspaceRoot, normalizedOptions.projectSourceRoot);
+        context.logger.info('Discovered test files:');
+        for (const file of testFiles) {
+            context.logger.info(`  ${node_path_1.default.relative(normalizedOptions.workspaceRoot, file)}`);
+        }
+        yield { success: true };
+        return;
+    }
     if (runner.isStandalone) {
         try {
             const env_1 = { stack: [], error: void 0, hasError: false };
@@ -256,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);
@@ -293,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,19 +18,33 @@ 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;
     setupFiles: string[];
     dumpVirtualFiles: boolean | undefined;
+    listTests: boolean | undefined;
 }>;
 export declare function injectTestingPolyfills(polyfills?: string[]): string[];

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),
@@ -64,6 +96,7 @@ async function normalizeOptions(context, projectName, options) {
             ? options.setupFiles.map((setupFile) => node_path_1.default.join(workspaceRoot, setupFile))
             : [],
         dumpVirtualFiles: options.dumpVirtualFiles,
+        listTests: options.listTests,
     };
 }
 function injectTestingPolyfills(polyfills = []) {

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

@@ -16,7 +16,8 @@ const path_1 = require("../../../../utils/path");
 const schema_1 = require("../../../application/schema");
 const options_1 = require("../../options");
 const test_discovery_1 = require("../../test-discovery");
-function createTestBedInitVirtualFile(providersFile, projectSourceRoot) {
+function createTestBedInitVirtualFile(providersFile, projectSourceRoot, polyfills = []) {
+    const usesZoneJS = polyfills.includes('zone.js');
     let providersImport = 'const providers = [];';
     if (providersFile) {
         const relativePath = node_path_1.default.relative(projectSourceRoot, providersFile);
@@ -26,7 +27,7 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot) {
     }
     return `
     // Initialize the Angular testing environment
-    import { NgModule } from '@angular/core';
+    import { NgModule${usesZoneJS ? ', provideZoneChangeDetection' : ''} } from '@angular/core';
     import { getTestBed, ɵgetCleanupHook as getCleanupHook } from '@angular/core/testing';
     import { BrowserTestingModule, platformBrowserTesting } from '@angular/platform-browser/testing';
     ${providersImport}
@@ -34,7 +35,7 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot) {
     beforeEach(getCleanupHook(false));
     afterEach(getCleanupHook(true));
     @NgModule({
-      providers,
+      providers: [${usesZoneJS ? 'provideZoneChangeDetection(), ' : ''}...providers],
     })
     export class TestModule {}
     getTestBed().initTestEnvironment([BrowserTestingModule, TestModule], platformBrowserTesting(), {
@@ -54,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) {
@@ -86,12 +87,11 @@ 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'],
     };
     buildOptions.polyfills = (0, options_1.injectTestingPolyfills)(buildOptions.polyfills);
-    const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot);
+    const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot, buildOptions.polyfills);
     return {
         buildOptions,
         virtualFiles: {

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

@@ -101,7 +101,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 +115,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 +148,7 @@ class VitestExecutor {
             reporters: reporters ?? ['default'],
             outputFile,
             watch,
-            coverage: generateCoverageOption(codeCoverage),
+            coverage: await generateCoverageOption(coverage, this.projectName),
             ...debugOptions,
         }, {
             server: {
@@ -161,19 +161,41 @@ class VitestExecutor {
     }
 }
 exports.VitestExecutor = VitestExecutor;
-function generateCoverageOption(codeCoverage) {
-    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();