@nx/angular 22.3.1 → 22.3.2

package/migrations.json

@@ -342,14 +342,6 @@
       "description": "Update the @angular/cli package version to ~20.3.0.",
       "factory": "./src/migrations/update-21-6-1/update-angular-cli"
     },
-    "update-angular-cli-version-21-0-0": {
-      "version": "22.3.0-beta.0",
-      "requires": {
-        "@angular/core": ">=21.0.0"
-      },
-      "description": "Update the @angular/cli package version to ~21.0.0.",
-      "factory": "./src/migrations/update-22-3-0/update-angular-cli"
-    },
     "update-ssr-webpack-config-22-2-0": {
       "version": "22.3.0-beta.0",
       "requires": {
@@ -2012,6 +2004,12 @@
         "@angular/core": ">=20.3.0 <21.0.0"
       },
       "packages": {
+        "@angular/cli": {
+          "version": "~21.0.0",
+          "alwaysAddToPackageJson": false,
+          "ignorePackageGroup": true,
+          "ignoreMigrations": true
+        },
         "@angular-devkit/build-angular": {
           "version": "~21.0.0",
           "alwaysAddToPackageJson": false
@@ -2160,6 +2158,18 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "22.3.2-ngrx": {
+      "version": "22.3.2-beta.0",
+      "requires": {
+        "@angular/core": "^21.0.0"
+      },
+      "packages": {
+        "@ngrx/store": {
+          "version": "^21.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "22.3.1",
+  "version": "22.3.2",
   "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.3.1",
-    "@nx/eslint": "22.3.1",
-    "@nx/js": "22.3.1",
-    "@nx/module-federation": "22.3.1",
-    "@nx/rspack": "22.3.1",
-    "@nx/web": "22.3.1",
-    "@nx/webpack": "22.3.1",
-    "@nx/workspace": "22.3.1",
+    "@nx/devkit": "22.3.2",
+    "@nx/eslint": "22.3.2",
+    "@nx/js": "22.3.2",
+    "@nx/module-federation": "22.3.2",
+    "@nx/rspack": "22.3.2",
+    "@nx/web": "22.3.2",
+    "@nx/webpack": "22.3.2",
+    "@nx/workspace": "22.3.2",
     "@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,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,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,CA+C5B;AAmJD,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,EAMjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,4BAA4B,EAAE,MAAM,UAAU,CAAC;AAiBxD;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,iBAAiB,CAAC,CAsD5B;AAoJD,eAAe,6BAA6B,CAAC"}

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

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cypressComponentConfiguration = cypressComponentConfiguration;
 const devkit_1 = require("@nx/devkit");
@@ -10,6 +43,7 @@ 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 semver_1 = require("semver");
 const webpackExecutors = new Set([
     '@nx/angular:webpack-browser',
     '@nrwl/angular:webpack-browser',
@@ -27,8 +61,8 @@ const esbuildExecutors = new Set([
  * storybook + cypress then use the componentCypressGenerator instead.
  */
 async function cypressComponentConfiguration(tree, options) {
+    const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    // Cypress Component Testing requires Zone.js
     let isZoneless;
     if (projectConfig.projectType === 'application') {
         // For applications, check the polyfills in the build target
@@ -39,11 +73,16 @@ async function cypressComponentConfiguration(tree, options) {
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
     if (isZoneless) {
-        throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects yet. ` +
-            `The project "${options.project}" is configured without Zone.js. ` +
-            `See https://github.com/cypress-io/cypress/issues/31504.`);
+        const { getInstalledCypressVersion } = await Promise.resolve().then(() => __importStar(require('@nx/cypress/src/utils/versions')));
+        const installedCypressVersion = getInstalledCypressVersion(tree);
+        // Zoneless support was introduced in Cypress 15.8.0
+        // If Cypress is not yet installed, we'll install the latest version, which will have zoneless support
+        if (installedCypressVersion && (0, semver_1.lt)(installedCypressVersion, '15.8.0')) {
+            throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects for your installed Cypress version (${installedCypressVersion}). ` +
+                `The project "${options.project}" is configured without Zone.js. ` +
+                `Please upgrade Cypress to version 15.8.0 or higher.`);
+        }
     }
-    const { componentConfigurationGenerator: baseCyCTConfig } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
     const tasks = [];
     tasks.push(await baseCyCTConfig(tree, {
         project: options.project,
@@ -53,7 +92,7 @@ async function cypressComponentConfiguration(tree, options) {
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
-    tasks.push(await addFiles(tree, projectConfig, options));
+    tasks.push(await addFiles(tree, projectConfig, options, isZoneless));
     if (projectConfig.projectType === 'application') {
         (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
     }
@@ -62,11 +101,11 @@ async function cypressComponentConfiguration(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-async function addFiles(tree, projectConfig, options) {
+async function addFiles(tree, projectConfig, options, isZoneless) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const { addMountDefinition } = require('@nx/cypress/src/utils/config');
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
-    tree.write(componentFile, `import { mount } from 'cypress/angular';\n${updatedCmpContents}`);
+    tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
         return () => { };
     }

package/src/utils/versions.d.ts

@@ -2,7 +2,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 ngrxVersion = "^20.0.0";
+export declare const ngrxVersion = "^21.0.0";
 export declare const rxjsVersion = "~7.8.0";
 export declare const zoneJsVersion = "~0.15.0";
 export declare const tsLibVersion = "^2.3.0";

package/src/utils/versions.js

@@ -5,7 +5,7 @@ exports.nxVersion = require('../../package.json').version;
 exports.angularVersion = '~21.0.0';
 exports.angularDevkitVersion = '~21.0.0';
 exports.ngPackagrVersion = '~21.0.0';
-exports.ngrxVersion = '^20.0.0';
+exports.ngrxVersion = '^21.0.0';
 exports.rxjsVersion = '~7.8.0';
 exports.zoneJsVersion = '~0.15.0';
 exports.tsLibVersion = '^2.3.0';

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

@@ -1,4 +0,0 @@
-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

@@ -1 +0,0 @@
-{"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-22-3-0/update-angular-cli.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.angularCliVersion = void 0;
-exports.default = default_1;
-const devkit_1 = require("@nx/devkit");
-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'];
-    if (hasAngularCli) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@angular/cli': exports.angularCliVersion });
-        await (0, devkit_1.formatFiles)(tree);
-    }
-}