@nx/angular 16.4.0-beta.5 → 16.4.0-beta.7

package/migrations.json

@@ -245,6 +245,15 @@
       },
       "description": "Switch the data persistence operator imports to '@ngrx/router-store/data-persistence'.",
       "factory": "./src/migrations/update-16-2-0/switch-data-persistence-operators-imports-to-ngrx-router-store"
+    },
+    "rename-angular-eslint-accesibility-rules": {
+      "cli": "nx",
+      "version": "16.4.0-beta.6",
+      "requires": {
+        "@angular-eslint/eslint-plugin-template": ">=16.0.0"
+      },
+      "description": "Remove the 'accessibility-' prefix from '@angular-eslint/eslint-plugin-template' rules.",
+      "factory": "./src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules"
     }
   },
   "packageJsonUpdates": {
@@ -464,7 +473,8 @@
     "14.4.0": {
       "version": "14.4.0-beta.1",
       "requires": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "eslint": "^7.0.0 || ^8.0.0",
+        "@angular/core": ">=14.0.0 <15.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
@@ -674,6 +684,10 @@
     },
     "14.8.0-angular-eslint": {
       "version": "14.8.0-beta.0",
+      "requires": {
+        "eslint": "^7.0.0 || ^8.0.0",
+        "@angular/core": ">=14.0.0 <15.0.0"
+      },
       "packages": {
         "@angular-eslint/eslint-plugin": {
           "version": "~14.0.4",
@@ -769,7 +783,8 @@
     "15.2.2-angular-eslint": {
       "version": "15.2.2-beta.0",
       "requires": {
-        "eslint": "^7.20.0 || ^8.0.0"
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">=15.0.0 <16.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {
@@ -1099,7 +1114,8 @@
     "16.1.0-angular-eslint": {
       "version": "16.1.0-beta.1",
       "requires": {
-        "eslint": "^7.20.0 || ^8.0.0"
+        "eslint": "^7.20.0 || ^8.0.0",
+        "@angular/core": ">=16.0.0 <17.0.0"
       },
       "packages": {
         "@angular-eslint/eslint-plugin": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "16.4.0-beta.5",
+  "version": "16.4.0-beta.7",
   "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, 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- Upgrading AngularJS applications \n\n- Single Component Application Modules (SCAMs) \n\n- NgRx helpers. \n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -67,14 +67,14 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nrwl/angular": "16.4.0-beta.5",
-    "@nx/cypress": "16.4.0-beta.5",
-    "@nx/devkit": "16.4.0-beta.5",
-    "@nx/jest": "16.4.0-beta.5",
-    "@nx/js": "16.4.0-beta.5",
-    "@nx/linter": "16.4.0-beta.5",
-    "@nx/webpack": "16.4.0-beta.5",
-    "@nx/workspace": "16.4.0-beta.5",
+    "@nrwl/angular": "16.4.0-beta.7",
+    "@nx/cypress": "16.4.0-beta.7",
+    "@nx/devkit": "16.4.0-beta.7",
+    "@nx/jest": "16.4.0-beta.7",
+    "@nx/js": "16.4.0-beta.7",
+    "@nx/linter": "16.4.0-beta.7",
+    "@nx/webpack": "16.4.0-beta.7",
+    "@nx/workspace": "16.4.0-beta.7",
     "@phenomnomnominal/tsquery": "~5.0.1",
     "@typescript-eslint/type-utils": "^5.36.1",
     "chalk": "^4.1.0",
@@ -110,5 +110,5 @@
   "module": "fesm2022/nx-angular.mjs",
   "typings": "index.d.ts",
   "sideEffects": false,
-  "gitHead": "94aa566dda725adbc54b4ba31b558377f273e41b"
+  "gitHead": "847d3a45b61cd2c267acb66c4165a5bb875aff4f"
 }

package/src/generators/component/lib/module.js

@@ -28,6 +28,7 @@ function findModuleFromOptions(tree, options, projectRoot) {
         for (const c of candidatesDirs) {
             const candidateFiles = [
                 '',
+                moduleBaseName,
                 `${moduleBaseName}.ts`,
                 `${moduleBaseName}${moduleExt}`,
             ].map((x) => (0, devkit_1.joinPathFragments)(c, x));

package/src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules.d.ts

@@ -0,0 +1,2 @@
+import type { Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-16-4-0/rename-angular-eslint-accesibility-rules.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+// https://github.com/angular-eslint/angular-eslint/blob/24a4de54a8991c93924abf1dfb78b132a6269aef/packages/schematics/src/migrations/update-16-0-0/update-16-0-0.ts
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+            if (!filePath.endsWith('.eslintrc.json')) {
+                return;
+            }
+            (0, devkit_1.updateJson)(tree, filePath, (json) => {
+                if (json.overrides) {
+                    for (const override of json.overrides) {
+                        modifyRules(override);
+                    }
+                }
+                modifyRules(json);
+                return json;
+            });
+        });
+        yield (0, devkit_1.formatFiles)(tree);
+    });
+}
+exports.default = default_1;
+function modifyRules(parent) {
+    if (!parent.rules) {
+        return;
+    }
+    for (const rule of Object.keys(parent.rules)) {
+        if (rule.startsWith('@angular-eslint/template/accessibility-')) {
+            const ruleConfig = parent.rules[rule];
+            parent.rules[rule.replace('@angular-eslint/template/accessibility-', '@angular-eslint/template/')] = ruleConfig;
+            delete parent.rules[rule];
+        }
+    }
+}