@angular-eslint/schematics 21.4.1-alpha.7 → 22.0.0

package/dist/add-eslint-to-project/schema.json

@@ -14,7 +14,7 @@
     },
     "setParserOptionsProject": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether or not to enable rules that require type information by configuring the ESLint `parserOptions.projectService` option. We do not do this by default for lint performance reasons.",
       "default": false
     }
   },

package/dist/application/schema.json

@@ -141,7 +141,7 @@
     },
     "setParserOptionsProject": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether or not to enable rules that require type information by configuring the ESLint `parserOptions.projectService` option. We do not do this by default for lint performance reasons.",
       "default": false
     }
   },

package/dist/library/schema.json

@@ -62,7 +62,7 @@
     },
     "setParserOptionsProject": {
       "type": "boolean",
-      "description": "Whether or not to configure the ESLint `parserOptions.project` option. We do not do this by default for lint performance reasons.",
+      "description": "Whether or not to enable rules that require type information by configuring the ESLint `parserOptions.projectService` option. We do not do this by default for lint performance reasons.",
       "default": false
     }
   },

package/dist/ng-add/index.d.ts

@@ -1,7 +1,5 @@
 import type { Rule } from '@angular-devkit/schematics';
 import type { Schema } from './schema';
-export declare const FIXED_ESLINT_V8_VERSION = "8.57.1";
-export declare const FIXED_TYPESCRIPT_ESLINT_V7_VERSION = "7.11.0";
 /**
  * Entry point for the ng-add schematic.
  *

package/dist/ng-add/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAYvC,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,kCAAkC,WAAW,CAAC;AAqN3D;;;;GAIG;AACH,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAa9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAG/E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkLvC;;;;GAIG;AACH,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAY9C"}

package/dist/ng-add/index.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION = exports.FIXED_ESLINT_V8_VERSION = void 0;
 exports.default = default_1;
 const schematics_1 = require("@angular-devkit/schematics");
 const tasks_1 = require("@angular-devkit/schematics/tasks");
 const utils_1 = require("../utils");
-exports.FIXED_ESLINT_V8_VERSION = '8.57.1';
-exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION = '7.11.0';
 const packageJSON = require('../../package.json');
-function addAngularESLintPackages(json, useFlatConfig, options) {
+function addAngularESLintPackages(json, options) {
     return (host, context) => {
         if (!host.exists('package.json')) {
             throw new Error('Could not find a `package.json` file at the root of your workspace');
@@ -18,29 +15,25 @@ function addAngularESLintPackages(json, useFlatConfig, options) {
         }
         json.scripts = json.scripts || {};
         json.scripts['lint'] = json.scripts['lint'] || 'ng lint';
-        if (useFlatConfig) {
-            applyDevDependenciesForFlatConfig(json);
-            // Check if yarn PnP is used https://yarnpkg.com/advanced/pnpapi#processversionspnp and install extra explicit packages to make it happy
-            if (process.versions.pnp) {
-                // An explicit reference to the builder is needed for running `ng lint` in PnP
-                json.devDependencies['@angular-eslint/builder'] = packageJSON.version;
-                // The linting cannot complete without these explicitly in the root package.json in PnP
-                const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/utils'];
-                json.devDependencies['@typescript-eslint/types'] =
-                    typescriptESLintVersion;
-                json.devDependencies['@typescript-eslint/utils'] =
-                    typescriptESLintVersion;
-            }
-            else {
-                const isNpm = host.exists('package-lock.json');
-                if (!isNpm) {
-                    // Ensure @angular-eslint/builder is always resolvable in non-npm installations (https://github.com/angular-eslint/angular-eslint/issues/2241)
-                    json.devDependencies['@angular-eslint/builder'] = packageJSON.version;
-                }
-            }
+        json.devDependencies = json.devDependencies || {};
+        applyDevDependenciesForFlatConfig(json);
+        // Check if yarn PnP is used https://yarnpkg.com/advanced/pnpapi#processversionspnp and install extra explicit packages to make it happy
+        if (process.versions.pnp) {
+            // An explicit reference to the builder is needed for running `ng lint` in PnP
+            json.devDependencies['@angular-eslint/builder'] = packageJSON.version;
+            // The linting cannot complete without these explicitly in the root package.json in PnP
+            const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/utils'];
+            json.devDependencies['@typescript-eslint/types'] =
+                typescriptESLintVersion;
+            json.devDependencies['@typescript-eslint/utils'] =
+                typescriptESLintVersion;
         }
         else {
-            applyDevDependenciesForESLintRC(json);
+            const isNpm = host.exists('package-lock.json');
+            if (!isNpm) {
+                // Ensure @angular-eslint/builder is always resolvable in non-npm installations (https://github.com/angular-eslint/angular-eslint/issues/2241)
+                json.devDependencies['@angular-eslint/builder'] = packageJSON.version;
+            }
         }
         json.devDependencies = (0, utils_1.sortObjectByKeys)(json.devDependencies);
         host.overwrite('package.json', JSON.stringify(json, null, 2));
@@ -62,25 +55,6 @@ Please see https://github.com/angular-eslint/angular-eslint for how to add ESLin
         return host;
     };
 }
-function applyDevDependenciesForESLintRC(json) {
-    json.devDependencies['eslint'] = exports.FIXED_ESLINT_V8_VERSION;
-    /**
-     * @angular-eslint packages
-     */
-    json.devDependencies['@angular-eslint/builder'] = packageJSON.version;
-    json.devDependencies['@angular-eslint/eslint-plugin'] = packageJSON.version;
-    json.devDependencies['@angular-eslint/eslint-plugin-template'] =
-        packageJSON.version;
-    json.devDependencies['@angular-eslint/schematics'] = packageJSON.version;
-    json.devDependencies['@angular-eslint/template-parser'] = packageJSON.version;
-    /**
-     * @typescript-eslint packages
-     */
-    json.devDependencies['@typescript-eslint/eslint-plugin'] =
-        exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION;
-    json.devDependencies['@typescript-eslint/parser'] =
-        exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION;
-}
 function applyDevDependenciesForFlatConfig(json) {
     json.devDependencies['eslint'] = `^${packageJSON.devDependencies['eslint']}`;
     json.devDependencies['@eslint/js'] =
@@ -105,7 +79,7 @@ function applyDevDependenciesForFlatConfig(json) {
     delete json.devDependencies['@typescript-eslint/eslint-plugin'];
     delete json.devDependencies['@typescript-eslint/utils'];
 }
-function applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig) {
+function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
     return (host, context) => {
         const angularJson = (0, utils_1.readJsonInTree)(host, 'angular.json');
         if (!angularJson || !angularJson.projects) {
@@ -122,16 +96,14 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig) {
         const projectNames = Object.keys(angularJson.projects);
         if (projectNames.length === 0) {
             return (0, schematics_1.chain)([
-                useFlatConfig
-                    ? (host) => {
-                        // If the root package.json uses type: module, generate ESM content
-                        const packageJson = (0, utils_1.readJsonInTree)(host, 'package.json');
-                        const isESM = packageJson.type === 'module';
-                        host.create('eslint.config.js', (0, utils_1.createStringifiedRootESLintConfig)(null, isESM));
-                        return host;
-                    }
-                    : (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null)),
-                (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json, useFlatConfig ? 'angular-eslint' : '@angular-eslint/schematics')),
+                (host) => {
+                    // If the root package.json uses type: module, generate ESM content
+                    const packageJson = (0, utils_1.readJsonInTree)(host, 'package.json');
+                    const isESM = packageJson.type === 'module';
+                    host.create('eslint.config.js', (0, utils_1.createStringifiedRootESLintConfig)(null, isESM));
+                    return host;
+                },
+                (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json, 'angular-eslint')),
             ]);
         }
         /**
@@ -159,7 +131,7 @@ Please see https://github.com/angular-eslint/angular-eslint for more information
 `.trimStart());
         return (0, schematics_1.chain)([
             (0, schematics_1.schematic)('add-eslint-to-project', {}),
-            (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json, useFlatConfig ? 'angular-eslint' : '@angular-eslint/schematics')),
+            (0, utils_1.updateJsonInTree)('angular.json', (json) => (0, utils_1.updateSchematicCollections)(json, 'angular-eslint')),
         ]);
     };
 }
@@ -172,10 +144,9 @@ function default_1(options) {
     return (host, context) => {
         const workspacePackageJSON = host.read('package.json').toString('utf-8');
         const json = JSON.parse(workspacePackageJSON);
-        const useFlatConfig = (0, utils_1.shouldUseFlatConfig)(host, json);
         return (0, schematics_1.chain)([
-            addAngularESLintPackages(json, useFlatConfig, options),
-            applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig),
+            addAngularESLintPackages(json, options),
+            applyESLintConfigIfSingleProjectWithNoExistingTSLint(),
         ])(host, context);
     };
 }

package/dist/utils.d.ts

@@ -1,6 +1,15 @@
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-export declare const supportedFlatConfigNames: string[];
+/**
+ * The conventional flat config file names that ESLint resolves automatically
+ * and that these schematics scaffold by default.
+ *
+ * NOTE: this is NOT a restriction on what an ESLint flat config file may be
+ * named - a flat config can have any name. We only use these conventional names
+ * when detecting an existing root config or resolving its path during code
+ * generation.
+ */
+export declare const defaultFlatConfigNames: string[];
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree
@@ -29,29 +38,6 @@ export declare function addESLintTargetToProject(projectName: string, targetName
  * Utility to act on all files in a tree that are not ignored by git.
  */
 export declare function visitNotIgnoredFiles(visitor: (file: Path, host: Tree, context: SchematicContext) => void | Rule, dir?: Path): Rule;
-export declare function createRootESLintConfig(prefix: string | null): {
-    root: boolean;
-    ignorePatterns: string[];
-    overrides: {
-        files: string[];
-        extends: string[];
-        rules: {
-            '@angular-eslint/directive-selector': (string | {
-                type: string;
-                prefix: string;
-                style: string;
-            })[];
-            '@angular-eslint/component-selector': (string | {
-                type: string;
-                prefix: string;
-                style: string;
-            })[];
-        } | {
-            '@angular-eslint/directive-selector'?: undefined;
-            '@angular-eslint/component-selector'?: undefined;
-        };
-    }[];
-};
 export declare function createStringifiedRootESLintConfig(prefix: string | null, isESM: boolean): string;
 export declare function createESLintConfigForProject(projectName: string, setParserOptionsProject: boolean): Rule;
 export declare function sortObjectByKeys(obj: Record<string, unknown>): Record<string, unknown>;
@@ -66,13 +52,6 @@ export declare function determineTargetProjectName(tree: Tree, maybeProject?: st
  */
 export declare function updateSchematicCollections(angularJson: Record<string, any>, collectionName: '@angular-eslint/schematics' | 'angular-eslint'): Record<string, any>;
 export declare function updateSchematicDefaults(angularJson: Record<string, any>, schematicFullName: string, defaultValues: Record<string, unknown>): Record<string, any>;
-/**
- * In order to support both flat config and eslintrc we need to dynamically figure out
- * what the user should be using based on:
- * - their existing files
- * - their eslint version
- */
-export declare function shouldUseFlatConfig(tree: Tree, existingJson?: Record<string, unknown>): boolean;
 export declare function resolveRootESLintConfigPath(tree: Tree): string | null;
 export declare function determineNewProjectESLintConfigContentAndExtension(tree: Tree, rootConfigPath: string, projectRoot: string): {
     isESM: boolean;

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAS/E,eAAO,MAAM,wBAAwB,UAOpC,CAAC;AAEF;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAenE;AAED;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC,GAClD,IAAI,CAYN;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE3E,wBAAgB,2BAA2B,CACzC,aAAa,EAAE;IAAE,SAAS,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,GACzE,aAAa,GAAG,IAAI,CAYtB;AA6BD,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,GAC5B,IAAI,CA8DN;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,EAC3E,GAAG,GAAE,IAAoB,GACxB,IAAI,CA8BN;AAwBD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;EAyC3D;AAED,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,OAAO,GACb,MAAM,CAkDR;AAoGD,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,GAC/B,IAAI,CA2EN;AAuBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAcD;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,cAAc,EAAE,4BAA4B,GAAG,gBAAgB,uBAUhE;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAUvC;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CA8BT;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAuBrE;AAED,wBAAgB,kDAAkD,CAChE,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB;IACD,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAmCA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAQ/E;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,UAOlC,CAAC;AAEF;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAenE;AAED;;;;;GAKG;AAEH,wBAAgB,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,EAC7C,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAgB,KAAK,CAAC,GAClD,IAAI,CAYN;AAED,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC;AAE3E,wBAAgB,2BAA2B,CACzC,aAAa,EAAE;IAAE,SAAS,CAAC,EAAE,aAAa,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,GACzE,aAAa,GAAG,IAAI,CAYtB;AA6BD,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,GAC5B,IAAI,CA4DN;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,KAAK,IAAI,GAAG,IAAI,EAC3E,GAAG,GAAE,IAAoB,GACxB,IAAI,CA8BN;AAID,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,OAAO,GACb,MAAM,CAkDR;AAuDD,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,GAC/B,IAAI,CAmDN;AAcD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,cAAc,EAAE,4BAA4B,GAAG,gBAAgB,uBAUhE;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,uBAUvC;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAOrE;AAED,wBAAgB,kDAAkD,CAChE,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB;IACD,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAmCA"}

package/dist/utils.js

@@ -3,29 +3,35 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.supportedFlatConfigNames = void 0;
+exports.defaultFlatConfigNames = void 0;
 exports.readJsonInTree = readJsonInTree;
 exports.updateJsonInTree = updateJsonInTree;
 exports.getTargetsConfigFromProject = getTargetsConfigFromProject;
 exports.addESLintTargetToProject = addESLintTargetToProject;
 exports.visitNotIgnoredFiles = visitNotIgnoredFiles;
-exports.createRootESLintConfig = createRootESLintConfig;
 exports.createStringifiedRootESLintConfig = createStringifiedRootESLintConfig;
 exports.createESLintConfigForProject = createESLintConfigForProject;
 exports.sortObjectByKeys = sortObjectByKeys;
 exports.determineTargetProjectName = determineTargetProjectName;
 exports.updateSchematicCollections = updateSchematicCollections;
 exports.updateSchematicDefaults = updateSchematicDefaults;
-exports.shouldUseFlatConfig = shouldUseFlatConfig;
 exports.resolveRootESLintConfigPath = resolveRootESLintConfigPath;
 exports.determineNewProjectESLintConfigContentAndExtension = determineNewProjectESLintConfigContentAndExtension;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ignore_1 = __importDefault(require("ignore"));
-const semver_1 = __importDefault(require("semver"));
 const strip_json_comments_1 = __importDefault(require("strip-json-comments"));
 const DEFAULT_PREFIX = 'app';
-exports.supportedFlatConfigNames = [
+/**
+ * The conventional flat config file names that ESLint resolves automatically
+ * and that these schematics scaffold by default.
+ *
+ * NOTE: this is NOT a restriction on what an ESLint flat config file may be
+ * named - a flat config can have any name. We only use these conventional names
+ * when detecting an existing root config or resolving its path during code
+ * generation.
+ */
+exports.defaultFlatConfigNames = [
     'eslint.config.js',
     'eslint.config.mjs',
     'eslint.config.cjs',
@@ -123,17 +129,15 @@ function addESLintTargetToProject(projectName, targetName) {
         };
         let eslintConfig;
         if (existingProjectConfig.root !== '') {
-            if (shouldUseFlatConfig(tree)) {
-                const rootConfigPath = resolveRootESLintConfigPath(tree);
-                if (!rootConfigPath ||
-                    (!rootConfigPath.endsWith('js') && !rootConfigPath.endsWith('ts'))) {
-                    throw new Error('Root ESLint config must be a JavaScript/TypeScript file (.js,.mjs,.cjs,.ts,.mts,.cts) when using Flat Config');
-                }
-                const { ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, existingProjectConfig.root);
-                const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, `eslint.config.${ext}`);
-                if (tree.exists(flatConfigPath)) {
-                    eslintConfig = flatConfigPath;
-                }
+            const rootConfigPath = resolveRootESLintConfigPath(tree);
+            if (!rootConfigPath ||
+                (!rootConfigPath.endsWith('js') && !rootConfigPath.endsWith('ts'))) {
+                throw new Error('Root ESLint config must be a JavaScript/TypeScript file (.js,.mjs,.cjs,.ts,.mts,.cts)');
+            }
+            const { ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, existingProjectConfig.root);
+            const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, `eslint.config.${ext}`);
+            if (tree.exists(flatConfigPath)) {
+                eslintConfig = flatConfigPath;
             }
         }
         eslintTargetConfig.options.eslintConfig = eslintConfig;
@@ -173,62 +177,6 @@ function visitNotIgnoredFiles(visitor, dir = (0, core_1.normalize)('')) {
         visit(dir);
     };
 }
-function setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e) {
-    let project;
-    if (projectType === 'application') {
-        project = [`${projectRoot}/tsconfig.(app|spec).json`];
-        if (hasE2e) {
-            project.push(`${projectRoot}/e2e/tsconfig.json`);
-        }
-    }
-    // Libraries don't have an e2e directory
-    if (projectType === 'library') {
-        project = [`${projectRoot}/tsconfig.(lib|spec).json`];
-    }
-    return project;
-}
-function createRootESLintConfig(prefix) {
-    let codeRules;
-    if (prefix) {
-        codeRules = {
-            '@angular-eslint/directive-selector': [
-                'error',
-                { type: 'attribute', prefix, style: 'camelCase' },
-            ],
-            '@angular-eslint/component-selector': [
-                'error',
-                { type: 'element', prefix, style: 'kebab-case' },
-            ],
-        };
-    }
-    else {
-        codeRules = {};
-    }
-    return {
-        root: true,
-        ignorePatterns: ['projects/**/*'],
-        overrides: [
-            {
-                files: ['*.ts'],
-                extends: [
-                    'eslint:recommended',
-                    'plugin:@typescript-eslint/recommended',
-                    'plugin:@angular-eslint/recommended',
-                    'plugin:@angular-eslint/template/process-inline-templates',
-                ],
-                rules: codeRules,
-            },
-            {
-                files: ['*.html'],
-                extends: [
-                    'plugin:@angular-eslint/template/recommended',
-                    'plugin:@angular-eslint/template/accessibility',
-                ],
-                rules: {},
-            },
-        ],
-    };
-}
 function createStringifiedRootESLintConfig(prefix, isESM) {
     return `// @ts-check
 ${isESM ? 'import eslint from "@eslint/js";' : 'const eslint = require("@eslint/js");'}
@@ -278,39 +226,7 @@ ${isESM ? 'export default' : 'module.exports ='} defineConfig([
 ]);
 `;
 }
-function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
-    return {
-        extends: `${offsetFromRoot(projectRoot)}.eslintrc.json`,
-        ignorePatterns: ['!**/*'],
-        overrides: [
-            {
-                files: ['*.ts'],
-                ...(setParserOptionsProject
-                    ? {
-                        parserOptions: {
-                            project: setESLintProjectBasedOnProjectType(projectRoot, projectType, hasE2e),
-                        },
-                    }
-                    : null),
-                rules: {
-                    '@angular-eslint/directive-selector': [
-                        'error',
-                        { type: 'attribute', prefix, style: 'camelCase' },
-                    ],
-                    '@angular-eslint/component-selector': [
-                        'error',
-                        { type: 'element', prefix, style: 'kebab-case' },
-                    ],
-                },
-            },
-            {
-                files: ['*.html'],
-                rules: {},
-            },
-        ],
-    };
-}
-function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e, isESM, rootConfigPath) {
+function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, isESM, rootConfigPath) {
     const relativeRootConfigPath = offsetFromRoot(projectRoot) + rootConfigPath;
     return `// @ts-check
 ${isESM ? 'import { defineConfig } from "eslint/config";' : 'const { defineConfig } = require("eslint/config");'}
@@ -357,44 +273,33 @@ function createESLintConfigForProject(projectName, setParserOptionsProject) {
     return (tree) => {
         const angularJSON = readJsonInTree(tree, 'angular.json');
         const { root: projectRoot, projectType, prefix, } = angularJSON.projects[projectName];
-        const hasE2e = determineTargetProjectHasE2E(angularJSON, projectName);
-        const useFlatConfig = shouldUseFlatConfig(tree);
-        const alreadyHasRootFlatConfig = exports.supportedFlatConfigNames.some((name) => tree.exists(name));
-        const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
+        const alreadyHasRootFlatConfig = exports.defaultFlatConfigNames.some((name) => tree.exists(name));
         /**
          * If the root is an empty string it must be the initial project created at the
          * root by the Angular CLI's workspace schematic
          */
         if (projectRoot === '') {
-            return createRootESLintConfigFile(prefix || DEFAULT_PREFIX, useFlatConfig);
+            return createRootESLintConfigFile(prefix || DEFAULT_PREFIX);
         }
         const rules = [];
-        // If, for whatever reason, the root eslint.config.js/.eslintrc.json doesn't exist yet, create it
-        if (!alreadyHasRootESLintRC && !alreadyHasRootFlatConfig) {
-            rules.push(createRootESLintConfigFile(prefix || DEFAULT_PREFIX, useFlatConfig));
-        }
-        if (useFlatConfig) {
-            const rootConfigPath = resolveRootESLintConfigPath(tree) ?? 'eslint.config.js';
-            rules.push((tree) => {
-                const { isESM, ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, projectRoot);
-                return tree.create((0, core_1.join)((0, core_1.normalize)(projectRoot), `eslint.config.${ext}`), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e, isESM, rootConfigPath));
-            });
-        }
-        else {
-            rules.push(updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e)));
+        // If, for whatever reason, the root eslint.config.* doesn't exist yet, create it
+        if (!alreadyHasRootFlatConfig) {
+            rules.push(createRootESLintConfigFile(prefix || DEFAULT_PREFIX));
         }
+        const rootConfigPath = resolveRootESLintConfigPath(tree) ?? 'eslint.config.js';
+        rules.push((tree) => {
+            const { isESM, ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, projectRoot);
+            return tree.create((0, core_1.join)((0, core_1.normalize)(projectRoot), `eslint.config.${ext}`), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, isESM, rootConfigPath));
+        });
         return (0, schematics_1.chain)(rules);
     };
 }
-function createRootESLintConfigFile(prefix, useFlatConfig) {
+function createRootESLintConfigFile(prefix) {
     return (tree) => {
-        if (useFlatConfig) {
-            // If the root package.json uses type: module, generate ESM content
-            const packageJson = readJsonInTree(tree, 'package.json');
-            const isESM = packageJson.type === 'module';
-            return tree.create('eslint.config.js', createStringifiedRootESLintConfig(prefix, isESM));
-        }
-        return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(prefix));
+        // If the root package.json uses type: module, generate ESM content
+        const packageJson = readJsonInTree(tree, 'package.json');
+        const isESM = packageJson.type === 'module';
+        return tree.create('eslint.config.js', createStringifiedRootESLintConfig(prefix, isESM));
     };
 }
 function sortObjectByKeys(obj) {
@@ -422,15 +327,6 @@ function determineTargetProjectName(tree, maybeProject) {
     }
     return null;
 }
-/**
- * Checking if the target project has e2e setup
- * Method will check if angular project architect has e2e configuration to determine if e2e setup
- */
-function determineTargetProjectHasE2E(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-angularJSON, projectName) {
-    return !!getTargetsConfigFromProject(angularJSON.projects[projectName])?.e2e;
-}
 /**
  * See `schematicCollections` docs here:
  * https://github.com/angular/angular-cli/blob/8431b3f0769b5f95b9e13807a09293d820c4b017/docs/specifications/schematic-collections-config.md
@@ -455,62 +351,11 @@ function updateSchematicDefaults(angularJson, schematicFullName, defaultValues)
     };
     return angularJson;
 }
-/**
- * In order to support both flat config and eslintrc we need to dynamically figure out
- * what the user should be using based on:
- * - their existing files
- * - their eslint version
- */
-function shouldUseFlatConfig(tree, existingJson) {
-    let useFlatConfig = true;
-    try {
-        const alreadyHasRootFlatConfig = exports.supportedFlatConfigNames.some((name) => tree.exists(name));
-        const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
-        if (alreadyHasRootFlatConfig) {
-            useFlatConfig = true;
-        }
-        else if (alreadyHasRootESLintRC) {
-            useFlatConfig = false;
-        }
-        else {
-            const json = existingJson ??
-                JSON.parse(tree.read('package.json').toString('utf-8'));
-            json.devDependencies = json.devDependencies || {};
-            const existingESLintVersion = json.devDependencies['eslint'];
-            if (existingESLintVersion) {
-                const v = semver_1.default.minVersion(existingESLintVersion);
-                if (v) {
-                    useFlatConfig = semver_1.default.gte(v.raw, '9.0.0');
-                }
-            }
-        }
-        return useFlatConfig;
-    }
-    catch {
-        return useFlatConfig;
-    }
-}
 function resolveRootESLintConfigPath(tree) {
-    if (tree.exists('.eslintrc.json')) {
-        return '.eslintrc.json';
-    }
-    if (tree.exists('eslint.config.js')) {
-        return 'eslint.config.js';
-    }
-    if (tree.exists('eslint.config.mjs')) {
-        return 'eslint.config.mjs';
-    }
-    if (tree.exists('eslint.config.cjs')) {
-        return 'eslint.config.cjs';
-    }
-    if (tree.exists('eslint.config.ts')) {
-        return 'eslint.config.ts';
-    }
-    if (tree.exists('eslint.config.mts')) {
-        return 'eslint.config.mts';
-    }
-    if (tree.exists('eslint.config.cts')) {
-        return 'eslint.config.cts';
+    for (const name of exports.defaultFlatConfigNames) {
+        if (tree.exists(name)) {
+            return name;
+        }
     }
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "21.4.1-alpha.7",
+  "version": "22.0.0",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -36,20 +36,20 @@
     "save": "devDependencies"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 21.0.0 < 22.0.0"
+    "@angular/cli": ">= 22.0.0 < 23.0.0"
   },
   "dependencies": {
-    "@angular-devkit/core": ">= 21.0.0 < 22.0.0",
-    "@angular-devkit/schematics": ">= 21.0.0 < 22.0.0",
+    "@angular-devkit/core": ">= 22.0.0 < 23.0.0",
+    "@angular-devkit/schematics": ">= 22.0.0 < 23.0.0",
     "ignore": "7.0.5",
-    "semver": "7.7.4",
+    "semver": "7.8.0",
     "strip-json-comments": "3.1.1",
-    "@angular-eslint/eslint-plugin": "21.4.1-alpha.7",
-    "@angular-eslint/eslint-plugin-template": "21.4.1-alpha.7"
+    "@angular-eslint/eslint-plugin": "22.0.0",
+    "@angular-eslint/eslint-plugin-template": "22.0.0"
   },
   "devDependencies": {
     "@eslint/js": "10.0.1",
-    "@typescript-eslint/utils": "8.59.2",
+    "@typescript-eslint/utils": "8.60.1",
     "eslint": "10.3.0"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"