@nx/angular 22.2.2 → 22.3.0-beta.0

package/src/generators/host/lib/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./update-ssr-setup"), exports);
+tslib_1.__exportStar(require("./validate-options"), exports);

package/src/generators/host/lib/update-ssr-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-ssr-setup.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/update-ssr-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAgBvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,uBAAuB,EAAE,OAAO,mDA8EjC"}
+{"version":3,"file":"update-ssr-setup.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/update-ssr-setup.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAevC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGxC,wBAAsB,cAAc,CAClC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,uBAAuB,EAAE,OAAO,mDAyEjC"}

package/src/generators/host/lib/update-ssr-setup.js

@@ -7,17 +7,19 @@ const path_1 = require("path");
 const versions_1 = require("../../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
 async function updateSsrSetup(tree, options, appName, typescriptConfiguration) {
-    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     let project = (0, devkit_1.readProjectConfiguration)(tree, appName);
     const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
     tree.rename((0, devkit_1.joinPathFragments)(sourceRoot, 'main.server.ts'), (0, devkit_1.joinPathFragments)(sourceRoot, 'bootstrap.server.ts'));
-    const pathToServerEntry = (0, devkit_1.joinPathFragments)(angularMajorVersion >= 19 ? sourceRoot : project.root, 'server.ts');
-    tree.write(pathToServerEntry, `import('./${angularMajorVersion >= 19 ? '' : 'src/'}main.server');`);
+    const pathToServerEntry = (0, devkit_1.joinPathFragments)(sourceRoot, 'server.ts');
+    tree.write(pathToServerEntry, `import('./main.server');`);
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, '../files/common'), project.root, {
         appName,
         browserBundleOutput: project.targets.build.options.outputPath,
         standalone: options.standalone,
-        commonEngineEntryPoint: angularMajorVersion >= 19 ? '@angular/ssr/node' : '@angular/ssr',
+        zoneless: options.zoneless,
+        useDefaultImport: angularMajorVersion >= 21,
+        angularMajorVersion,
         tmpl: '',
     });
     const pathToTemplateFiles = typescriptConfiguration ? 'ts' : 'js';

package/src/generators/host/lib/validate-options.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;
+//# sourceMappingURL=validate-options.d.ts.map

package/src/generators/host/lib/validate-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/host/lib/validate-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAW1D"}

package/src/generators/host/lib/validate-options.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = validateOptions;
+const version_utils_1 = require("../../utils/version-utils");
+function validateOptions(tree, options) {
+    const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+    if (angularMajorVersion < 21) {
+        if (options.zoneless) {
+            throw new Error(`The "zoneless" option is only supported for Angular versions >= 21.0.0. You are using Angular ${angularVersion}.`);
+        }
+    }
+}

package/src/generators/host/schema.d.ts

@@ -17,7 +17,7 @@ export interface Schema {
   skipTests?: boolean;
   tags?: string;
   linter?: Linter | LinterType;
-  unitTestRunner?: UnitTestRunner;
+  unitTestRunner?: Exclude<UnitTestRunner, UnitTestRunner.VitestAngular>;
   e2eTestRunner?: E2eTestRunner;
   backendProject?: string;
   strict?: boolean;
@@ -27,6 +27,6 @@ export interface Schema {
   skipFormat?: boolean;
   standalone?: boolean;
   ssr?: boolean;
-  serverRouting?: boolean;
+  zoneless?: boolean;
   typescriptConfiguration?: boolean;
 }

package/src/generators/host/schema.json

@@ -119,10 +119,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "x-prompt": "Which unit test runner would you like to use?",
-      "default": "jest"
+      "enum": ["vitest-analog", "jest", "none"],
+      "description": "Test runner to use for unit tests. `vitest-analog` uses AnalogJS-based setup with `@nx/vitest`. It defaults to `vitest-analog` for Angular versions >= 21.0.0, otherwise `jest`.",
+      "x-prompt": "Which unit test runner would you like to use?"
     },
     "e2eTestRunner": {
       "type": "string",
@@ -177,8 +176,8 @@
       "default": false,
       "x-priority": "important"
     },
-    "serverRouting": {
-      "description": "Creates a server application using the Server Routing and App Engine APIs for application using the `application` builder (Developer Preview). _Note: this is only supported in Angular versions 19.x.x_. From Angular 20 onwards, SSR will always enable server routing when using the `application` builder.",
+    "zoneless": {
+      "description": "Generate an application that does not use `zone.js`. It defaults to `true`. _Note: this is only supported in Angular versions >= 21.0.0_",
       "type": "boolean"
     },
     "typescriptConfiguration": {

package/src/generators/library/files/base/tsconfig.lib.json__tpl__

@@ -7,11 +7,9 @@
     "inlineSources": true,
     "types": []
   },
+  "include": ["src/**/*.ts"],
   "exclude": [
-    "src/**/*.spec.ts",<% if(unitTesting) { %>
-    "src/test-setup.ts",<% } %>
-    "jest.config.ts",
+    "src/**/*.spec.ts",
     "src/**/*.test.ts"
-  ],
-  "include": ["src/**/*.ts"]
+  ]
 }

package/src/generators/library/lib/normalize-options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAU9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,CAAC,CA+F3B"}
+{"version":3,"file":"normalize-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAW9C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,gBAAgB,CAAC,CAuG3B"}

package/src/generators/library/lib/normalize-options.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const test_runners_1 = require("../../../utils/test-runners");
 const artifact_types_1 = require("../../utils/artifact-types");
+const version_utils_1 = require("../../utils/version-utils");
 async function normalizeOptions(host, schema) {
     schema.standalone = schema.standalone ?? true;
     // Create a schema with populated default values
@@ -13,7 +14,6 @@ async function normalizeOptions(host, schema) {
         linter: 'eslint',
         publishable: false,
         skipFormat: false,
-        unitTestRunner: test_runners_1.UnitTestRunner.Jest,
         // Publishable libs cannot use `full` yet, so if its false then use the passed value or default to `full`
         compilationMode: schema.publishable
             ? 'partial'
@@ -35,11 +35,18 @@ async function normalizeOptions(host, schema) {
         : [];
     const moduleTypeSeparator = (0, artifact_types_1.getModuleTypeSeparator)(host);
     const modulePath = `${projectRoot}/src/lib/${fileName}${moduleTypeSeparator}module.ts`;
+    const { major: angularMajorVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(host);
+    const unitTestRunner = options.unitTestRunner ??
+        (angularMajorVersion >= 21 && (options.buildable || options.publishable)
+            ? test_runners_1.UnitTestRunner.VitestAngular
+            : angularMajorVersion >= 21
+                ? test_runners_1.UnitTestRunner.VitestAnalog
+                : test_runners_1.UnitTestRunner.Jest);
     const ngCliSchematicLibRoot = projectName;
     const allNormalizedOptions = {
         ...options,
         linter: options.linter ?? 'eslint',
-        unitTestRunner: options.unitTestRunner ?? test_runners_1.UnitTestRunner.Jest,
+        unitTestRunner,
         prefix: options.prefix ?? 'lib',
         name: projectName,
         projectRoot,
@@ -50,7 +57,7 @@ async function normalizeOptions(host, schema) {
         fileName,
         importPath,
         ngCliSchematicLibRoot,
-        skipTests: options.unitTestRunner === 'none' ? true : options.skipTests,
+        skipTests: unitTestRunner === 'none' ? true : options.skipTests,
         standaloneComponentName: `${(0, devkit_1.names)(projectNames.projectSimpleName).className}Component`,
         moduleTypeSeparator,
     };

package/src/generators/library/lib/update-tsconfig-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAWtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,QAqF5C"}
+{"version":3,"file":"update-tsconfig-files.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/update-tsconfig-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAYtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,QAqG5C"}

package/src/generators/library/lib/update-tsconfig-files.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const configuration_1 = require("@nx/js/src/utils/typescript/configuration");
 const semver_1 = require("semver");
+const tsconfig_utils_1 = require("../../utils/tsconfig-utils");
 const update_project_root_tsconfig_1 = require("../../utils/update-project-root-tsconfig");
 const version_utils_1 = require("../../utils/version-utils");
 function updateTsConfigFiles(tree, options) {
@@ -21,6 +22,7 @@ function updateTsConfigFiles(tree, options) {
         skipLibCheck: true,
         experimentalDecorators: true,
         importHelpers: true,
+        isolatedModules: true,
         target: 'es2022',
         moduleResolution: 'bundler',
         ...(options.strict
@@ -33,9 +35,17 @@ function updateTsConfigFiles(tree, options) {
             }
             : {}),
     };
+    const rootTsConfigPath = (0, js_1.getRootTsConfigFileName)(tree);
     const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
-    if ((0, semver_1.lt)(angularVersion, '18.1.0')) {
-        compilerOptions.useDefineForClassFields = false;
+    if ((0, semver_1.gte)(angularVersion, '19.1.0')) {
+        // Angular started warning about emitDecoratorMetadata and isolatedModules
+        // in v19.1.0. If enabled in the root tsconfig, we need to disable it.
+        if ((0, tsconfig_utils_1.getDefinedCompilerOption)(tree, rootTsConfigPath, 'emitDecoratorMetadata') === true) {
+            compilerOptions.emitDecoratorMetadata = false;
+        }
+    }
+    if (angularMajorVersion >= 21) {
+        compilerOptions.moduleResolution = 'bundler';
     }
     if (angularMajorVersion >= 20) {
         compilerOptions.module = 'preserve';
@@ -49,13 +59,13 @@ function updateTsConfigFiles(tree, options) {
             ...json.compilerOptions,
             ...compilerOptions,
         };
-        json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, (0, js_1.getRootTsConfigFileName)(tree));
+        json.compilerOptions = (0, configuration_1.getNeededCompilerOptionOverrides)(tree, json.compilerOptions, rootTsConfigPath);
         if (options.strict) {
             json.angularCompilerOptions = {
                 ...json.angularCompilerOptions,
                 strictInjectionParameters: true,
                 strictInputAccessModifiers: true,
-                typeCheckHostBindings: angularMajorVersion >= 20 ? true : undefined,
+                typeCheckHostBindings: angularMajorVersion === 20 ? true : undefined,
                 strictTemplates: true,
             };
         }
@@ -80,9 +90,8 @@ function updateProjectConfig(host, options) {
         json.exclude = [
             ...new Set([
                 ...(json.exclude || []),
-                'jest.config.ts',
-                'src/**/*.test.ts',
                 'src/**/*.spec.ts',
+                'src/**/*.test.ts',
             ]),
         ];
         return json;

package/src/generators/library/lib/validate-options.d.ts

@@ -0,0 +1,4 @@
+import type { Tree } from '@nx/devkit';
+import type { Schema } from '../schema';
+export declare function validateOptions(tree: Tree, options: Schema): void;
+//# sourceMappingURL=validate-options.d.ts.map

package/src/generators/library/lib/validate-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-options.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/library/lib/validate-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAExC,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAmCjE"}

package/src/generators/library/lib/validate-options.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOptions = validateOptions;
+const test_runners_1 = require("../../../utils/test-runners");
+const version_utils_1 = require("../../utils/version-utils");
+function validateOptions(tree, options) {
+    if (!options.routing && options.lazy) {
+        throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
+    }
+    if (options.publishable === true && !options.importPath) {
+        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
+    }
+    if (options.addTailwind && !options.buildable && !options.publishable) {
+        throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
+    }
+    if (options.unitTestRunner === test_runners_1.UnitTestRunner.VitestAngular) {
+        const { major: angularMajorVersion, version: angularVersion } = (0, version_utils_1.getInstalledAngularVersionInfo)(tree);
+        if (angularMajorVersion < 21) {
+            throw new Error(`The "vitest-angular" unit test runner requires Angular v21 or higher. ` +
+                `Detected Angular v${angularVersion}. Use "vitest-analog" or "jest" instead.`);
+        }
+        if (!options.buildable && !options.publishable) {
+            throw new Error(`The "vitest-angular" unit test runner requires the library to be buildable or publishable. ` +
+                `Use "vitest-analog" or "jest" instead.`);
+        }
+    }
+}

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAuBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAuF5B;AAqDD,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/library/library.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EACL,MAAM,YAAY,CAAC;AAwBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,iBAAiB,CAAC,CAyE5B;AAoED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -24,18 +24,10 @@ const normalize_options_1 = require("./lib/normalize-options");
 const set_generator_defaults_1 = require("./lib/set-generator-defaults");
 const update_lib_package_npm_scope_1 = require("./lib/update-lib-package-npm-scope");
 const update_tsconfig_files_1 = require("./lib/update-tsconfig-files");
+const validate_options_1 = require("./lib/validate-options");
 async function libraryGenerator(tree, schema) {
     (0, validations_1.assertNotUsingTsSolutionSetup)(tree, 'library');
-    // Do some validation checks
-    if (!schema.routing && schema.lazy) {
-        throw new Error(`To use "--lazy" option, "--routing" must also be set.`);
-    }
-    if (schema.publishable === true && !schema.importPath) {
-        throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
-    }
-    if (schema.addTailwind && !schema.buildable && !schema.publishable) {
-        throw new Error(`To use "--addTailwind" option, you have to set either "--buildable" or "--publishable".`);
-    }
+    (0, validate_options_1.validateOptions)(tree, schema);
     const options = await (0, normalize_options_1.normalizeOptions)(tree, schema);
     const { libraryOptions } = options;
     const pkgVersions = (0, version_utils_1.versions)(tree);
@@ -46,7 +38,9 @@ async function libraryGenerator(tree, schema) {
     });
     await (0, init_1.default)(tree, { ...libraryOptions, skipFormat: true });
     if (!libraryOptions.skipPackageJson) {
-        (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree);
+        // if zone.js is not installed, we'll never install it as a dependency
+        // from the library generator
+        (0, ensure_angular_dependencies_1.ensureAngularDependencies)(tree, /*zoneless*/ true);
     }
     const project = await (0, add_project_1.addProject)(tree, libraryOptions);
     (0, create_files_1.createFiles)(tree, options, project);
@@ -86,6 +80,7 @@ async function libraryGenerator(tree, schema) {
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function addUnitTestRunner(host, options) {
+    const zoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(host, 'zone.js') === null;
     switch (options.unitTestRunner) {
         case test_runners_1.UnitTestRunner.Jest:
             await (0, add_jest_1.addJest)(host, {
@@ -93,14 +88,26 @@ async function addUnitTestRunner(host, options) {
                 projectRoot: options.projectRoot,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                runtimeTsconfigFileName: 'tsconfig.lib.json',
+                zoneless,
+            });
+            break;
+        case test_runners_1.UnitTestRunner.VitestAngular:
+            await (0, add_vitest_1.addVitestAngular)(host, {
+                name: options.name,
+                projectRoot: options.projectRoot,
+                skipPackageJson: options.skipPackageJson,
+                useNxUnitTestRunnerExecutor: true,
             });
             break;
-        case test_runners_1.UnitTestRunner.Vitest:
-            await (0, add_vitest_1.addVitest)(host, {
+        case test_runners_1.UnitTestRunner.VitestAnalog:
+            await (0, add_vitest_1.addVitestAnalog)(host, {
                 name: options.name,
                 projectRoot: options.projectRoot,
+                skipFormat: options.skipFormat,
                 skipPackageJson: options.skipPackageJson,
                 strict: options.strict,
+                zoneless,
             });
             break;
     }

package/src/generators/library/schema.json

@@ -83,10 +83,9 @@
     },
     "unitTestRunner": {
       "type": "string",
-      "enum": ["jest", "vitest", "none"],
-      "description": "Test runner to use for unit tests.",
-      "x-prompt": "Which unit test runner would you like to use?",
-      "default": "jest"
+      "enum": ["vitest-angular", "vitest-analog", "jest", "none"],
+      "description": "Test runner to use for unit tests. `vitest-angular` uses the `@nx/angular:unit-test` executor (requires Angular v21+ and a buildable/publishable library). `vitest-analog` uses AnalogJS-based setup with `@nx/vitest`. It defaults to `vitest-angular` for buildable/publishable libraries on Angular >= 21.0.0, `vitest-analog` for non-buildable libraries on Angular >= 21.0.0, otherwise `jest`.",
+      "x-prompt": "Which unit test runner would you like to use?"
     },
     "importPath": {
       "type": "string",

package/src/generators/ng-add/migrators/builders/angular-build-unit-test.migrator.d.ts

@@ -0,0 +1,16 @@
+import type { ProjectConfiguration, Tree } from '@nx/devkit';
+import type { Logger, ProjectMigrationInfo } from '../../utilities';
+import { BuilderMigrator } from './builder.migrator';
+export declare class AngularBuildUnitTestMigrator extends BuilderMigrator {
+    constructor(tree: Tree, project: ProjectMigrationInfo, projectConfig: ProjectConfiguration, logger: Logger);
+    migrate(): void;
+    private moveConfigFiles;
+    private moveCustomReporterFiles;
+    private updateTargetConfiguration;
+    private updateConfigurationOptions;
+    private updateReporterPaths;
+    private updateTsConfigFileUsedByTestTarget;
+    private handleRootProjectConfigFiles;
+    private getRunnerOption;
+}
+//# sourceMappingURL=angular-build-unit-test.migrator.d.ts.map

package/src/generators/ng-add/migrators/builders/angular-build-unit-test.migrator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"angular-build-unit-test.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/angular-build-unit-test.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EAEpB,IAAI,EACL,MAAM,YAAY,CAAC;AAQpB,OAAO,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,qBAAa,4BAA6B,SAAQ,eAAe;gBAE7D,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,aAAa,EAAE,oBAAoB,EACnC,MAAM,EAAE,MAAM;IAcP,OAAO,IAAI,IAAI;IAiBxB,OAAO,CAAC,eAAe;IAgCvB,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,yBAAyB;IAsBjC,OAAO,CAAC,0BAA0B;IAmClC,OAAO,CAAC,mBAAmB;IAiB3B,OAAO,CAAC,kCAAkC;IA0B1C,OAAO,CAAC,4BAA4B;IAyBpC,OAAO,CAAC,eAAe;CAQxB"}

package/src/generators/ng-add/migrators/builders/angular-build-unit-test.migrator.js

@@ -0,0 +1,161 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AngularBuildUnitTestMigrator = void 0;
+const devkit_1 = require("@nx/devkit");
+const js_1 = require("@nx/js");
+const path_1 = require("path");
+const builder_migrator_1 = require("./builder.migrator");
+class AngularBuildUnitTestMigrator extends builder_migrator_1.BuilderMigrator {
+    constructor(tree, project, projectConfig, logger) {
+        const rootFileType = determineRootFileType(projectConfig);
+        super(tree, ['@angular/build:unit-test'], rootFileType, project, projectConfig, logger);
+    }
+    migrate() {
+        if (this.skipMigration) {
+            return;
+        }
+        for (const [name, target] of this.targets) {
+            this.moveConfigFiles(target);
+            this.updateTargetConfiguration(name, target);
+            this.updateTsConfigFileUsedByTestTarget(name, target);
+            this.updateCacheableOperations([name]);
+        }
+        if (!this.targets.size && this.projectConfig.root === '') {
+            this.handleRootProjectConfigFiles();
+        }
+    }
+    moveConfigFiles(target) {
+        const filePathOptions = ['tsConfig'];
+        if (typeof target.options?.runnerConfig === 'string') {
+            filePathOptions.push('runnerConfig');
+        }
+        if (target.options?.providersFile) {
+            filePathOptions.push('providersFile');
+        }
+        this.moveFilePathsFromTargetToProjectRoot(target, filePathOptions);
+        if (Array.isArray(target.options?.setupFiles)) {
+            target.options.setupFiles.forEach((file) => {
+                if (this.tree.exists(file)) {
+                    this.moveProjectRootFile(file);
+                }
+            });
+        }
+        if (Array.isArray(target.options?.reporters)) {
+            this.moveCustomReporterFiles(target.options.reporters);
+        }
+        for (const config of Object.values(target.configurations ?? {})) {
+            if (Array.isArray(config.reporters)) {
+                this.moveCustomReporterFiles(config.reporters);
+            }
+        }
+    }
+    moveCustomReporterFiles(reporters) {
+        reporters.forEach((reporter) => {
+            const reporterPath = Array.isArray(reporter) ? reporter[0] : reporter;
+            if (typeof reporterPath === 'string' &&
+                reporterPath.includes('/') &&
+                this.tree.exists(reporterPath)) {
+                this.moveProjectRootFile(reporterPath);
+            }
+        });
+    }
+    updateTargetConfiguration(targetName, target) {
+        if (!target.options) {
+            this.logger.warn(`The target "${targetName}" is not specifying any options. Skipping updating the target configuration.`);
+            return;
+        }
+        this.updateConfigurationOptions(target.options);
+        for (const config of Object.values(target.configurations ?? {})) {
+            this.updateConfigurationOptions(config);
+        }
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
+            ...this.projectConfig,
+        });
+    }
+    updateConfigurationOptions(options) {
+        if (options.tsConfig || options.tsconfig) {
+            const tsConfigKey = options.tsConfig ? 'tsConfig' : 'tsconfig';
+            options[tsConfigKey] = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(options[tsConfigKey]));
+        }
+        if (typeof options.runnerConfig === 'string') {
+            options.runnerConfig = (0, devkit_1.joinPathFragments)(this.project.newRoot, (0, path_1.basename)(options.runnerConfig));
+        }
+        if (options.outputFile) {
+            options.outputFile = this.convertRootPath(options.outputFile);
+        }
+        if (options.providersFile) {
+            options.providersFile = this.convertAsset(options.providersFile);
+        }
+        if (Array.isArray(options.setupFiles)) {
+            options.setupFiles = options.setupFiles.map((file) => this.convertAsset(file));
+        }
+        if (Array.isArray(options.reporters)) {
+            options.reporters = this.updateReporterPaths(options.reporters);
+        }
+    }
+    updateReporterPaths(reporters) {
+        return reporters.map((reporter) => {
+            if (Array.isArray(reporter)) {
+                const [reporterPath, reporterOptions] = reporter;
+                if (typeof reporterPath === 'string' && reporterPath.includes('/')) {
+                    return [this.convertAsset(reporterPath), reporterOptions];
+                }
+                return reporter;
+            }
+            else if (typeof reporter === 'string' && reporter.includes('/')) {
+                return this.convertAsset(reporter);
+            }
+            return reporter;
+        });
+    }
+    updateTsConfigFileUsedByTestTarget(targetName, target) {
+        if (!target.options?.tsConfig) {
+            this.logger.warn(`The "${targetName}" target does not have the "tsConfig" option configured. Skipping updating the tsConfig file.`);
+            return;
+        }
+        if (!this.tree.exists(target.options.tsConfig)) {
+            const originalTsConfigPath = this.originalProjectConfig.targets[targetName].options.tsConfig;
+            this.logger.warn(`The tsConfig file "${originalTsConfigPath}" specified in the "${targetName}" target could not be found. Skipping updating the tsConfig file.`);
+            return;
+        }
+        this.updateTsConfigFile(target.options.tsConfig, (0, js_1.getRootTsConfigPathInTree)(this.tree), (0, devkit_1.offsetFromRoot)(this.projectConfig.root));
+    }
+    handleRootProjectConfigFiles() {
+        const runner = this.getRunnerOption();
+        if (runner === 'karma') {
+            const karmaConfig = 'karma.conf.js';
+            if (this.tree.exists(karmaConfig)) {
+                this.logger.info('No "test" target was found, but a root Karma config file was found in the project root. The file will be moved to the new location.');
+                this.moveProjectRootFile(karmaConfig);
+            }
+        }
+        else {
+            const vitestConfigs = ['vitest.config.ts', 'vitest.config.js'];
+            for (const vitestConfig of vitestConfigs) {
+                if (this.tree.exists(vitestConfig)) {
+                    this.logger.info('No "test" target was found, but a root Vitest config file was found in the project root. The file will be moved to the new location.');
+                    this.moveProjectRootFile(vitestConfig);
+                    break;
+                }
+            }
+        }
+    }
+    getRunnerOption() {
+        for (const [, target] of this.targets) {
+            if (target.options?.runner) {
+                return target.options.runner;
+            }
+        }
+        return 'vitest';
+    }
+}
+exports.AngularBuildUnitTestMigrator = AngularBuildUnitTestMigrator;
+function determineRootFileType(projectConfig) {
+    const testTargets = Object.values(projectConfig.targets ?? {}).filter((target) => target.executor === '@angular/build:unit-test');
+    for (const target of testTargets) {
+        if (target.options?.runner === 'karma') {
+            return 'karma';
+        }
+    }
+    return undefined;
+}

package/src/generators/ng-add/migrators/builders/index.d.ts

@@ -1,3 +1,4 @@
+export * from './angular-build-unit-test.migrator';
 export * from './angular-devkit-karma.migrator';
 export * from './angular-devkit-ng-packagr.migrator';
 export * from './angular-eslint-lint.migrator';

package/src/generators/ng-add/migrators/builders/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":"AAAA,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/builders/index.ts"],"names":[],"mappings":"AAAA,cAAc,oCAAoC,CAAC;AACnD,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC"}

package/src/generators/ng-add/migrators/builders/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./angular-build-unit-test.migrator"), exports);
 tslib_1.__exportStar(require("./angular-devkit-karma.migrator"), exports);
 tslib_1.__exportStar(require("./angular-devkit-ng-packagr.migrator"), exports);
 tslib_1.__exportStar(require("./angular-eslint-lint.migrator"), exports);

package/src/generators/ng-add/migrators/projects/app.migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,IAAI,EAAE,MAAM,YAAY,CAAC;AAS5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,gBAAgB,GACjB,OAAO,GACP,KAAK,GACL,MAAM,GACN,WAAW,GACX,OAAO,GACP,QAAQ,GACR,UAAU,CAAC;AAkDf,qBAAa,WAAY,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAChE,OAAO,CAAC,WAAW,CAAc;gBAG/B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EACtC,MAAM,CAAC,EAAE,MAAM;IA0BF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9B,QAAQ,IAAI,gBAAgB;IAarC,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,iCAAiC;IAqBzC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,mBAAmB;IAoG3B,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,8BAA8B;IA+CtC,OAAO,CAAC,kCAAkC;IAsB1C,OAAO,CAAC,+BAA+B;IA2CvC,OAAO,CAAC,iCAAiC;IAyCzC,OAAO,CAAC,mCAAmC;IA4B3C,OAAO,CAAC,oCAAoC;CA0B7C"}
+{"version":3,"file":"app.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/app.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAuB,IAAI,EAAE,MAAM,YAAY,CAAC;AAS5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,KAAK,gBAAgB,GACjB,OAAO,GACP,KAAK,GACL,MAAM,GACN,WAAW,GACX,OAAO,GACP,QAAQ,GACR,UAAU,CAAC;AAmDf,qBAAa,WAAY,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAChE,OAAO,CAAC,WAAW,CAAc;gBAG/B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EACtC,MAAM,CAAC,EAAE,MAAM;IA0BF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB9B,QAAQ,IAAI,gBAAgB;IAarC,OAAO,CAAC,gBAAgB;IA8BxB,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,iCAAiC;IAqBzC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,mBAAmB;IAoG3B,OAAO,CAAC,oBAAoB;IAiB5B,OAAO,CAAC,8BAA8B;IA+CtC,OAAO,CAAC,kCAAkC;IAsB1C,OAAO,CAAC,+BAA+B;IA2CvC,OAAO,CAAC,iCAAiC;IAyCzC,OAAO,CAAC,mCAAmC;IA4B3C,OAAO,CAAC,oCAAoC;CA0B7C"}

package/src/generators/ng-add/migrators/projects/app.migrator.js

@@ -52,6 +52,7 @@ const supportedTargets = {
 };
 // TODO(leo): this will replace `supportedTargets` once the full refactor is done.
 const supportedBuilderMigrators = [
+    builders_1.AngularBuildUnitTestMigrator,
     builders_1.AngularDevkitKarmaMigrator,
     builders_1.AngularEslintLintMigrator,
 ];

package/src/generators/ng-add/migrators/projects/lib.migrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAQrD,qBAAa,WAAY,SAAQ,eAAe;gBAE5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EACtC,MAAM,CAAC,EAAE,MAAM;IAaF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,QAAQ,IAAI,gBAAgB;IAUrC,OAAO,CAAC,gBAAgB;YAIV,0BAA0B;CAuBzC"}
+{"version":3,"file":"lib.migrator.d.ts","sourceRoot":"","sources":["../../../../../../../../packages/angular/src/generators/ng-add/migrators/projects/lib.migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAE,MAAM,YAAY,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EACV,MAAM,EACN,6BAA6B,EAE7B,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AASzB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AASrD,qBAAa,WAAY,SAAQ,eAAe;gBAE5C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,gBAAgB,EACzB,OAAO,EAAE,6BAA6B,EACtC,MAAM,CAAC,EAAE,MAAM;IAaF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B,QAAQ,IAAI,gBAAgB;IAUrC,OAAO,CAAC,gBAAgB;YAIV,0BAA0B;CAuBzC"}

package/src/generators/ng-add/migrators/projects/lib.migrator.js

@@ -8,6 +8,7 @@ const builders_1 = require("../builders");
 const project_migrator_1 = require("./project.migrator");
 const supportedBuilderMigrators = [
     builders_1.AngularDevkitNgPackagrMigrator,
+    builders_1.AngularBuildUnitTestMigrator,
     builders_1.AngularDevkitKarmaMigrator,
     builders_1.AngularEslintLintMigrator,
 ];

package/src/generators/pipe/files/__fileName__.ts__tpl__

@@ -1,7 +1,7 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
-  name: '<%= selector %>'<% if (setStandalone) { %>,
+  name: '<%= selector %>'<% if (!standalone) { %>,
   standalone: <%= standalone %><% } %>
 })
 export class <%= symbolName %> implements PipeTransform {

package/src/generators/pipe/pipe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/pipe/pipe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAUvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBAkDjE;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"pipe.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/pipe/pipe.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AASvC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAEvC,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,iBA6CjE;AAED,eAAe,aAAa,CAAC"}