@nx/angular 23.0.0-beta.16 → 23.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/angular",
-  "version": "23.0.0-beta.16",
+  "version": "23.0.0-beta.17",
   "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, 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": {
@@ -61,13 +61,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.16",
-    "@nx/eslint": "23.0.0-beta.16",
-    "@nx/js": "23.0.0-beta.16",
-    "@nx/module-federation": "23.0.0-beta.16",
-    "@nx/rspack": "23.0.0-beta.16",
-    "@nx/web": "23.0.0-beta.16",
-    "@nx/webpack": "23.0.0-beta.16",
+    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/eslint": "23.0.0-beta.17",
+    "@nx/js": "23.0.0-beta.17",
+    "@nx/module-federation": "23.0.0-beta.17",
+    "@nx/rspack": "23.0.0-beta.17",
+    "@nx/web": "23.0.0-beta.17",
+    "@nx/webpack": "23.0.0-beta.17",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "enquirer": "~2.3.6",

package/src/generators/add-linting/add-linting.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAgBpB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAG1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA8I5B;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"add-linting.d.ts","sourceRoot":"","sources":["../../../../../../packages/angular/src/generators/add-linting/add-linting.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAepB,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAE1D,wBAAsB,mBAAmB,CACvC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,iBAAiB,CAAC,CA8I5B;AAED,eAAe,mBAAmB,CAAC"}

package/src/generators/add-linting/add-linting.js

@@ -5,11 +5,9 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
 const assert_supported_angular_version_1 = require("../../utils/assert-supported-angular-version");
-const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_2 = require("@nx/eslint/internal");
 const add_angular_eslint_dependencies_1 = require("./lib/add-angular-eslint-dependencies");
 const buildable_project_1 = require("./lib/buildable-project");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
 async function addLintingGenerator(tree, options) {
     (0, assert_supported_angular_version_1.assertSupportedAngularVersion)(tree);
     const tasks = [];
@@ -29,16 +27,16 @@ async function addLintingGenerator(tree, options) {
         skipPackageJson: options.skipPackageJson,
     });
     tasks.push(lintTask);
-    if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
-        const eslintFile = (0, eslint_file_1.findEslintFile)(tree, options.projectRoot);
+    if ((0, internal_2.isEslintConfigSupported)(tree)) {
+        const eslintFile = (0, internal_2.findEslintFile)(tree, options.projectRoot);
         // keep parser options if they exist
         const hasParserOptions = tree
             .read((0, devkit_1.joinPathFragments)(options.projectRoot, eslintFile), 'utf8')
             .includes(`${options.projectRoot}/tsconfig.*?.json`);
-        if ((0, flat_config_1.useFlatConfig)(tree)) {
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
-            (0, eslint_file_1.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+        if ((0, internal_2.useFlatConfig)(tree)) {
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular', { checkBaseConfig: true });
+            (0, internal_2.addPredefinedConfigToFlatLintConfig)(tree, options.projectRoot, 'flat/angular-template', { checkBaseConfig: true });
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.ts'],
                 rules: {
                     '@angular-eslint/directive-selector': [
@@ -59,14 +57,14 @@ async function addLintingGenerator(tree, options) {
                     ],
                 },
             });
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, options.projectRoot, {
+            (0, internal_2.addOverrideToLintConfig)(tree, options.projectRoot, {
                 files: ['*.html'],
                 rules: {},
             });
         }
         else {
-            (0, eslint_file_1.replaceOverridesInLintConfig)(tree, options.projectRoot, [
-                ...(rootProject ? [global_eslint_config_1.typeScriptOverride, global_eslint_config_1.javaScriptOverride] : []),
+            (0, internal_2.replaceOverridesInLintConfig)(tree, options.projectRoot, [
+                ...(rootProject ? [internal_2.typeScriptOverride, internal_2.javaScriptOverride] : []),
                 {
                     files: ['*.ts'],
                     ...(hasParserOptions

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAMpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}
+{"version":3,"file":"add-angular-eslint-dependencies.d.ts","sourceRoot":"","sources":["../../../../../../../packages/angular/src/generators/add-linting/lib/add-angular-eslint-dependencies.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAQpB,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAiCnB"}

package/src/generators/add-linting/lib/add-angular-eslint-dependencies.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addAngularEsLintDependencies = addAngularEsLintDependencies;
 const devkit_1 = require("@nx/devkit");
-const flat_config_1 = require("@nx/eslint/src/utils/flat-config");
-const versions_1 = require("@nx/eslint/src/utils/versions");
+const internal_1 = require("@nx/eslint/internal");
 const version_utils_1 = require("../../utils/version-utils");
 const buildable_project_1 = require("./buildable-project");
 function addAngularEsLintDependencies(tree, projectName) {
     const compatVersions = (0, version_utils_1.versions)(tree);
     const angularEslintVersionToInstall = compatVersions.angularEslintVersion;
-    const usesEslintFlatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    const usesEslintFlatConfig = (0, internal_1.useFlatConfig)(tree);
     const devDependencies = usesEslintFlatConfig
         ? {
             'angular-eslint': angularEslintVersionToInstall,
@@ -21,7 +20,7 @@ function addAngularEsLintDependencies(tree, projectName) {
         };
     if ('typescriptEslintVersion' in compatVersions) {
         devDependencies['@typescript-eslint/utils'] = usesEslintFlatConfig
-            ? versions_1.eslint9__typescriptESLintVersion
+            ? internal_1.eslint9__typescriptESLintVersion
             : compatVersions.typescriptEslintVersion;
     }
     if ((0, buildable_project_1.isBuildableLibraryProject)(tree, projectName)) {

package/src/generators/ng-add/utilities/workspace.js

@@ -15,10 +15,10 @@ exports.deleteAngularJson = deleteAngularJson;
 exports.deleteGitKeepFilesIfNotNeeded = deleteGitKeepFilesIfNotNeeded;
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const setup_root_eslint_1 = require("@nx/eslint/src/generators/lint-project/setup-root-eslint");
+const internal_1 = require("@nx/eslint/internal");
 const js_1 = require("@nx/js");
 const default_base_1 = require("nx/src/utils/default-base");
-const internal_1 = require("@nx/js/internal");
+const internal_2 = require("@nx/js/internal");
 const angular_json_1 = require("nx/src/adapter/angular-json");
 const versions_1 = require("../../../utils/versions");
 const path_1 = require("path");
@@ -151,7 +151,7 @@ function updatePackageJson(tree) {
             packageJson.devDependencies['nx'] = versions_1.nxVersion;
         }
         if (!packageJson.devDependencies['prettier']) {
-            packageJson.devDependencies['prettier'] = internal_1.prettierVersion;
+            packageJson.devDependencies['prettier'] = internal_2.prettierVersion;
         }
         return packageJson;
     });
@@ -162,7 +162,7 @@ async function updateRootEsLintConfig(tree, existingEsLintConfig, unitTestRunner
     });
     if (!existingEsLintConfig) {
         // There was no eslint config in the root, so we set it up and use it as-is
-        (0, setup_root_eslint_1.setupRootEsLint)(tree, { unitTestRunner });
+        (0, internal_1.setupRootEsLint)(tree, { unitTestRunner });
         return;
     }
     existingEsLintConfig.ignorePatterns = ['**/*'];

package/src/migrations/update-20-2-0/disable-angular-eslint-prefer-standalone.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 const preferStandaloneRule = '@angular-eslint/prefer-standalone';
 async function default_1(tree) {
@@ -11,20 +11,20 @@ async function default_1(tree) {
     ]);
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, (o) => !!o.rules?.[preferStandaloneRule], true)) {
             // the @angular-eslint/prefer-standalone rule is set in an override, skip
             continue;
         }
         const ngEslintOverrideLookup = (o) => o.files?.includes('*.ts') &&
             Object.keys(o.rules ?? {}).some((r) => r.startsWith('@angular-eslint/'));
         const tsFilesOverrideLookup = (o) => o.files?.length === 1 && o.files[0] === '*.ts';
-        if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
+        if ((0, internal_1.lintConfigHasOverride)(tree, root, ngEslintOverrideLookup, false)) {
             // there is an override containing an Angular ESLint rule
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, ngEslintOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -32,9 +32,9 @@ async function default_1(tree) {
                 return o;
             });
         }
-        else if ((0, eslint_file_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
+        else if ((0, internal_1.lintConfigHasOverride)(tree, root, tsFilesOverrideLookup, false)) {
             // there is an override for just *.ts files
-            (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
+            (0, internal_1.updateOverrideInLintConfig)(tree, root, tsFilesOverrideLookup, (o) => {
                 o.rules = {
                     ...o.rules,
                     [preferStandaloneRule]: 'off',
@@ -44,7 +44,7 @@ async function default_1(tree) {
         }
         else {
             // there are no overrides for any Angular ESLint rule or just *.ts files, add a new override
-            (0, eslint_file_1.addOverrideToLintConfig)(tree, root, {
+            (0, internal_1.addOverrideToLintConfig)(tree, root, {
                 files: ['*.ts'],
                 rules: {
                     [preferStandaloneRule]: 'off',

package/src/migrations/update-20-2-0/remove-angular-eslint-rules.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rulesToRemove = void 0;
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
+const internal_1 = require("@nx/eslint/internal");
 const projects_1 = require("../utils/projects");
 exports.rulesToRemove = [
     '@angular-eslint/no-host-metadata-property',
@@ -17,7 +17,7 @@ async function default_1(tree) {
     let hasRootProject = false;
     for (const graphNode of projects) {
         const root = graphNode.data.root;
-        if (!(0, eslint_file_1.isEslintConfigSupported)(tree, root)) {
+        if (!(0, internal_1.isEslintConfigSupported)(tree, root)) {
             // ESLint config is not supported, skip
             continue;
         }
@@ -36,12 +36,12 @@ async function default_1(tree) {
     // check root config, provide a root so it doesn't try to lookup a base config
     if (!hasRootProject) {
         // if there is no root project the root eslint config has not been processed
-        if ((0, eslint_file_1.isEslintConfigSupported)(tree, '')) {
+        if ((0, internal_1.isEslintConfigSupported)(tree, '')) {
             removeRules(tree, '');
         }
     }
     // handle root base config, not providing a root will prioritize a base config
-    const baseEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
+    const baseEslintConfig = (0, internal_1.findEslintFile)(tree);
     if (baseEslintConfig && baseEslintConfig.includes('.base.')) {
         removeRules(tree, baseEslintConfig);
     }
@@ -50,12 +50,12 @@ async function default_1(tree) {
 function removeRules(tree, root) {
     for (const rule of exports.rulesToRemove) {
         const lookup = (o) => !!o.rules?.[rule];
-        if (!(0, eslint_file_1.lintConfigHasOverride)(tree, root, lookup)) {
+        if (!(0, internal_1.lintConfigHasOverride)(tree, root, lookup)) {
             // it's not using the rule, skip
             continue;
         }
         // there is an override containing the rule, remove the rule
-        (0, eslint_file_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
+        (0, internal_1.updateOverrideInLintConfig)(tree, root, lookup, (o) => {
             delete o.rules[rule];
             return o;
         });