@nx/angular 22.4.0-beta.3 → 22.4.0-beta.4

package/migrations.json

@@ -2170,6 +2170,77 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "22.4.0": {
+      "version": "22.4.0-beta.4",
+      "x-prompt": "Do you want to update the Angular version to v21.1?",
+      "requires": {
+        "@angular/core": ">=21.0.0 <21.1.0"
+      },
+      "packages": {
+        "@angular/cli": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false,
+          "ignorePackageGroup": true,
+          "ignoreMigrations": true
+        },
+        "@angular-devkit/build-angular": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/core": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/schematics": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/build": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/pwa": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/ssr": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@schematics/angular": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/architect": {
+          "version": "~0.2101.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular-devkit/build-webpack": {
+          "version": "~0.2101.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/core": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": true
+        },
+        "@angular/material": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/cdk": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@angular/google-maps": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        },
+        "ng-packagr": {
+          "version": "~21.1.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.4.0-beta.3",
+  "version": "22.4.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for Angular contains executors, generators, and utilities for managing Angular applications and libraries within an Nx workspace. It provides: \n\n- Integration with libraries such as Storybook, Jest, ESLint, Tailwind CSS, Playwright and Cypress. \n\n- Generators to help scaffold code quickly (like: Micro Frontends, Libraries, both internal to your codebase and publishable to npm) \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -62,14 +62,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.4.0-beta.3",
-    "@nx/eslint": "22.4.0-beta.3",
-    "@nx/js": "22.4.0-beta.3",
-    "@nx/module-federation": "22.4.0-beta.3",
-    "@nx/rspack": "22.4.0-beta.3",
-    "@nx/web": "22.4.0-beta.3",
-    "@nx/webpack": "22.4.0-beta.3",
-    "@nx/workspace": "22.4.0-beta.3",
+    "@nx/devkit": "22.4.0-beta.4",
+    "@nx/eslint": "22.4.0-beta.4",
+    "@nx/js": "22.4.0-beta.4",
+    "@nx/module-federation": "22.4.0-beta.4",
+    "@nx/rspack": "22.4.0-beta.4",
+    "@nx/web": "22.4.0-beta.4",
+    "@nx/webpack": "22.4.0-beta.4",
+    "@nx/workspace": "22.4.0-beta.4",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/executors/unit-test/schema.json

@@ -68,8 +68,7 @@
     },
     "ui": {
       "type": "boolean",
-      "description": "Enables the Vitest UI for interactive test execution. This option is only available for the Vitest runner.",
-      "default": false
+      "description": "Enables the Vitest UI for interactive test execution. This option is only available for the Vitest runner."
     },
     "coverage": {
       "type": "boolean",

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;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"}
+{"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;AAYpB,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

@@ -12,6 +12,7 @@ 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 vitest_1 = require("./utils/vitest");
 const knownExecutors = {
     appShell: new Set(['@angular-devkit/build-angular:app-shell']),
     build: new Set([
@@ -134,7 +135,7 @@ async function buildAngularProjects(configFilePath, options, angularWorkspaceRoo
                 };
             }
             else if (knownExecutors.test.has(angularTarget.builder)) {
-                updateTestTarget(projectName, targets[nxTargetName], angularTarget, context, angularWorkspaceRoot, project.root, namedInputs, externalDependencies);
+                await 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);
@@ -238,7 +239,7 @@ async function updateBuildTarget(projectName, targetName, target, angularTarget,
         target.metadata.help.example.options = { localize: true };
     }
 }
-function updateTestTarget(projectName, target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs, externalDependencies) {
+async function updateTestTarget(projectName, target, angularTarget, context, angularWorkspaceRoot, projectRoot, namedInputs, externalDependencies) {
     target.cache = true;
     target.inputs =
         'production' in namedInputs
@@ -252,10 +253,8 @@ function updateTestTarget(projectName, target, angularTarget, context, angularWo
         externalDependencies.push('karma');
     }
     else {
+        target.outputs = await getVitestTargetOutputs(angularTarget, angularWorkspaceRoot, projectRoot, context);
         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 };
@@ -369,6 +368,86 @@ function getKarmaTargetOutputs(target, angularWorkspaceRoot, projectRoot, contex
     }
     return [defaultOutput];
 }
+function normalizeVitestOutputPath(outputPath, workspaceRoot, angularWorkspaceRoot, projectRoot) {
+    const fullPath = (0, node_path_1.isAbsolute)(outputPath)
+        ? outputPath
+        : (0, node_path_1.join)(workspaceRoot, angularWorkspaceRoot, projectRoot, outputPath);
+    return getOutput(fullPath, workspaceRoot, angularWorkspaceRoot, projectRoot);
+}
+async function getVitestTargetOutputs(target, angularWorkspaceRoot, projectRoot, context) {
+    // https://github.com/angular/angular-cli/blob/d9cd609c5d13fe492b1f31973d9be518f8529387/packages/angular/build/src/builders/unit-test/runners/vitest/plugins.ts#L365
+    const defaultOutput = posix.join('{workspaceRoot}', angularWorkspaceRoot, 'coverage/{projectName}');
+    const outputs = [];
+    try {
+        const runnerConfig = target.options?.runnerConfig;
+        let vitestConfigPath = false;
+        if (typeof runnerConfig === 'string') {
+            vitestConfigPath = (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, projectRoot, runnerConfig);
+        }
+        else if (runnerConfig === true) {
+            vitestConfigPath = await (0, vitest_1.findVitestBaseConfig)([
+                (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot, projectRoot),
+                (0, node_path_1.join)(context.workspaceRoot, angularWorkspaceRoot),
+            ]);
+        }
+        let vitestConfig;
+        if (vitestConfigPath) {
+            const { resolveConfig } = await (0, vitest_1.loadVite)();
+            vitestConfig = await resolveConfig({ configFile: vitestConfigPath, mode: 'development' }, 'build');
+        }
+        // coverage.reportsDirectory from config
+        const configReportsDir = vitestConfig?.test?.coverage?.reportsDirectory;
+        if (configReportsDir) {
+            outputs.push(normalizeVitestOutputPath(configReportsDir, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+        }
+        else {
+            outputs.push(defaultOutput);
+        }
+        // outputFile - executor wins over config
+        if (target.options?.outputFile) {
+            outputs.push(normalizeVitestOutputPath(target.options.outputFile, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+        }
+        else {
+            const configOutputFile = vitestConfig?.test
+                ?.outputFile;
+            if (typeof configOutputFile === 'string') {
+                outputs.push(normalizeVitestOutputPath(configOutputFile, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+            }
+            else if (typeof configOutputFile === 'object' && configOutputFile) {
+                for (const path of Object.values(configOutputFile)) {
+                    if (typeof path === 'string') {
+                        outputs.push(normalizeVitestOutputPath(path, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+                    }
+                }
+            }
+        }
+        // reporters outputFile - executor wins over config
+        if (Array.isArray(target.options?.reporters)) {
+            for (const reporter of target.options.reporters) {
+                if (Array.isArray(reporter) && reporter[1]?.outputFile) {
+                    outputs.push(normalizeVitestOutputPath(reporter[1].outputFile, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+                }
+            }
+        }
+        else {
+            const configReporters = vitestConfig?.test
+                ?.reporters;
+            if (Array.isArray(configReporters)) {
+                for (const reporter of configReporters) {
+                    if (Array.isArray(reporter) &&
+                        reporter[1]?.outputFile) {
+                        outputs.push(normalizeVitestOutputPath(reporter[1].outputFile, context.workspaceRoot, angularWorkspaceRoot, projectRoot));
+                    }
+                }
+            }
+        }
+    }
+    catch {
+        // Silent fallback to defaults on any error
+    }
+    const uniqueOutputs = [...new Set(outputs)];
+    return uniqueOutputs.length > 0 ? uniqueOutputs : [defaultOutput];
+}
 function getBrowserAndServerTargetInputsAndOutputs(projectName, targetName, projects, angularJson) {
     const { browserTarget, serverTarget } = extractBrowserAndServerTargets(angularJson, projectName, targetName);
     if (!browserTarget || !serverTarget) {

package/src/plugins/utils/vitest.d.ts

@@ -0,0 +1,3 @@
+export declare function loadVite(): Promise<typeof import('vite')>;
+export declare function findVitestBaseConfig(searchDirs: string[]): Promise<string | false>;
+//# sourceMappingURL=vitest.d.ts.map

package/src/plugins/utils/vitest.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/plugins/utils/vitest.ts"],"names":[],"mappings":"AAaA,wBAAgB,QAAQ,IAAI,OAAO,CAAC,cAAc,MAAM,CAAC,CAAC,CAEzD;AAED,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAAE,GACnB,OAAO,CAAC,MAAM,GAAG,KAAK,CAAC,CAiBzB"}

package/src/plugins/utils/vitest.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadVite = loadVite;
+exports.findVitestBaseConfig = findVitestBaseConfig;
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
+// https://github.com/angular/angular-cli/blob/03b86fe28e34c489b91858614236dd14e2cb9985/packages/angular/build/src/builders/unit-test/runners/vitest/configuration.ts#L17-L28
+const VITEST_CONFIG_FILES = [
+    'vitest-base.config.ts',
+    'vitest-base.config.mts',
+    'vitest-base.config.cts',
+    'vitest-base.config.js',
+    'vitest-base.config.mjs',
+    'vitest-base.config.cjs',
+];
+function loadVite() {
+    return Function('return import("vite")')();
+}
+async function findVitestBaseConfig(searchDirs) {
+    for (const dir of searchDirs) {
+        try {
+            const entries = await (0, promises_1.readdir)(dir, { withFileTypes: true });
+            const files = new Set(entries.filter((e) => e.isFile()).map((e) => e.name));
+            for (const configFile of VITEST_CONFIG_FILES) {
+                if (files.has(configFile)) {
+                    return (0, node_path_1.join)(dir, configFile);
+                }
+            }
+        }
+        catch {
+            // Ignore directories that cannot be read
+        }
+    }
+    return false;
+}

package/src/utils/versions.d.ts

@@ -1,7 +1,7 @@
 export declare const nxVersion: any;
-export declare const angularVersion = "~21.0.0";
-export declare const angularDevkitVersion = "~21.0.0";
-export declare const ngPackagrVersion = "~21.0.0";
+export declare const angularVersion = "~21.1.0";
+export declare const angularDevkitVersion = "~21.1.0";
+export declare const ngPackagrVersion = "~21.1.0";
 export declare const ngrxVersion = "^21.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";

package/src/utils/versions.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jsoncEslintParserVersion = exports.jsdomVersion = exports.vitestVersion = exports.jasmineMarblesVersion = exports.typesNodeVersion = exports.jestPresetAngularVersion = exports.lessVersion = exports.tsNodeVersion = exports.autoprefixerVersion = exports.postcssUrlVersion = exports.postcssVersion = exports.tailwindVersion = exports.typescriptEslintVersion = exports.angularEslintVersion = exports.webpackMergeVersion = exports.moduleFederationEnhancedVersion = exports.moduleFederationNodeVersion = exports.browserSyncVersion = exports.typesExpressVersion = exports.expressVersion = exports.typesCorsVersion = exports.corsVersion = exports.tsLibVersion = exports.zoneJsVersion = exports.rxjsVersion = exports.ngrxVersion = exports.ngPackagrVersion = exports.angularDevkitVersion = exports.angularVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.angularVersion = '~21.0.0';
-exports.angularDevkitVersion = '~21.0.0';
-exports.ngPackagrVersion = '~21.0.0';
+exports.angularVersion = '~21.1.0';
+exports.angularDevkitVersion = '~21.1.0';
+exports.ngPackagrVersion = '~21.1.0';
 exports.ngrxVersion = '^21.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';