@nx/angular 23.2.0-beta.7 → 23.2.0-beta.8

package/dist/src/generators/application/lib/add-e2e.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addE2e = addE2e;
+const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const internal_2 = require("@nx/eslint/internal");
-const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../../utils/versions");
 async function addE2e(tree, options) {
     // since e2e are separate projects, default to adding plugins

package/dist/src/generators/convert-to-rspack/convert-to-rspack.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToRspack = convertToRspack;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const enquirer_1 = require("enquirer");
 const path_1 = require("path");
 const posix_1 = require("path/posix");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
@@ -226,13 +225,10 @@ async function getProjectToConvert(tree) {
             projects.add(project);
         });
     }
-    const { project } = await (0, enquirer_1.prompt)({
-        type: 'select',
-        name: 'project',
+    return (0, internal_1.selectPrompt)({
         message: 'Which project would you like to convert to rspack?',
         choices: Array.from(projects),
     });
-    return project;
 }
 async function convertToRspack(tree, schema) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);

package/dist/src/generators/ng-add/migrators/projects/lib.migrator.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LibMigrator = void 0;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const utilities_1 = require("../../utilities");
 const builders_1 = require("../builders");
 const project_migrator_1 = require("./project.migrator");
@@ -46,7 +45,7 @@ class LibMigrator extends project_migrator_1.ProjectMigrator {
             !Object.keys(this.projectConfig.targets).length) {
             this.logger.warn('The project does not have any targets configured. This might not be an issue. Skipping updating targets.');
         }
-        (0, devkit_2.updateProjectConfiguration)(this.tree, this.project.name, {
+        (0, devkit_1.updateProjectConfiguration)(this.tree, this.project.name, {
             ...this.projectConfig,
         });
     }

package/dist/src/migrations/update-20-2-0/migrate-mf-imports-to-new-package.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = migrateMfImportsToNewPackage;
 const devkit_1 = require("@nx/devkit");
-const devkit_2 = require("@nx/devkit");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const MF_IMPORT_TO_UPDATE = 'ModuleFederationConfig';
 const MF_CONFIG_IMPORT_SELECTOR = `ImportDeclaration:has(StringLiteral[value=@nx/webpack]):has(Identifier[name=ModuleFederationConfig])`;
@@ -23,7 +22,7 @@ async function migrateMfImportsToNewPackage(tree) {
         }
     }
     for (const root of rootsToCheck) {
-        (0, devkit_2.visitNotIgnoredFiles)(tree, root, (filePath) => {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, root, (filePath) => {
             if (!filePath.endsWith('.ts') && !filePath.endsWith('.js')) {
                 return;
             }
@@ -57,5 +56,5 @@ async function migrateMfImportsToNewPackage(tree) {
             tree.write(filePath, contents);
         });
     }
-    await (0, devkit_2.formatFiles)(tree);
+    await (0, devkit_1.formatFiles)(tree);
 }

package/dist/src/migrations/update-21-0-0/change-data-persistence-operators-imports-to-ngrx-router-store-data-persistence.js

@@ -4,7 +4,6 @@ exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/js/internal");
 const internal_2 = require("@nx/devkit/internal");
-const internal_3 = require("@nx/devkit/internal");
 const version_utils_1 = require("../../generators/utils/version-utils");
 const file_change_recorder_1 = require("../../utils/file-change-recorder");
 const projects_1 = require("../utils/projects");
@@ -27,7 +26,7 @@ async function default_1(tree) {
     const tsqueryModule = require('@phenomnomnominal/tsquery');
     tsqueryAst = tsqueryModule.ast;
     tsqueryQuery = tsqueryModule.query;
-    const cachedFileMap = (0, internal_3.readFileMapCache)().fileMap.projectFileMap;
+    const cachedFileMap = (0, internal_2.readFileMapCache)().fileMap.projectFileMap;
     const filesWithNxAngularImports = [];
     for (const graphNode of projects) {
         const files = filterFilesWithNxAngularDep(cachedFileMap[graphNode.name] || []);

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

@@ -4,6 +4,7 @@ exports.assertCypressComponentTestingSupport = assertCypressComponentTestingSupp
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
+const minCypressVersion = '15.20.1';
 /**
  * Asserts the workspace's Cypress version can run Component Testing against its
  * Angular version. Must be called after `@nx/cypress` has been ensured.
@@ -16,12 +17,15 @@ function assertCypressComponentTestingSupport(tree) {
     const { cypressVersion, } = require('@nx/cypress/internal');
     // When Cypress is not installed, the generators install `cypressVersion`
     const declaredCypressVersion = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'cypress') ?? cypressVersion;
-    // A dist tag (`latest`, `next`) can't be compared, so it's not gated
-    const installedCypressVersion = (0, semver_1.coerce)(declaredCypressVersion)?.version;
-    if (installedCypressVersion && (0, semver_1.lt)(installedCypressVersion, '16.0.0')) {
-        throw new Error(`Cypress Component Testing doesn't support Angular 22.1 and higher for Cypress version ${installedCypressVersion}. ` +
-            `Angular 22.1 moved @angular-devkit/build-angular to Babel 8, which Cypress can't load. ` +
-            `Cypress 16 should be the first release to support it. ` +
-            `See https://github.com/cypress-io/cypress/issues/34461.`);
+    // 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}`)) {
+        return;
     }
+    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. ` +
+        `Please upgrade Cypress. ` +
+        `See https://github.com/cypress-io/cypress/issues/34461.`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.2.0-beta.7",
+  "version": "23.2.0-beta.8",
   "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.",
@@ -73,22 +73,21 @@
   "dependencies": {
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
-    "enquirer": "~2.3.6",
     "jsonc-parser": "^3.2.0",
     "magic-string": "~0.30.2",
     "picocolors": "^1.1.0",
     "picomatch": "4.0.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/js": "23.2.0-beta.7",
-    "@nx/web": "23.2.0-beta.7",
-    "@nx/eslint": "23.2.0-beta.7",
-    "@nx/devkit": "23.2.0-beta.7"
+    "@nx/devkit": "23.2.0-beta.8",
+    "@nx/eslint": "23.2.0-beta.8",
+    "@nx/web": "23.2.0-beta.8",
+    "@nx/js": "23.2.0-beta.8"
   },
   "devDependencies": {
-    "@nx/storybook": "23.2.0-beta.7",
-    "@nx/vitest": "23.2.0-beta.7",
-    "nx": "23.2.0-beta.7"
+    "@nx/storybook": "23.2.0-beta.8",
+    "@nx/vitest": "23.2.0-beta.8",
+    "nx": "23.2.0-beta.8"
   },
   "peerDependencies": {
     "@angular/build": ">= 20.0.0 < 23.0.0",
@@ -99,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.2.0-beta.7",
-    "@nx/playwright": "23.2.0-beta.7",
-    "@nx/module-federation": "23.2.0-beta.7",
-    "@nx/webpack": "23.2.0-beta.7",
-    "@nx/rspack": "23.2.0-beta.7"
+    "@nx/cypress": "23.2.0-beta.8",
+    "@nx/module-federation": "23.2.0-beta.8",
+    "@nx/rspack": "23.2.0-beta.8",
+    "@nx/webpack": "23.2.0-beta.8",
+    "@nx/playwright": "23.2.0-beta.8"
   },
   "peerDependenciesMeta": {
     "@angular/build": {