@nx/angular 22.3.0-canary.20251211-205daee → 22.3.0-canary.20251215-e864b6a

package/src/migrations/update-21-2-0/update-module-resolution.js

@@ -4,24 +4,37 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const targets_1 = require("../../utils/targets");
 const projects_1 = require("../utils/projects");
+// Common tsconfig file names to account for non-buildable libraries
+const KNOWN_TSCONFIG_FILES = [
+    'tsconfig.json',
+    'tsconfig.lib.json',
+    'tsconfig.spec.json',
+];
 async function default_1(tree) {
     const uniqueTsConfigs = new Set();
     const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
         'npm:@angular/core',
     ]);
     for (const graphNode of projects) {
+        const projectRoot = graphNode.data.root;
+        // Add existing known tsconfig files
+        for (const tsconfigName of KNOWN_TSCONFIG_FILES) {
+            const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, tsconfigName);
+            if (tree.exists(tsconfigPath)) {
+                uniqueTsConfigs.add(tsconfigPath);
+            }
+        }
         for (const [, target] of (0, targets_1.allProjectTargets)(graphNode.data)) {
             for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
-                if (typeof options?.tsConfig === 'string') {
+                if (typeof options?.tsConfig === 'string' &&
+                    tree.exists(options.tsConfig)) {
                     uniqueTsConfigs.add(options.tsConfig);
                 }
             }
         }
     }
     for (const tsConfig of uniqueTsConfigs) {
-        if (tree.exists(tsConfig)) {
-            updateModuleResolution(tree, tsConfig);
-        }
+        updateModuleResolution(tree, tsConfig);
     }
     await (0, devkit_1.formatFiles)(tree);
 }

package/src/migrations/update-22-3-0/update-angular-cli.d.ts

@@ -0,0 +1,4 @@
+import { type Tree } from '@nx/devkit';
+export declare const angularCliVersion = "~21.0.0";
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-angular-cli.d.ts.map

package/src/migrations/update-22-3-0/update-angular-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-angular-cli.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-angular-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C,yBAA+B,IAAI,EAAE,IAAI,iBAaxC"}

package/src/migrations/{update-16-4-0 → update-22-3-0}/update-angular-cli.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.angularCliVersion = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-exports.angularCliVersion = '~16.1.0';
+exports.angularCliVersion = '~21.0.0';
 async function default_1(tree) {
     const { devDependencies, dependencies } = (0, devkit_1.readJson)(tree, 'package.json');
     const hasAngularCli = devDependencies?.['@angular/cli'] || dependencies?.['@angular/cli'];

package/src/migrations/update-22-3-0/update-module-resolution.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-module-resolution.d.ts.map

package/src/migrations/update-22-3-0/update-module-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-module-resolution.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-module-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAoBpB,yBAA+B,IAAI,EAAE,IAAI,iBAuCxC"}

package/src/migrations/update-22-3-0/update-module-resolution.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
+const targets_1 = require("../../utils/targets");
+const projects_1 = require("../utils/projects");
+// Common tsconfig file names to account for non-buildable libraries
+const KNOWN_TSCONFIG_FILES = [
+    'tsconfig.json',
+    'tsconfig.lib.json',
+    'tsconfig.spec.json',
+];
+async function default_1(tree) {
+    const uniqueTsConfigs = new Set();
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@angular/core',
+    ]);
+    for (const graphNode of projects) {
+        const projectRoot = graphNode.data.root;
+        // Add existing known tsconfig files
+        for (const tsconfigName of KNOWN_TSCONFIG_FILES) {
+            const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, tsconfigName);
+            if (tree.exists(tsconfigPath)) {
+                uniqueTsConfigs.add(tsconfigPath);
+            }
+        }
+        for (const [, target] of (0, targets_1.allProjectTargets)(graphNode.data)) {
+            for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
+                if (typeof options?.tsConfig === 'string' &&
+                    tree.exists(options.tsConfig) &&
+                    // Exclude tsconfig.server.json - handled by update-ssr-webpack-config migration
+                    !options.tsConfig.endsWith('tsconfig.server.json')) {
+                    uniqueTsConfigs.add(options.tsConfig);
+                }
+            }
+        }
+    }
+    for (const tsConfig of uniqueTsConfigs) {
+        updateModuleAndModuleResolution(tree, tsConfig);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function updateModuleAndModuleResolution(tree, tsConfigPath) {
+    const ts = (0, ensure_typescript_1.ensureTypescript)();
+    // Read the resolved compiler options from the tsconfig
+    const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
+    // Check if both module and moduleResolution are already set correctly
+    if (compilerOptions.module === ts.ModuleKind.Preserve &&
+        compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
+        return;
+    }
+    // Ensure both module and moduleResolution are set to the correct values
+    (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.module = 'preserve';
+        json.compilerOptions.moduleResolution = 'bundler';
+        return json;
+    });
+}

package/src/migrations/update-22-3-0/update-ssr-webpack-config.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-ssr-webpack-config.d.ts.map

package/src/migrations/update-22-3-0/update-ssr-webpack-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-ssr-webpack-config.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-ssr-webpack-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAqBpB,yBAA+B,IAAI,EAAE,IAAI,iBAoExC"}

package/src/migrations/update-22-3-0/update-ssr-webpack-config.js

@@ -0,0 +1,111 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
+const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
+const file_change_recorder_1 = require("../../utils/file-change-recorder");
+const targets_1 = require("../../utils/targets");
+const projects_1 = require("../utils/projects");
+const serverExecutors = new Set([
+    '@angular-devkit/build-angular:server',
+    '@nx/angular:webpack-server',
+]);
+let ts;
+async function default_1(tree) {
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@angular/ssr',
+    ]);
+    // Map project root → {tsConfigPath, serverFiles[]}
+    const projectFilesMap = new Map();
+    // First pass: collect files grouped by project
+    for (const { data: project } of projects) {
+        if (project.projectType !== 'application') {
+            continue;
+        }
+        for (const target of Object.values(project.targets ?? {})) {
+            if (!serverExecutors.has(target.executor)) {
+                continue;
+            }
+            const tsConfigServerPath = (0, devkit_1.joinPathFragments)(project.root, 'tsconfig.server.json');
+            if (!tree.exists(tsConfigServerPath)) {
+                continue;
+            }
+            // Get or create entry for this project
+            let projectEntry = projectFilesMap.get(project.root);
+            if (!projectEntry) {
+                projectEntry = {
+                    tsConfigPath: tsConfigServerPath,
+                    serverFiles: new Set(),
+                };
+                projectFilesMap.set(project.root, projectEntry);
+            }
+            // Collect server files for this project
+            for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
+                if (options?.main && tree.exists(options.main)) {
+                    projectEntry.serverFiles.add(options.main);
+                }
+            }
+        }
+    }
+    if (projectFilesMap.size === 0) {
+        return;
+    }
+    // Second pass: process each project
+    ts = (0, ensure_typescript_1.ensureTypescript)();
+    for (const { tsConfigPath, serverFiles } of projectFilesMap.values()) {
+        const wasUpdated = updateTsConfigServer(tree, tsConfigPath);
+        // Only update server files if tsconfig was actually modified
+        if (wasUpdated) {
+            for (const serverFile of serverFiles) {
+                updateServerImports(tree, serverFile);
+            }
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function updateTsConfigServer(tree, tsConfigPath) {
+    const compilerOptions = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
+    if (compilerOptions.module === ts.ModuleKind.Preserve &&
+        compilerOptions.moduleResolution === ts.ModuleResolutionKind.Bundler) {
+        // Already configured correctly, skip
+        return false;
+    }
+    (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+        json.compilerOptions ??= {};
+        json.compilerOptions.module = 'preserve';
+        json.compilerOptions.moduleResolution = 'bundler';
+        return json;
+    });
+    return true;
+}
+function updateServerImports(tree, serverFilePath) {
+    const content = tree.read(serverFilePath, 'utf-8');
+    const sourceFile = ts.createSourceFile(serverFilePath, content, ts.ScriptTarget.Latest, true);
+    const allImportDeclarations = sourceFile.statements.filter(ts.isImportDeclaration);
+    if (allImportDeclarations.length === 0) {
+        return;
+    }
+    let recorder;
+    // Find namespace imports (import * as X from 'Y')
+    for (const importDecl of allImportDeclarations) {
+        if (!ts.isStringLiteral(importDecl.moduleSpecifier)) {
+            continue;
+        }
+        const namedBindings = importDecl.importClause?.namedBindings;
+        // Check if this is a namespace import (import * as X) and there's no
+        // default import (e.g., "import express, * as types from 'express'")
+        if (namedBindings &&
+            ts.isNamespaceImport(namedBindings) &&
+            !importDecl.importClause?.name) {
+            const importName = namedBindings.name.text;
+            const moduleSpecifier = importDecl.moduleSpecifier.text;
+            recorder ??= new file_change_recorder_1.FileChangeRecorder(tree, serverFilePath);
+            // import * as express from 'express' -> import express from 'express'
+            recorder.replace(importDecl, `import ${importName} from '${moduleSpecifier}';`);
+        }
+    }
+    if (recorder) {
+        recorder.applyChanges();
+    }
+}

package/src/migrations/update-22-3-0/update-typescript-lib.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-typescript-lib.d.ts.map

package/src/migrations/update-22-3-0/update-typescript-lib.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-typescript-lib.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-typescript-lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAkBpB,yBAA+B,IAAI,EAAE,IAAI,iBAqCxC"}

package/src/migrations/update-22-3-0/update-typescript-lib.js

@@ -0,0 +1,98 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const tsconfig_utils_1 = require("../../generators/utils/tsconfig-utils");
+const targets_1 = require("../../utils/targets");
+const projects_1 = require("../utils/projects");
+// Common tsconfig file names to account for non-buildable libraries
+const KNOWN_TSCONFIG_FILES = [
+    'tsconfig.json',
+    'tsconfig.lib.json',
+    'tsconfig.spec.json',
+];
+async function default_1(tree) {
+    const uniqueTsConfigs = new Set();
+    const projects = await (0, projects_1.getProjectsFilteredByDependencies)([
+        'npm:@angular/core',
+    ]);
+    for (const graphNode of projects) {
+        const projectRoot = graphNode.data.root;
+        // Add existing known tsconfig files
+        for (const tsconfigName of KNOWN_TSCONFIG_FILES) {
+            const tsconfigPath = (0, devkit_1.joinPathFragments)(projectRoot, tsconfigName);
+            if (tree.exists(tsconfigPath)) {
+                uniqueTsConfigs.add(tsconfigPath);
+            }
+        }
+        for (const [, target] of (0, targets_1.allProjectTargets)(graphNode.data)) {
+            for (const [, options] of (0, targets_1.allTargetOptions)(target)) {
+                if (typeof options?.tsConfig === 'string' &&
+                    tree.exists(options.tsConfig)) {
+                    uniqueTsConfigs.add(options.tsConfig);
+                }
+            }
+        }
+    }
+    for (const tsConfig of uniqueTsConfigs) {
+        updateTypeScriptLib(tree, tsConfig);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function updateTypeScriptLib(tree, tsConfigPath) {
+    // Read resolved compiler options (includes extends chain)
+    const { lib: resolvedLib } = (0, tsconfig_utils_1.readCompilerOptionsFromTsConfig)(tree, tsConfigPath);
+    // Check if already correct
+    if (!resolvedLib || !Array.isArray(resolvedLib)) {
+        return; // No lib to update
+    }
+    // Normalize lib entries from TypeScript's full format (e.g., 'lib.es2020.d.ts')
+    const normalizedResolvedLib = resolvedLib.map((l) => typeof l === 'string' ? normalizeLibEntry(l) : l);
+    const esLibs = normalizedResolvedLib.filter((l) => typeof l === 'string' && l.toLowerCase().startsWith('es'));
+    if (esLibs.length === 0) {
+        return; // No ES libs to update
+    }
+    const esLibToVersion = new Map();
+    for (const l of esLibs) {
+        const version = l.toLowerCase().match(/^es(next|(\d+))$/)?.[1];
+        if (version) {
+            // Use lowercase key for case-insensitive comparison
+            esLibToVersion.set(l.toLowerCase(), version === 'next' ? Infinity : Number(version));
+        }
+    }
+    if (esLibToVersion.size === 0) {
+        return;
+    }
+    const latestVersion = Math.max(...esLibToVersion.values());
+    // Only upgrade if ES version is strictly less than 2022
+    if (latestVersion < 2022) {
+        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+            json.compilerOptions ??= {};
+            const directLib = json.compilerOptions.lib;
+            const sourceLib = directLib && Array.isArray(directLib)
+                ? directLib
+                : normalizedResolvedLib;
+            // Filter out old ES versions (case-insensitive) and add ES2022
+            const otherLibs = sourceLib.filter((l) => {
+                if (typeof l === 'string') {
+                    return !esLibToVersion.has(l.toLowerCase());
+                }
+                return true;
+            });
+            json.compilerOptions.lib = [...otherLibs, 'es2022'];
+            return json;
+        });
+    }
+}
+/**
+ * Normalize lib entry from TypeScript's full format (e.g., 'lib.es2020.d.ts')
+ * to the shorthand format (e.g., 'es2020')
+ */
+function normalizeLibEntry(lib) {
+    // TypeScript's parseJsonConfigFileContent returns full lib file names like 'lib.es2020.d.ts'
+    // We need to extract just 'es2020' from it
+    if (lib.startsWith('lib.') && lib.endsWith('.d.ts')) {
+        return lib.slice(4, -5); // Remove 'lib.' prefix and '.d.ts' suffix
+    }
+    return lib;
+}

package/src/migrations/update-22-3-0/update-unit-test-runner-option.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;
+//# sourceMappingURL=update-unit-test-runner-option.d.ts.map

package/src/migrations/update-22-3-0/update-unit-test-runner-option.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-unit-test-runner-option.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-22-3-0/update-unit-test-runner-option.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAU9E,yBAA+B,IAAI,EAAE,IAAI,iBAkBxC"}

package/src/migrations/update-22-3-0/update-unit-test-runner-option.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const ANGULAR_GENERATORS = [
+    'application',
+    'library',
+    'host',
+    'remote',
+    'federate-module',
+];
+async function default_1(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson?.generators) {
+        return;
+    }
+    let updated = false;
+    for (const generator of ANGULAR_GENERATORS) {
+        if (updateGeneratorDefault(nxJson.generators, '@nx/angular', generator)) {
+            updated = true;
+        }
+    }
+    if (updated) {
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+        await (0, devkit_1.formatFiles)(tree);
+    }
+}
+function updateGeneratorDefault(generators, collection, generator) {
+    const generatorKey = `${collection}:${generator}`;
+    // Check "@nx/angular:application" format
+    const flatConfig = generators[generatorKey];
+    if (flatConfig?.unitTestRunner === 'vitest') {
+        flatConfig.unitTestRunner = 'vitest-analog';
+        return true;
+    }
+    // Check { "@nx/angular": { "application": {...} } } format
+    const nestedConfig = generators[collection];
+    const generatorConfig = nestedConfig?.[generator];
+    if (generatorConfig?.unitTestRunner === 'vitest') {
+        generatorConfig.unitTestRunner = 'vitest-analog';
+        return true;
+    }
+    return false;
+}

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAiDF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAqB7D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAOD,KAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,2BAA2B,GAAG;IACxC,WAAW,EAAE,aAAa,GAAG,SAAS,CAAC;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CACtD,CAAC;AAkDF,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,oBAAoB,CAqB7D,CAAC"}

package/src/plugins/plugin.js

@@ -11,6 +11,7 @@ const node_path_1 = require("node:path");
 const posix = tslib_1.__importStar(require("node:path/posix"));
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
+const targets_1 = require("../utils/targets");
 const knownExecutors = {
     appShell: new Set(['@angular-devkit/build-angular:app-shell']),
     build: new Set([
@@ -41,6 +42,7 @@ const knownExecutors = {
     test: new Set([
         '@angular-devkit/build-angular:karma',
         '@angular/build:karma',
+        '@angular/build:unit-test',
     ]),
 };
 const pmc = (0, devkit_1.getPackageManagerCommand)();
@@ -132,7 +134,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
                 };
             }
             else if (knownExecutors.test.has(angularTarget.builder)) {
-                updateTestTarget(targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs, externalDependencies);
+                updateTestTarget(projectName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs, externalDependencies);
             }
             else if (knownExecutors.server.has(angularTarget.builder)) {
                 updateServerTarget(targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs);
@@ -236,15 +238,31 @@ async function updateBuildTarget(projectName, targetName, target, angularTarget,
         target.metadata.help.example.options = { localize: true };
     }
 }
-function updateTestTarget(target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs, externalDependencies) {
+function updateTestTarget(projectName, target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs, externalDependencies) {
     target.cache = true;
     target.inputs =
         'production' in namedInputs
             ? ['default', '^production']
             : ['default', '^default'];
-    target.outputs = getKarmaTargetOutputs(angularTarget, angularWorkspaceRoot, projectRoot, context);
-    externalDependencies.push('karma');
-    target.metadata.help.example.options = { codeCoverage: true };
+    const isKarmaRunner = angularTarget.builder === '@angular-devkit/build-angular:karma' ||
+        angularTarget.builder === '@angular/build:karma' ||
+        angularTarget.options?.runner === 'karma';
+    if (isKarmaRunner) {
+        target.outputs = getKarmaTargetOutputs(angularTarget, angularWorkspaceRoot, projectRoot, context);
+        externalDependencies.push('karma');
+    }
+    else {
+        externalDependencies.push('vitest');
+        // this is currently hard-coded in the vitest executor
+        // https://github.com/angular/angular-cli/blob/5cc8c8479a3f6959f2834145b5163ef2245c2f31/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts#L280
+        target.outputs = [`{workspaceRoot}/coverage/${projectName}`];
+    }
+    if (angularTarget.builder === '@angular/build:unit-test') {
+        target.metadata.help.example.options = { coverage: true };
+    }
+    else {
+        target.metadata.help.example.options = { codeCoverage: true };
+    }
 }
 function updateServerTarget(target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs) {
     target.metadata.help.example.options = { localize: true };
@@ -321,13 +339,25 @@ async function getNgPackagrOutputs(target, angularWorkspaceRoot, projectRoot, co
 }
 function getKarmaTargetOutputs(target, angularWorkspaceRoot, projectRoot, context) {
     const defaultOutput = posix.join('{workspaceRoot}', angularWorkspaceRoot, 'coverage/{projectName}');
-    if (!target.options?.karmaConfig) {
+    let karmaConfigPath;
+    if (target.builder === '@angular/build:unit-test') {
+        karmaConfigPath =
+            typeof target.options?.runnerConfig === 'string'
+                ? target.options?.runnerConfig
+                : target.options?.runnerConfig === true
+                    ? 'karma.conf.js'
+                    : undefined;
+    }
+    else {
+        karmaConfigPath = target.options?.karmaConfig;
+    }
+    if (!karmaConfigPath) {
         return [defaultOutput];
     }
     try {
         const { parseConfig } = require('karma/lib/config');
-        const karmaConfigPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, projectRoot, target.options.karmaConfig);
-        const config = parseConfig(karmaConfigPath);
+        const karmaConfigFullPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, projectRoot, karmaConfigPath);
+        const config = parseConfig(karmaConfigFullPath);
         if (config.coverageReporter.dir) {
             return [
                 getOutput(config.coverageReporter.dir, context.workspaceRoot, angularWorkspaceRoot, projectRoot),
@@ -370,14 +400,14 @@ function extractBrowserAndServerTargets(angularJson, projectName, targetName) {
             browserTargetSpecifier = configuration?.browserTarget;
         }
         if (browserTargetSpecifier) {
-            browserTarget = targetFromTargetString(browserTargetSpecifier, projectName, targetName);
+            browserTarget = (0, targets_1.targetFromTargetString)(browserTargetSpecifier, projectName, targetName);
         }
         let serverTargetSpecifier = target.options?.serverTarget;
         if (!serverTargetSpecifier) {
             serverTargetSpecifier = Object.values(target.configurations ?? {}).find((config) => !!config.serverTarget)?.serverTarget;
         }
         if (serverTargetSpecifier) {
-            serverTarget = targetFromTargetString(serverTargetSpecifier, projectName, targetName);
+            serverTarget = (0, targets_1.targetFromTargetString)(serverTargetSpecifier, projectName, targetName);
         }
     }
     catch { }
@@ -404,20 +434,6 @@ function mergeInputs(...inputs) {
             : []),
     ];
 }
-// angular support abbreviated target specifiers, this is adapter from:
-// https://github.com/angular/angular-cli/blob/7d9ce246a33c60ec96eb4bf99520f5475716a910/packages/angular_devkit/architect/src/api.ts#L336
-function targetFromTargetString(specifier, abbreviatedProjectName, abbreviatedTargetName) {
-    const tuple = specifier.split(':', 3);
-    if (tuple.length < 2) {
-        // invalid target, ignore
-        return undefined;
-    }
-    // we only care about project and target
-    return {
-        project: tuple[0] || abbreviatedProjectName || '',
-        target: tuple[1] || abbreviatedTargetName || '',
-    };
-}
 function getOutput(path, workspaceRoot, angularWorkspaceRoot, projectRoot) {
     const relativePath = (0, node_path_1.relative)((0, node_path_1.join)(workspaceRoot, angularWorkspaceRoot, projectRoot), path);
     if (relativePath.startsWith('..')) {

package/src/utils/backward-compatible-versions.d.ts

@@ -1,14 +1,12 @@
 import * as latestVersions from './versions';
-type SupportedVersions = 'angularV18' | 'angularV19';
-type LatestPackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
-type CompatPackageVersionNames = LatestPackageVersionNames;
-export type PackageVersionNames = LatestPackageVersionNames | CompatPackageVersionNames;
+export declare const supportedVersions: readonly [21, 20, 19];
+export type SupportedVersion = (typeof supportedVersions)[number];
+export type PackageVersionNames = Exclude<keyof typeof latestVersions, 'nxVersion'>;
 export type VersionMap = {
-    angularV18: Record<CompatPackageVersionNames, string>;
-    angularV19: Record<CompatPackageVersionNames | 'angularRspackVersion', string>;
+    21: Record<PackageVersionNames, string>;
+    20: Record<PackageVersionNames, string>;
+    19: Record<PackageVersionNames | 'angularRspackVersion', string>;
 };
-export type PackageLatestVersions = Record<LatestPackageVersionNames, string>;
-export type PackageCompatVersions = VersionMap[SupportedVersions];
+export type PackageCompatVersions = VersionMap[SupportedVersion];
 export declare const backwardCompatibleVersions: VersionMap;
-export {};
 //# sourceMappingURL=backward-compatible-versions.d.ts.map

package/src/utils/backward-compatible-versions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backward-compatible-versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/backward-compatible-versions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,YAAY,CAAC;AAE7C,KAAK,iBAAiB,GAAG,YAAY,GAAG,YAAY,CAAC;AAErD,KAAK,yBAAyB,GAAG,OAAO,CACtC,MAAM,OAAO,cAAc,EAC3B,WAAW,CACZ,CAAC;AACF,KAAK,yBAAyB,GAAG,yBAAyB,CAAC;AAE3D,MAAM,MAAM,mBAAmB,GAC3B,yBAAyB,GACzB,yBAAyB,CAAC;AAE9B,MAAM,MAAM,UAAU,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;IACtD,UAAU,EAAE,MAAM,CAChB,yBAAyB,GAAG,sBAAsB,EAClD,MAAM,CACP,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC;AAC9E,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;AAElE,eAAO,MAAM,0BAA0B,EAAE,UA8DxC,CAAC"}
+{"version":3,"file":"backward-compatible-versions.d.ts","sourceRoot":"","sources":["../../../../../packages/angular/src/utils/backward-compatible-versions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,cAAc,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,iBAAiB,uBAAwB,CAAC;AACvD,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,MAAM,MAAM,mBAAmB,GAAG,OAAO,CACvC,MAAM,OAAO,cAAc,EAC3B,WAAW,CACZ,CAAC;AACF,MAAM,MAAM,UAAU,GAAG;IACvB,EAAE,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IACxC,EAAE,EAAE,MAAM,CAAC,mBAAmB,EAAE,MAAM,CAAC,CAAC;IACxC,EAAE,EAAE,MAAM,CAAC,mBAAmB,GAAG,sBAAsB,EAAE,MAAM,CAAC,CAAC;CAClE,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;AAEjE,eAAO,MAAM,0BAA0B,EAAE,UAiExC,CAAC"}

package/src/utils/backward-compatible-versions.js

@@ -1,24 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.backwardCompatibleVersions = void 0;
+exports.backwardCompatibleVersions = exports.supportedVersions = void 0;
+const tslib_1 = require("tslib");
+const latestVersions = tslib_1.__importStar(require("./versions"));
+exports.supportedVersions = [21, 20, 19];
 exports.backwardCompatibleVersions = {
-    angularV18: {
-        angularVersion: '~18.2.0',
-        angularDevkitVersion: '~18.2.0',
-        ngPackagrVersion: '~18.2.0',
-        ngrxVersion: '~18.0.2',
+    21: { ...latestVersions },
+    20: {
+        angularVersion: '~20.3.0',
+        angularDevkitVersion: '~20.3.0',
+        ngPackagrVersion: '~20.3.0',
+        ngrxVersion: '^20.0.0',
         rxjsVersion: '~7.8.0',
-        zoneJsVersion: '~0.14.3',
-        angularJsVersion: '1.7.9',
+        zoneJsVersion: '~0.15.0',
         tsLibVersion: '^2.3.0',
         corsVersion: '~2.8.5',
         typesCorsVersion: '~2.8.5',
         expressVersion: '^4.21.2',
         typesExpressVersion: '^4.17.21',
         browserSyncVersion: '^3.0.0',
-        moduleFederationNodeVersion: '~2.5.0',
-        moduleFederationEnhancedVersion: '0.6.9',
-        angularEslintVersion: '^18.3.0',
+        moduleFederationNodeVersion: '^2.7.21',
+        moduleFederationEnhancedVersion: '^0.21.2',
+        angularEslintVersion: '^20.3.0',
         typescriptEslintVersion: '^7.16.0',
         tailwindVersion: '^3.0.2',
         postcssVersion: '^8.4.5',
@@ -26,13 +29,15 @@ exports.backwardCompatibleVersions = {
         autoprefixerVersion: '^10.4.0',
         tsNodeVersion: '10.9.1',
         lessVersion: '^4.3.0',
-        jestPresetAngularVersion: '~14.1.0',
+        jestPresetAngularVersion: '~14.6.1',
         typesNodeVersion: '20.19.9',
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
         webpackMergeVersion: '^5.8.0',
+        vitestVersion: '^3.1.1',
+        jsdomVersion: '~22.1.0',
     },
-    angularV19: {
+    19: {
         angularVersion: '~19.2.0',
         angularDevkitVersion: '~19.2.0',
         ngPackagrVersion: '~19.2.0',
@@ -40,7 +45,6 @@ exports.backwardCompatibleVersions = {
         ngrxVersion: '~19.1.0',
         rxjsVersion: '~7.8.0',
         zoneJsVersion: '~0.15.0',
-        angularJsVersion: '1.7.9',
         tsLibVersion: '^2.3.0',
         corsVersion: '~2.8.5',
         typesCorsVersion: '~2.8.5',
@@ -62,5 +66,7 @@ exports.backwardCompatibleVersions = {
         jasmineMarblesVersion: '^0.9.2',
         jsoncEslintParserVersion: '^2.1.0',
         webpackMergeVersion: '^5.8.0',
+        vitestVersion: '^3.1.1',
+        jsdomVersion: '~22.1.0',
     },
 };