@nx/angular 22.2.2 → 22.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.2.2",
+  "version": "22.2.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.2.2",
-    "@nx/eslint": "22.2.2",
-    "@nx/js": "22.2.2",
-    "@nx/module-federation": "22.2.2",
-    "@nx/rspack": "22.2.2",
-    "@nx/web": "22.2.2",
-    "@nx/webpack": "22.2.2",
-    "@nx/workspace": "22.2.2",
+    "@nx/devkit": "22.2.4",
+    "@nx/eslint": "22.2.4",
+    "@nx/js": "22.2.4",
+    "@nx/module-federation": "22.2.4",
+    "@nx/rspack": "22.2.4",
+    "@nx/web": "22.2.4",
+    "@nx/webpack": "22.2.4",
+    "@nx/workspace": "22.2.4",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/generators/cypress-component-configuration/cypress-component-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAExD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAwB5B;AA4HD,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"cypress-component-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/cypress-component-configuration/cypress-component-configuration.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAgBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAwB5B;AA0ID,eAAe,6BAA6B,CAAC"}

package/src/generators/cypress-component-configuration/cypress-component-configuration.js

@@ -9,6 +9,18 @@ const component_info_1 = require("../utils/storybook-ast/component-info");
 const entry_point_1 = require("../utils/storybook-ast/entry-point");
 const module_info_1 = require("../utils/storybook-ast/module-info");
 const update_app_editor_tsconfig_excluded_files_1 = require("../utils/update-app-editor-tsconfig-excluded-files");
+const webpackExecutors = new Set([
+    '@nx/angular:webpack-browser',
+    '@nrwl/angular:webpack-browser',
+    '@angular-devkit/build-angular:browser',
+]);
+const esbuildExecutors = new Set([
+    '@angular/build:application',
+    '@angular-devkit/build-angular:application',
+    '@nx/angular:application',
+    '@angular-devkit/build-angular:browser-esbuild',
+    '@nx/angular:browser-esbuild',
+]);
 /**
  * This is for cypress built in component testing, if you want to test with
  * storybook + cypress then use the componentCypressGenerator instead.
@@ -66,13 +78,25 @@ async function configureCypressCT(tree, options) {
         found = await findBuildConfig(tree, {
             project: options.project,
             buildTarget: options.buildTarget,
-            validExecutorNames: new Set([
-                '@nx/angular:webpack-browser',
-                '@nrwl/angular:webpack-browser',
-                '@angular-devkit/build-angular:browser',
-            ]),
+            validExecutorNames: webpackExecutors,
         });
-        assertValidConfig(found?.config);
+        if (!found?.config) {
+            // Check if the project uses an esbuild-based executor
+            const esbuildTarget = await findBuildConfig(tree, {
+                project: options.project,
+                validExecutorNames: esbuildExecutors,
+                skipGetOptions: true,
+            });
+            if (esbuildTarget?.target) {
+                const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, esbuildTarget.target.split(':')[0]);
+                const targetName = esbuildTarget.target.split(':')[1];
+                const executor = projectConfig.targets?.[targetName]?.executor;
+                throw new Error(`Cypress Component Testing for Angular requires a webpack-based build target, ` +
+                    `but the project "${options.project}" uses an esbuild-based executor (${executor}).\n\n` +
+                    `Cypress only supports webpack as the bundler for Angular component testing.`);
+            }
+            throw new Error('Unable to find a valid build configuration. Try passing in a target for an Angular app (e.g. --build-target=<project>:<target>[:<configuration>]).');
+        }
     }
     const ctConfigOptions = {};
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -93,9 +117,4 @@ async function configureCypressCT(tree, options) {
     const updatedCyConfig = await addDefaultCTConfig(tree.read(cypressConfigPath, 'utf-8'), ctConfigOptions);
     tree.write(cypressConfigPath, `import { nxComponentTestingPreset } from '@nx/angular/plugins/component-testing';\n${updatedCyConfig}`);
 }
-function assertValidConfig(config) {
-    if (!config) {
-        throw new Error('Unable to find a valid build configuration. Try passing in a target for an Angular app. --build-target=<project>:<target>[:<configuration>]');
-    }
-}
 exports.default = cypressComponentConfiguration;

package/src/migrations/update-21-2-0/update-module-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-module-resolution.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-module-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,IAAI,EAAc,MAAM,YAAY,CAAC;AAW1E,yBAA+B,IAAI,EAAE,IAAI,iBA0BxC"}
+{"version":3,"file":"update-module-resolution.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/migrations/update-21-2-0/update-module-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAkBpB,yBAA+B,IAAI,EAAE,IAAI,iBAqCxC"}

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);
 }