Commit 9af4f76

committed

fix(@angular/build): update vitest to 4.0.6 and remove coverage workaround

Upgrades Vitest and @vitest/coverage-v8 dependencies to version 4.0.6. This update allows for the removal of a temporary workaround that augmented `BaseCoverageProvider.prototype.isIncluded` in `executor.ts`. The issue with direct filesystem checks in Vitest's coverage provider has been resolved in version 4.0.6, simplifying the code and relying on the official library's implementation.

1 parent 2a24469 commit 9af4f76Copy full SHA for 9af4f76

File tree

5 files changed

+59

-76

lines changed

modules/testing/builder
- package.json
packages/angular/build
- package.json
- src/builders/unit-test/runners/vitest
  - executor.ts
pnpm-lock.yaml
tests/legacy-cli/e2e/utils
- vitest.ts

5 files changed

+59

-76

lines changed

`‎modules/testing/builder/package.json‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@`
`4`	`4`	`"@angular-devkit/architect": "workspace:*",`
`5`	`5`	`"@angular/ssr": "workspace:*",`
`6`	`6`	`"@angular-devkit/build-angular": "workspace:*",`
`7`		`- "@vitest/coverage-v8": "4.0.4",`
	`7`	`+ "@vitest/coverage-v8": "4.0.6",`
`8`	`8`	`"jsdom": "27.0.1",`
`9`	`9`	`"rxjs": "7.8.2",`
`10`		`- "vitest": "4.0.4"`
	`10`	`+ "vitest": "4.0.6"`
`11`	`11`	`}`
`12`	`12`	`}`

`‎packages/angular/build/package.json‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`"ng-packagr": "21.0.0-rc.0",`
`57`	`57`	`"postcss": "8.5.6",`
`58`	`58`	`"rxjs": "7.8.2",`
`59`		`- "vitest": "4.0.4"`
	`59`	`+ "vitest": "4.0.6"`
`60`	`60`	`},`
`61`	`61`	`"peerDependencies": {`
`62`	`62`	`"@angular/core": "0.0.0-ANGULAR-FW-PEER-DEP",`
`@@ -74,7 +74,7 @@`
`74`	`74`	`"tailwindcss": "^2.0.0 \|\| ^3.0.0 \|\| ^4.0.0",`
`75`	`75`	`"tslib": "^2.3.0",`
`76`	`76`	`"typescript": ">=5.9 <6.0",`
`77`		`- "vitest": "^4.0.0"`
	`77`	`+ "vitest": "^4.0.6"`
`78`	`78`	`},`
`79`	`79`	`"peerDependenciesMeta": {`
`80`	`80`	`"@angular/core": {`

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

Lines changed: 0 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -143,9 +143,7 @@ export class VitestExecutor implements TestExecutor {`
`143`	`143`	`} = this.options;`
`144`	`144`
`145`	`145`	`let vitestNodeModule;`
`146`		`- let vitestCoverageModule;`
`147`	`146`	`try {`
`148`		`- vitestCoverageModule = await import('vitest/coverage');`
`149`	`147`	`vitestNodeModule = await import('vitest/node');`
`150`	`148`	`} catch (error: unknown) {`
`151`	`149`	`assertIsError(error);`
`@@ -158,21 +156,6 @@ export class VitestExecutor implements TestExecutor {`
`158`	`156`	`}`
`159`	`157`	`const { startVitest } = vitestNodeModule;`
`160`	`158`
`161`		`- // Augment BaseCoverageProvider to include logic to support the built virtual files.`
`162`		`- // Temporary workaround to avoid the direct filesystem checks in the base provider that`
`163`		`- // were introduced in v4. Also ensures that all built virtual files are available.`
`164`		`- const builtVirtualFiles = this.buildResultFiles;`
`165`		`- vitestCoverageModule.BaseCoverageProvider.prototype.isIncluded = function (filename) {`
`166`		`- const relativeFilename = path.relative(workspaceRoot, filename);`
`167`		`- if (!this.options.include \|\| builtVirtualFiles.has(relativeFilename)) {`
`168`		`- return !isMatch(relativeFilename, this.options.exclude);`
`169`		`- } else {`
`170`		`- return isMatch(relativeFilename, this.options.include, {`
`171`		`- ignore: this.options.exclude,`
`172`		`- });`
`173`		`- }`
`174`		`- };`
`175`		`-`
`176`	`159`	`// Setup vitest browser options if configured`
`177`	`160`	`const browserOptions = await setupBrowserConfiguration(`
`178`	`161`	`browsers,`

`‎pnpm-lock.yaml‎`

Lines changed: 54 additions & 54 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎tests/legacy-cli/e2e/utils/vitest.ts‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { updateJsonFile } from './project';`
`3`	`3`
`4`	`4`	/** Updates the `test` builder in the current workspace to use Vitest. */
`5`	`5`	`export async function applyVitestBuilder(): Promise<void> {`
`6`		`- await silentNpm('install', 'vitest@4.0.0', 'jsdom@27.0.0', '--save-dev');`
	`6`	`+ await silentNpm('install', 'vitest@4.0.6', 'jsdom@27.0.0', '--save-dev');`
`7`	`7`
`8`	`8`	`await updateJsonFile('angular.json', (json) => {`
`9`	`9`	`const projects = Object.values(json['projects']);`

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 9af4f76

File tree

5 files changed

5 files changed

`‎modules/testing/builder/package.json‎`

`‎packages/angular/build/package.json‎`

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

`‎pnpm-lock.yaml‎`

`‎tests/legacy-cli/e2e/utils/vitest.ts‎`

0 commit comments