@angular/build 21.0.0-next.0 → 21.0.0-next.10

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

@@ -39,8 +39,13 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KarmaExecutor = void 0;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
 class KarmaExecutor {
     context;
     options;
@@ -50,15 +55,38 @@ 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?.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)));
+        let karmaConfig;
+        if (typeof unitTestOptions.runnerConfig === 'string') {
+            karmaConfig = unitTestOptions.runnerConfig;
+            context.logger.info(`Using Karma configuration file: ${karmaConfig}`);
+        }
+        else if (unitTestOptions.runnerConfig) {
+            const potentialPath = node_path_1.default.join(unitTestOptions.projectRoot, 'karma.conf.js');
+            try {
+                await promises_1.default.access(potentialPath);
+                karmaConfig = potentialPath;
+                context.logger.info(`Using Karma configuration file: ${karmaConfig}`);
+            }
+            catch {
+                context.logger.info('No Karma configuration file found. Using default configuration.');
+            }
+        }
         const karmaOptions = {
-            tsConfig: unitTestOptions.tsConfig,
+            karmaConfig,
+            tsConfig: unitTestOptions.tsConfig ?? buildTargetOptions.tsConfig,
             polyfills: buildTargetOptions.polyfills,
             assets: buildTargetOptions.assets,
             scripts: buildTargetOptions.scripts,
@@ -76,18 +104,57 @@ class KarmaExecutor {
             poll: buildTargetOptions.poll,
             preserveSymlinks: buildTargetOptions.preserveSymlinks,
             browsers: unitTestOptions.browsers?.join(','),
-            codeCoverage: !!unitTestOptions.codeCoverage,
-            codeCoverageExclude: unitTestOptions.codeCoverage?.exclude,
+            codeCoverage: unitTestOptions.coverage.enabled,
+            codeCoverageExclude: unitTestOptions.coverage.exclude,
             fileReplacements: buildTargetOptions.fileReplacements,
-            reporters: unitTestOptions.reporters,
+            reporters: unitTestOptions.reporters?.map((reporter) => {
+                // Karma only supports string reporters.
+                if (Object.keys(reporter[1]).length > 0) {
+                    context.logger.warn(`The "karma" test runner does not support options for the "${reporter[0]}" reporter. The options will be ignored.`);
+                }
+                return reporter[0];
+            }),
             webWorkerTsConfig: buildTargetOptions.webWorkerTsConfig,
             aot: buildTargetOptions.aot,
         };
+        const transformOptions = {
+            karmaOptions: (options) => {
+                if (unitTestOptions.filter) {
+                    let filter = unitTestOptions.filter;
+                    if (filter[0] === '/' && filter.at(-1) === '/') {
+                        this.context.logger.warn('The `--filter` option is always a regular expression.' +
+                            'Leading and trailing `/` are not required and will be ignored.');
+                    }
+                    else {
+                        filter = `/${filter}/`;
+                    }
+                    options.client ??= {};
+                    options.client.args ??= [];
+                    options.client.args.push('--grep', filter);
+                }
+                // Add coverage options
+                if (unitTestOptions.coverage.enabled) {
+                    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;
+            },
+        };
         const { execute } = await Promise.resolve().then(() => __importStar(require('../../../karma')));
-        yield* execute(karmaOptions, context);
+        yield* execute(karmaOptions, context, transformOptions);
     }
     async [Symbol.asyncDispose]() {
         // The Karma builder handles its own teardown
     }
 }
 exports.KarmaExecutor = KarmaExecutor;
+//# sourceMappingURL=executor.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["executor.ts"],"names":[],"mappings":"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"}

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

@@ -7,6 +7,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const dependency_checker_1 = require("../dependency-checker");
 const executor_1 = require("./executor");
 /**
  * A declarative definition of the Karma test runner.
@@ -14,6 +15,22 @@ const executor_1 = require("./executor");
 const KarmaTestRunner = {
     name: 'karma',
     isStandalone: true,
+    validateDependencies(options) {
+        const checker = new dependency_checker_1.DependencyChecker(options.projectSourceRoot);
+        checker.check('karma');
+        checker.check('karma-jasmine');
+        // Check for browser launchers
+        if (options.browsers?.length) {
+            for (const browser of options.browsers) {
+                const launcherName = `karma-${browser.toLowerCase().split('headless')[0]}-launcher`;
+                checker.check(launcherName);
+            }
+        }
+        if (options.coverage) {
+            checker.check('karma-coverage');
+        }
+        checker.report();
+    },
     getBuildOptions() {
         return {
             buildOptions: {},
@@ -24,3 +41,4 @@ const KarmaTestRunner = {
     },
 };
 exports.default = KarmaTestRunner;
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAGH,8DAA0D;AAC1D,yCAA2C;AAE3C;;GAEG;AACH,MAAM,eAAe,GAAe;IAClC,IAAI,EAAE,OAAO;IACb,YAAY,EAAE,IAAI;IAElB,oBAAoB,CAAC,OAAO;QAC1B,MAAM,OAAO,GAAG,IAAI,sCAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACjE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAE/B,8BAA8B;QAC9B,IAAI,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YAC7B,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACvC,MAAM,YAAY,GAAG,SAAS,OAAO,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;gBACpF,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAClC,CAAC;QAED,OAAO,CAAC,MAAM,EAAE,CAAC;IACnB,CAAC;IAED,eAAe;QACb,OAAO;YACL,YAAY,EAAE,EAAE;SACjB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO;QACnC,OAAO,IAAI,wBAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;CACF,CAAC;AAEF,kBAAe,eAAe,CAAC"}

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

@@ -5,7 +5,12 @@
  * 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 setupBrowserConfiguration(browsers: string[] | undefined, debug: boolean, projectSourceRoot: string): {
-    browser?: import('vitest/node').BrowserConfigOptions;
+import type { BrowserConfigOptions } from 'vitest/node';
+export interface BrowserConfiguration {
+    browser?: BrowserConfigOptions;
     errors?: string[];
-};
+}
+export declare function setupBrowserConfiguration(browsers: string[] | undefined, debug: boolean, projectSourceRoot: string, viewport: {
+    width: number;
+    height: number;
+} | undefined): Promise<BrowserConfiguration>;

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

@@ -6,9 +6,43 @@
  * 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;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupBrowserConfiguration = setupBrowserConfiguration;
 const node_module_1 = require("node:module");
+const error_1 = require("../../../../utils/error");
 function findBrowserProvider(projectResolver) {
     // One of these must be installed in the project to use browser testing
     const vitestBuiltinProviders = ['playwright', 'webdriverio'];
@@ -28,42 +62,62 @@ function normalizeBrowserName(browserName) {
     const normalized = browserName.toLowerCase();
     return normalized.replace(/headless$/, '');
 }
-function setupBrowserConfiguration(browsers, debug, projectSourceRoot) {
+async function setupBrowserConfiguration(browsers, debug, projectSourceRoot, viewport) {
     if (browsers === undefined) {
         return {};
     }
     const projectResolver = (0, node_module_1.createRequire)(projectSourceRoot + '/').resolve;
     let errors;
-    try {
-        projectResolver('@vitest/browser');
-    }
-    catch {
-        errors ??= [];
-        errors.push('The "browsers" option requires the "@vitest/browser" package to be installed within the project.' +
-            ' Please install this package and rerun the test command.');
-    }
-    const provider = findBrowserProvider(projectResolver);
-    if (!provider) {
+    const providerName = findBrowserProvider(projectResolver);
+    if (!providerName) {
         errors ??= [];
         errors.push('The "browsers" option requires either "playwright" or "webdriverio" to be installed within the project.' +
             ' Please install one of these packages and rerun the test command.');
     }
-    // Vitest current requires the playwright browser provider to use the inspect-brk option used by "debug"
-    if (debug && provider !== 'playwright') {
-        errors ??= [];
-        errors.push('Debugging browser mode tests currently requires the use of "playwright".' +
-            ' Please install this package and rerun the test command.');
+    let provider;
+    if (providerName) {
+        const providerPackage = `@vitest/browser-${providerName}`;
+        try {
+            const providerModule = await Promise.resolve(`${projectResolver(providerPackage)}`).then(s => __importStar(require(s)));
+            // Validate that the imported module has the expected structure
+            const providerFactory = providerModule[providerName];
+            if (typeof providerFactory === 'function') {
+                provider = providerFactory();
+            }
+            else {
+                errors ??= [];
+                errors.push(`The "${providerPackage}" package does not have a valid browser provider export.`);
+            }
+        }
+        catch (e) {
+            (0, error_1.assertIsError)(e);
+            errors ??= [];
+            // Check for a module not found error to provide a more specific message
+            if (e.code === 'ERR_MODULE_NOT_FOUND') {
+                errors.push(`The "browsers" option with "${providerName}" requires the "${providerPackage}" package.` +
+                    ' Please install this package and rerun the test command.');
+            }
+            else {
+                // Handle other potential errors during import
+                errors.push(`An error occurred while loading the "${providerPackage}" browser provider:\n  ${e.message}`);
+            }
+        }
     }
     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),
         })),
     };
     return { browser };
 }
+//# sourceMappingURL=browser-provider.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"browser-provider.js","sourceRoot":"","sources":["browser-provider.ts"],"names":[],"mappings":"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"}

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

@@ -16,7 +16,22 @@ 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) {
+/**
+ * A list of Angular related packages that should be marked as external.
+ * This allows Vite to pre-bundle them, improving performance.
+ */
+const ANGULAR_PACKAGES_TO_EXTERNALIZE = [
+    '@angular/core',
+    '@angular/common',
+    '@angular/platform-browser',
+    '@angular/compiler',
+    '@angular/router',
+    '@angular/forms',
+    '@angular/animations',
+    'rxjs',
+];
+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 +41,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 +49,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(), {
@@ -43,8 +58,18 @@ function createTestBedInitVirtualFile(providersFile, projectSourceRoot) {
     });
   `;
 }
+function adjustOutputHashing(hashing) {
+    switch (hashing) {
+        case schema_1.OutputHashing.All:
+        case schema_1.OutputHashing.Media:
+            // Ensure media is continued to be hashed to avoid overwriting of output media files
+            return schema_1.OutputHashing.Media;
+        default:
+            return schema_1.OutputHashing.None;
+    }
+}
 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) {
@@ -53,8 +78,21 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
             (exclude.length ? `- Excluded: ${exclude.join(', ')}\n` : '') +
             `\nPlease check the 'test' target configuration in your project's 'angular.json' file.`);
     }
-    const entryPoints = (0, test_discovery_1.getTestEntrypoints)(testFiles, { projectSourceRoot, workspaceRoot });
+    const entryPoints = (0, test_discovery_1.getTestEntrypoints)(testFiles, {
+        projectSourceRoot,
+        workspaceRoot,
+        removeTestExtension: true,
+    });
     entryPoints.set('init-testbed', 'angular:test-bed-init');
+    const externalDependencies = new Set(['vitest']);
+    if (!options.browsers?.length) {
+        // Only add for non-browser setups.
+        // Comprehensive browser prebundling will be handled separately.
+        ANGULAR_PACKAGES_TO_EXTERNALIZE.forEach((dep) => externalDependencies.add(dep));
+    }
+    if (baseBuildOptions.externalDependencies) {
+        baseBuildOptions.externalDependencies.forEach((dep) => externalDependencies.add(dep));
+    }
     const buildOptions = {
         ...baseBuildOptions,
         watch,
@@ -70,18 +108,19 @@ async function getVitestBuildOptions(options, baseBuildOptions) {
         ssr: false,
         prerender: false,
         sourceMap: { scripts: true, vendor: false, styles: false },
-        outputHashing: schema_1.OutputHashing.None,
+        outputHashing: adjustOutputHashing(baseBuildOptions.outputHashing),
         optimization: false,
-        tsConfig,
         entryPoints,
-        externalDependencies: ['vitest', '@vitest/browser/context'],
+        externalDependencies: [...externalDependencies],
     };
     buildOptions.polyfills = (0, options_1.injectTestingPolyfills)(buildOptions.polyfills);
-    const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot);
+    const testBedInitContents = createTestBedInitVirtualFile(providersFile, projectSourceRoot, buildOptions.polyfills);
     return {
         buildOptions,
         virtualFiles: {
             'angular:test-bed-init': testBedInitContents,
         },
+        testEntryPointMappings: entryPoints,
     };
 }
+//# sourceMappingURL=build-options.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"build-options.js","sourceRoot":"","sources":["build-options.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,15 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+/**
+ * Finds the Vitest configuration file in the given search directories.
+ *
+ * @param searchDirs An array of directories to search for the configuration file.
+ * @returns The path to the configuration file, or `false` if no file is found.
+ * Returning `false` is used to disable Vitest's default configuration file search.
+ */
+export declare function findVitestBaseConfig(searchDirs: string[]): Promise<string | false>;

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

@@ -0,0 +1,57 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findVitestBaseConfig = findVitestBaseConfig;
+/**
+ * @fileoverview
+ * This file contains utility functions for finding the Vitest base configuration file.
+ */
+const promises_1 = require("node:fs/promises");
+const node_path_1 = __importDefault(require("node:path"));
+/**
+ * A list of potential Vitest configuration filenames.
+ * The order of the files is important as the first one found will be used.
+ */
+const POTENTIAL_CONFIGS = [
+    'vitest-base.config.ts',
+    'vitest-base.config.mts',
+    'vitest-base.config.cts',
+    'vitest-base.config.js',
+    'vitest-base.config.mjs',
+    'vitest-base.config.cjs',
+];
+/**
+ * Finds the Vitest configuration file in the given search directories.
+ *
+ * @param searchDirs An array of directories to search for the configuration file.
+ * @returns The path to the configuration file, or `false` if no file is found.
+ * Returning `false` is used to disable Vitest's default configuration file search.
+ */
+async function findVitestBaseConfig(searchDirs) {
+    const uniqueDirs = new Set(searchDirs);
+    for (const dir of uniqueDirs) {
+        try {
+            const entries = await (0, promises_1.readdir)(dir, { withFileTypes: true });
+            const files = new Set(entries.filter((e) => e.isFile()).map((e) => e.name));
+            for (const potential of POTENTIAL_CONFIGS) {
+                if (files.has(potential)) {
+                    return node_path_1.default.join(dir, potential);
+                }
+            }
+        }
+        catch {
+            // Ignore directories that cannot be read
+        }
+    }
+    return false;
+}
+//# sourceMappingURL=configuration.js.map

package/src/builders/unit-test/runners/vitest/configuration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"configuration.js","sourceRoot":"","sources":["configuration.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;AA8BH,oDAkBC;AA9CD;;;GAGG;AAEH,+CAA2C;AAC3C,0DAA6B;AAE7B;;;GAGG;AACH,MAAM,iBAAiB,GAAG;IACxB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;IACxB,uBAAuB;IACvB,wBAAwB;IACxB,wBAAwB;CACzB,CAAC;AAEF;;;;;;GAMG;AACI,KAAK,UAAU,oBAAoB,CAAC,UAAoB;IAC7D,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,KAAK,MAAM,GAAG,IAAI,UAAU,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAA,kBAAO,EAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAE5E,KAAK,MAAM,SAAS,IAAI,iBAAiB,EAAE,CAAC;gBAC1C,IAAI,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;oBACzB,OAAO,mBAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

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

@@ -6,17 +6,20 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { BuilderOutput } from '@angular-devkit/architect';
-import type { FullResult, IncrementalResult } from '../../../application/results';
+import { type FullResult, type IncrementalResult } from '../../../application/results';
 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 outputPath;
-    private latestBuildResult;
-    constructor(projectName: string, options: NormalizedUnitTestBuilderOptions);
+    private readonly buildResultFiles;
+    private readonly testFileToEntryPoint;
+    private readonly entryPointToTestFile;
+    constructor(projectName: string, options: NormalizedUnitTestBuilderOptions, testEntryPointMappings: Map<string, string> | undefined);
     execute(buildResult: FullResult | IncrementalResult): AsyncIterable<BuilderOutput>;
     [Symbol.asyncDispose](): Promise<void>;
+    private prepareSetupFiles;
     private initializeVitest;
 }