feat(angular): generate vitest unit test runner by default

e2e/angular/src/config.test.ts

@@ -14,7 +14,7 @@ describe('angular.json v1 config', () => {
   beforeAll(() => {
     newProject({ packages: ['@nx/angular'] });
     runCLI(
-      `generate @nx/angular:app ${app1} --bundler=webpack --no-interactive`
+      `generate @nx/angular:app ${app1} --bundler=webpack --unit-test-runner=jest --no-interactive`
     );
     // reset workspace to use v1 config
     updateFile(`angular.json`, angularV1Json(app1));

e2e/angular/src/misc.test.ts

@@ -20,7 +20,9 @@ describe('Move Angular Project', () => {
     app1 = uniq('app1');
     app2 = uniq('app2');
     newPath = `subfolder/${app2}`;
-    runCLI(`generate @nx/angular:app ${app1} --no-interactive`);
+    runCLI(
+      `generate @nx/angular:app ${app1} --unit-test-runner=jest --no-interactive`
+    );
   });
 
   afterAll(() => cleanupProject());
@@ -93,13 +95,17 @@ describe('Move Angular Project', () => {
   it('should work for libraries', () => {
     const lib1 = uniq('mylib');
     const lib2 = uniq('mylib');
-    runCLI(`generate @nx/angular:lib ${lib1} --no-standalone --no-interactive`);
+    runCLI(
+      `generate @nx/angular:lib ${lib1} --unit-test-runner=jest --no-standalone --no-interactive`
+    );
 
     /**
      * Create a library which imports the module from the other lib
      */
 
-    runCLI(`generate @nx/angular:lib ${lib2} --no-standalone --no-interactive`);
+    runCLI(
+      `generate @nx/angular:lib ${lib2} --unit-test-runner=jest --no-standalone --no-interactive`
+    );
 
     updateFile(
       `${lib2}/src/lib/${lib2}-module.ts`,

e2e/angular/src/ngrx.test.ts

@@ -1,112 +1,121 @@
 import {
   cleanupProject,
-  expectTestsPass,
   newProject,
   readJson,
   runCLI,
   runCLIAsync,
   uniq,
 } from '@nx/e2e-utils';
 
-describe('Angular Package', () => {
-  describe('ngrx', () => {
-    beforeAll(() => {
-      newProject({ packages: ['@nx/angular'] });
-    });
-    afterAll(() => {
-      cleanupProject();
-    });
+describe('NgRx', () => {
+  beforeAll(() => {
+    newProject({ packages: ['@nx/angular'] });
+  });
+  afterAll(() => {
+    cleanupProject();
+  });
 
-    it('should work', async () => {
-      const myapp = uniq('myapp');
-      runCLI(
-        `generate @nx/angular:app ${myapp} --no-standalone --no-interactive`
-      );
+  it('should work', async () => {
+    const myapp = uniq('myapp');
+    runCLI(
+      `generate @nx/angular:app ${myapp} --no-standalone --no-interactive`
+    );
 
-      // Generate root ngrx state management
-      runCLI(
-        `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root --minimal=false`
-      );
-      const packageJson = readJson('package.json');
-      expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
-      expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
+    // Generate root ngrx state management
+    runCLI(
+      `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root --minimal=false`
+    );
+    const packageJson = readJson('package.json');
+    expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
+    expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
 
-      const mylib = uniq('mylib');
-      // Generate feature library and ngrx state within that library
-      runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
-      runCLI(
-        `generate @nx/angular:ngrx flights --parent=${mylib}/src/lib/${mylib}-module.ts --facade`
-      );
+    const mylib = uniq('mylib');
+    // Generate feature library and ngrx state within that library
+    runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
+    runCLI(
+      `generate @nx/angular:ngrx flights --parent=${mylib}/src/lib/${mylib}-module.ts --facade`
+    );
 
-      expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
-      expectTestsPass(await runCLIAsync(`test ${myapp} --no-watch`));
-      expectTestsPass(await runCLIAsync(`test ${mylib} --no-watch`));
-    }, 1000000);
+    expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
+    expect(
+      (await runCLIAsync(`test ${myapp} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${myapp}`);
+    expect(
+      (await runCLIAsync(`test ${mylib} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${mylib}`);
+  }, 1000000);
 
-    it('should work with creators', async () => {
-      const myapp = uniq('myapp');
-      runCLI(
-        `generate @nx/angular:app ${myapp} --routing --no-standalone --no-interactive`
-      );
+  it('should work with creators', async () => {
+    const myapp = uniq('myapp');
+    runCLI(
+      `generate @nx/angular:app ${myapp} --routing --no-standalone --no-interactive`
+    );
 
-      // Generate root ngrx state management
-      runCLI(
-        `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root`
-      );
-      const packageJson = readJson('package.json');
-      expect(packageJson.dependencies['@ngrx/entity']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
-      expect(packageJson.devDependencies['@ngrx/schematics']).toBeDefined();
-      expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
+    // Generate root ngrx state management
+    runCLI(
+      `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root`
+    );
+    const packageJson = readJson('package.json');
+    expect(packageJson.dependencies['@ngrx/entity']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
+    expect(packageJson.devDependencies['@ngrx/schematics']).toBeDefined();
+    expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
 
-      const mylib = uniq('mylib');
-      // Generate feature library and ngrx state within that library
-      runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
+    const mylib = uniq('mylib');
+    // Generate feature library and ngrx state within that library
+    runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
 
-      const flags = `--facade --barrels`;
-      runCLI(
-        `generate @nx/angular:ngrx flights --parent=${mylib}/src/lib/${mylib}-module.ts ${flags}`
-      );
+    const flags = `--facade --barrels`;
+    runCLI(
+      `generate @nx/angular:ngrx flights --parent=${mylib}/src/lib/${mylib}-module.ts ${flags}`
+    );
 
-      expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
-      expectTestsPass(await runCLIAsync(`test ${myapp} --no-watch`));
-      expectTestsPass(await runCLIAsync(`test ${mylib} --no-watch`));
-    }, 1000000);
+    expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
+    expect(
+      (await runCLIAsync(`test ${myapp} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${myapp}`);
+    expect(
+      (await runCLIAsync(`test ${mylib} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${mylib}`);
+  }, 1000000);
 
-    it('should work with creators using --module', async () => {
-      const myapp = uniq('myapp');
-      runCLI(
-        `generate @nx/angular:app ${myapp} --routing --no-standalone --no-interactive`
-      );
+  it('should work with creators using --module', async () => {
+    const myapp = uniq('myapp');
+    runCLI(
+      `generate @nx/angular:app ${myapp} --routing --no-standalone --no-interactive`
+    );
 
-      // Generate root ngrx state management
-      runCLI(
-        `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root`
-      );
-      const packageJson = readJson('package.json');
-      expect(packageJson.dependencies['@ngrx/entity']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
-      expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
-      expect(packageJson.devDependencies['@ngrx/schematics']).toBeDefined();
-      expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
+    // Generate root ngrx state management
+    runCLI(
+      `generate @nx/angular:ngrx users --parent=${myapp}/src/app/app-module.ts --root`
+    );
+    const packageJson = readJson('package.json');
+    expect(packageJson.dependencies['@ngrx/entity']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/store']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/effects']).toBeDefined();
+    expect(packageJson.dependencies['@ngrx/router-store']).toBeDefined();
+    expect(packageJson.devDependencies['@ngrx/schematics']).toBeDefined();
+    expect(packageJson.devDependencies['@ngrx/store-devtools']).toBeDefined();
 
-      const mylib = uniq('mylib');
-      // Generate feature library and ngrx state within that library
-      runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
+    const mylib = uniq('mylib');
+    // Generate feature library and ngrx state within that library
+    runCLI(`g @nx/angular:lib ${mylib} --prefix=fl --no-standalone`);
 
-      const flags = `--facade --barrels`;
-      runCLI(
-        `generate @nx/angular:ngrx flights --module=${mylib}/src/lib/${mylib}-module.ts ${flags}`
-      );
+    const flags = `--facade --barrels`;
+    runCLI(
+      `generate @nx/angular:ngrx flights --module=${mylib}/src/lib/${mylib}-module.ts ${flags}`
+    );
 
-      expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
-      expectTestsPass(await runCLIAsync(`test ${myapp} --no-watch`));
-      expectTestsPass(await runCLIAsync(`test ${mylib} --no-watch`));
-    }, 1000000);
-  });
+    expect(runCLI(`build ${myapp}`)).toMatch(/main-[a-zA-Z0-9]+\.js/);
+    expect(
+      (await runCLIAsync(`test ${myapp} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${myapp}`);
+    expect(
+      (await runCLIAsync(`test ${mylib} --no-watch`)).combinedOutput
+    ).toContain(`Successfully ran target test for project ${mylib}`);
+  }, 1000000);
 });

packages/angular/executors.json

@@ -39,6 +39,11 @@
       "implementation": "./src/executors/extract-i18n/extract-i18n.impl",
       "schema": "./src/executors/extract-i18n/schema.json",
       "description": "Extracts i18n messages from source code."
+    },
+    "unit-test": {
+      "implementation": "./src/executors/unit-test/unit-test.impl",
+      "schema": "./src/executors/unit-test/schema.json",
+      "description": "Run application unit tests. _Note: this is only supported in Angular versions >= 21.0.0_."
     }
   },
   "builders": {

packages/angular/src/executors/application/application.impl.ts

@@ -46,7 +46,7 @@ export default async function* applicationExecutor(
 
   const builderContext = await createBuilderContext(
     {
-      builderName: 'application',
+      builderName: '@nx/angular:application',
       description: 'Build an application.',
       optionSchema: require('./schema.json'),
     },

packages/angular/src/executors/browser-esbuild/browser-esbuild.impl.ts

@@ -38,7 +38,7 @@ export default async function* esbuildExecutor(
 
   const builderContext = await createBuilderContext(
     {
-      builderName: 'browser-esbuild',
+      builderName: '@nx/angular:browser-esbuild',
       description: 'Build a browser application',
       optionSchema: require('@angular-devkit/build-angular/src/builders/browser-esbuild/schema.json'),
     },

packages/angular/src/executors/extract-i18n/extract-i18n.impl.ts

@@ -27,7 +27,7 @@ export default async function* extractI18nExecutor(
 
   const builderContext = await createBuilderContext(
     {
-      builderName: 'extrct-i18n',
+      builderName: '@nx/angular:extract-i18n',
       description: 'Extracts i18n messages from source code.',
       optionSchema: require('./schema.json'),
     },

packages/angular/src/executors/unit-test/schema.d.ts

@@ -0,0 +1,7 @@
+import type { UnitTestBuilderOptions } from '@angular/build';
+import type { PluginSpec } from '../utilities/esbuild-extensions';
+
+export interface UnitTestExecutorOptions extends UnitTestBuilderOptions {
+  indexHtmlTransformer?: string;
+  plugins?: string[] | PluginSpec[];
+}