@nx/angular 23.3.0-canary.20260915-071d621 → 23.3.0-canary.20260917-ea5c01d

package/dist/src/generators/component-test/component-test.js

@@ -27,8 +27,7 @@ async function componentTestGenerator(tree, options) {
         });
     }
     const tasks = [];
-    if (!options.skipPackageJson) {
-        // Cypress CT still requires @angular/platform-browser-dynamic
+    if (!options.skipPackageJson && usesPlatformBrowserDynamic(tree)) {
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@angular/platform-browser-dynamic': (0, version_utils_1.versions)(tree).angularVersion,
         }, undefined, true));
@@ -38,4 +37,11 @@ async function componentTestGenerator(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+// The Cypress 16 harness bootstraps through @angular/platform-browser/testing;
+// earlier harnesses need @angular/platform-browser-dynamic/testing.
+function usesPlatformBrowserDynamic(tree) {
+    const { getInstalledCypressMajorVersion, } = require('@nx/cypress/internal');
+    const cypressMajorVersion = getInstalledCypressMajorVersion(tree);
+    return cypressMajorVersion !== null && cypressMajorVersion < 16;
+}
 exports.default = componentTestGenerator;

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

@@ -43,15 +43,21 @@ async function cypressComponentConfiguration(tree, options) {
         // For libraries, check if zone.js is installed in the workspace
         isZoneless = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'zone.js') === null;
     }
+    // Cypress 16 dropped `cypress/angular-zoneless`; `cypress/angular` is zoneless there.
+    let mountModule = 'cypress/angular';
     if (isZoneless) {
         const { getInstalledCypressVersion, } = require('@nx/cypress/internal');
         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.`);
+        if (installedCypressVersion && (0, semver_1.major)(installedCypressVersion) < 16) {
+            // Zoneless support was introduced in Cypress 15.8.0
+            const unsupportedCypressVersion = (0, assert_cypress_component_testing_support_1.findCypressBelow)(tree, '15.8.0');
+            if (unsupportedCypressVersion) {
+                throw new Error(`Cypress Component Testing doesn't support Zoneless Angular projects for your Cypress version (${unsupportedCypressVersion}). ` +
+                    `The project "${options.project}" is configured without Zone.js. ` +
+                    `Please upgrade Cypress to version 15.8.0 or higher.`);
+            }
+            mountModule = 'cypress/angular-zoneless';
         }
     }
     const tasks = [];
@@ -63,7 +69,7 @@ async function cypressComponentConfiguration(tree, options) {
         skipPackageJson: options.skipPackageJson,
     }));
     await configureCypressCT(tree, options);
-    tasks.push(await addFiles(tree, projectConfig, options, isZoneless));
+    tasks.push(await addFiles(tree, projectConfig, options, mountModule));
     if (projectConfig.projectType === 'application') {
         (0, update_app_editor_tsconfig_excluded_files_1.updateAppEditorTsConfigExcludedFiles)(tree, projectConfig);
     }
@@ -72,11 +78,11 @@ async function cypressComponentConfiguration(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-async function addFiles(tree, projectConfig, options, isZoneless) {
+async function addFiles(tree, projectConfig, options, mountModule) {
     const componentFile = (0, devkit_1.joinPathFragments)(projectConfig.root, 'cypress', 'support', 'component.ts');
     const { addMountDefinition } = (require('@nx/cypress/internal'));
     const updatedCmpContents = await addMountDefinition(tree.read(componentFile, 'utf-8'));
-    tree.write(componentFile, `import { mount } from '${isZoneless ? 'cypress/angular-zoneless' : 'cypress/angular'}';\n${updatedCmpContents}`);
+    tree.write(componentFile, `import { mount } from '${mountModule}';\n${updatedCmpContents}`);
     if (!options.generateTests) {
         return () => { };
     }

package/dist/src/utils/assert-cypress-component-testing-support.d.ts

@@ -4,3 +4,14 @@ import { type Tree } from '@nx/devkit';
  * Angular version. Must be called after `@nx/cypress` has been ensured.
  */
 export declare function assertCypressComponentTestingSupport(tree: Tree): void;
+/**
+ * Returns the installed Cypress version, or the declared range when nothing
+ * satisfying is installed, if it cannot reach `floor`; `null` otherwise.
+ *
+ * A satisfying install decides. Without one, only a range capped below the
+ * floor fails: `^15.17.0` installs 15.20.1+, so its lower bound cannot be
+ * compared. Declarations that are not ranges (`latest`, `file:`) are not
+ * gated.
+ * When Cypress is not declared, the generators install `cypressVersion`.
+ */
+export declare function findCypressBelow(tree: Tree, floor: string): string | null;

package/dist/src/utils/assert-cypress-component-testing-support.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertCypressComponentTestingSupport = assertCypressComponentTestingSupport;
+exports.findCypressBelow = findCypressBelow;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
@@ -10,22 +11,46 @@ const minCypressVersion = '15.20.1';
  * Angular version. Must be called after `@nx/cypress` has been ensured.
  */
 function assertCypressComponentTestingSupport(tree) {
-    const angularVersion = (0, internal_1.getDeclaredPackageVersion)(tree, '@angular/core');
-    if (!angularVersion || (0, semver_1.lt)(angularVersion, '22.1.0')) {
+    const angularVersion = (0, internal_1.getResolvedPackageVersion)(tree, '@angular/core');
+    if (!angularVersion) {
         return;
     }
-    const { cypressVersion, } = require('@nx/cypress/internal');
-    // When Cypress is not installed, the generators install `cypressVersion`
-    const declaredCypressVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress') ?? cypressVersion;
-    // Gate only ranges capped below the floor. `^15.17.0` installs 15.20.1+, so
-    // comparing its lower bound would reject workspaces that work. Dist tags
-    // (`latest`, `next`) aren't ranges and aren't gated.
-    if (!(0, semver_1.validRange)(declaredCypressVersion) ||
-        !(0, semver_1.subset)(declaredCypressVersion, `<${minCypressVersion}`)) {
+    // A prerelease of 22.1 counts as 22.1.
+    const angularRelease = (0, semver_1.coerce)(angularVersion)?.version ?? angularVersion;
+    if ((0, semver_1.lt)(angularRelease, '22.1.0')) {
         return;
     }
+    const found = findCypressBelow(tree, minCypressVersion);
+    if (found) {
+        throwForUnsupportedCypress(found);
+    }
+}
+/**
+ * Returns the installed Cypress version, or the declared range when nothing
+ * satisfying is installed, if it cannot reach `floor`; `null` otherwise.
+ *
+ * A satisfying install decides. Without one, only a range capped below the
+ * floor fails: `^15.17.0` installs 15.20.1+, so its lower bound cannot be
+ * compared. Declarations that are not ranges (`latest`, `file:`) are not
+ * gated.
+ * When Cypress is not declared, the generators install `cypressVersion`.
+ */
+function findCypressBelow(tree, floor) {
+    const { cypressVersion, } = require('@nx/cypress/internal');
+    const declaredCypressVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress');
+    const installedCypressVersion = declaredCypressVersion
+        ? (0, internal_1.getSatisfyingInstalledPackageVersion)(tree, 'cypress', declaredCypressVersion)
+        : null;
+    if (installedCypressVersion) {
+        const release = (0, semver_1.coerce)(installedCypressVersion)?.version ?? installedCypressVersion;
+        return (0, semver_1.lt)(release, floor) ? installedCypressVersion : null;
+    }
+    const range = declaredCypressVersion ?? cypressVersion;
+    return (0, semver_1.validRange)(range) && (0, semver_1.subset)(range, `<${floor}`) ? range : null;
+}
+function throwForUnsupportedCypress(found) {
     throw new Error(`Cypress Component Testing with Angular 22.1 and higher requires Cypress ${minCypressVersion} or higher. ` +
-        `Found Cypress ${declaredCypressVersion}. Earlier Cypress versions can't load Angular's Babel 8 dependencies. ` +
+        `Found Cypress ${found}. Earlier Cypress versions can't load Angular's Babel 8 dependencies. ` +
         `Please upgrade Cypress. ` +
         `See https://github.com/cypress-io/cypress/issues/34461.`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.3.0-canary.20260915-071d621",
+  "version": "23.3.0-canary.20260917-ea5c01d",
   "private": false,
   "type": "commonjs",
   "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, 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.",
@@ -79,15 +79,15 @@
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.3.0-canary.20260915-071d621",
-    "@nx/js": "23.3.0-canary.20260915-071d621",
-    "@nx/eslint": "23.3.0-canary.20260915-071d621",
-    "@nx/web": "23.3.0-canary.20260915-071d621"
+    "@nx/js": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/web": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/eslint": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/devkit": "23.3.0-canary.20260917-ea5c01d"
   },
   "devDependencies": {
-    "@nx/storybook": "23.3.0-canary.20260915-071d621",
-    "@nx/vitest": "23.3.0-canary.20260915-071d621",
-    "nx": "23.3.0-canary.20260915-071d621"
+    "@nx/storybook": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/vitest": "23.3.0-canary.20260917-ea5c01d",
+    "nx": "23.3.0-canary.20260917-ea5c01d"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -98,11 +98,11 @@
     "ng-packagr": ">= 20.0.0 < 23.0.0",
     "rxjs": "^6.5.3 || ^7.5.0",
     "webpack-merge": "^5.8.0",
-    "@nx/cypress": "23.3.0-canary.20260915-071d621",
-    "@nx/playwright": "23.3.0-canary.20260915-071d621",
-    "@nx/module-federation": "23.3.0-canary.20260915-071d621",
-    "@nx/webpack": "23.3.0-canary.20260915-071d621",
-    "@nx/rspack": "23.3.0-canary.20260915-071d621"
+    "@nx/cypress": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/playwright": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/module-federation": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/rspack": "23.3.0-canary.20260917-ea5c01d",
+    "@nx/webpack": "23.3.0-canary.20260917-ea5c01d"
   },
   "peerDependenciesMeta": {
     "@angular/build": {