Commit abf0032

committed

fix(@angular/build): correct Vitest builder watch mode execution

The experimental Vitest-based unit test builder did not always correctly re-run tests in watch mode. This commit refactors the Vitest executor to provide more accurate watch mode behavior by: - Disabling Vitest's internal file watcher (`watch: null`) to make the Angular builder's watcher the single source of truth. - Triggering a test run via `vitest.rerunTestSpecifications()` within the `execute` method after each incremental build is complete.

1 parent 557f7c2 commit abf0032Copy full SHA for abf0032

File tree

1 file changed

+39

-5

lines changed

packages/angular/build/src/builders/unit-test/runners/vitest
- executor.ts

1 file changed

+39

-5

lines changed

`‎packages/angular/build/src/builders/unit-test/runners/vitest/executor.ts`

Lines changed: 39 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import type { InlineConfig, Vitest } from 'vitest/node';`
`15`	`15`	`import { assertIsError } from '../../../../utils/error';`
`16`	`16`	`import { loadEsmModule } from '../../../../utils/load-esm';`
`17`	`17`	`import { toPosixPath } from '../../../../utils/path';`
`18`		`-import type{FullResult, IncrementalResult } from '../../../application/results';`
	`18`	`+import {typeFullResult, typeIncrementalResult,ResultKind } from '../../../application/results';`
`19`	`19`	`import { writeTestFiles } from '../../../karma/application_builder';`
`20`	`20`	`import { NormalizedUnitTestBuilderOptions } from '../../options';`
`21`	`21`	`import type { TestExecutor } from '../api';`
`@@ -40,20 +40,49 @@ export class VitestExecutor implements TestExecutor {`
`40`	`40`	`await writeTestFiles(buildResult.files, this.outputPath);`
`41`	`41`
`42`	`42`	`this.latestBuildResult = buildResult;`
	`43`	`+`
	`44`	`+ // Initialize Vitest if not already present.`
`43`	`45`	`this.vitest ??= await this.initializeVitest();`
	`46`	`+ const vitest = this.vitest;`
	`47`	`+`
	`48`	`+ let testResults;`
	`49`	`+ if (buildResult.kind === ResultKind.Incremental) {`
	`50`	`+ const addedFiles = buildResult.added.map((file) => path.join(this.outputPath, file));`
	`51`	`+ const modifiedFiles = buildResult.modified.map((file) => path.join(this.outputPath, file));`
	`52`	`+`
	`53`	`+ if (addedFiles.length === 0 && modifiedFiles.length === 0) {`
	`54`	`+ yield { success: true };`
	`55`	`+`
	`56`	`+ return;`
	`57`	`+ }`
	`58`	`+`
	`59`	+ // If new files are added, use `start` to trigger test discovery.
	`60`	+ // Also pass modified files to `start` to ensure they are re-run.
	`61`	`+ if (addedFiles.length > 0) {`
	`62`	`+ await vitest.start([...addedFiles, ...modifiedFiles]);`
	`63`	`+ } else {`
	`64`	+ // For modified files only, use the more efficient `rerunTestSpecifications`
	`65`	`+ const specsToRerun = modifiedFiles.flatMap((file) => vitest.getModuleSpecifications(file));`
	`66`	`+`
	`67`	`+ if (specsToRerun.length > 0) {`
	`68`	`+ modifiedFiles.forEach((file) => vitest.invalidateFile(file));`
	`69`	`+ testResults = await vitest.rerunTestSpecifications(specsToRerun);`
	`70`	`+ }`
	`71`	`+ }`
	`72`	`+ }`
`44`	`73`
`45`	`74`	`// Check if all the tests pass to calculate the result`
`46`		`- const testModules = this.vitest.state.getTestModules();`
	`75`	`+ const testModules = testResults?.testModules;`
`47`	`76`
`48`		`- yield { success: testModules.every((testModule) => testModule.ok()) };`
	`77`	`+ yield { success: testModules?.every((testModule) => testModule.ok())??true };`
`49`	`78`	`}`
`50`	`79`
`51`	`80`	`async [Symbol.asyncDispose](): Promise<void> {`
`52`	`81`	`await this.vitest?.close();`
`53`	`82`	`}`
`54`	`83`
`55`	`84`	`private async initializeVitest(): Promise<Vitest> {`
`56`		`- const { codeCoverage, reporters, watch,workspaceRoot, setupFiles, browsers, debug } =`
	`85`	`+ const { codeCoverage, reporters, workspaceRoot, setupFiles, browsers, debug, watch } =`
`57`	`86`	`this.options;`
`58`	`87`	`const { outputPath, projectName, latestBuildResult } = this;`
`59`	`88`
`@@ -101,7 +130,7 @@ export class VitestExecutor implements TestExecutor {`
`101`	`130`
`102`	`131`	`return startVitest(`
`103`	`132`	`'test',`
`104`		`- undefined/* cliFilters */,`
	`133`	`+ undefined,`
`105`	`134`	`{`
`106`	`135`	`// Disable configuration file resolution/loading`
`107`	`136`	`config: false,`
`@@ -115,6 +144,11 @@ export class VitestExecutor implements TestExecutor {`
`115`	`144`	`...debugOptions,`
`116`	`145`	`},`
`117`	`146`	`{`
	`147`	`+ server: {`
	`148`	`+ // Disable the actual file watcher. The boolean watch option above should still`
	`149`	`+ // be enabled as it controls other internal behavior related to rerunning tests.`
	`150`	`+ watch: null,`
	`151`	`+ },`
`118`	`152`	`plugins: [`
`119`	`153`	`{`
`120`	`154`	`name: 'angular:project-init',`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit abf0032

File tree

1 file changed

1 file changed

`‎packages/angular/build/src/builders/unit-test/runners/vitest/executor.ts`

0 commit comments