@angular-eslint/schematics 17.5.3-alpha.0 → 17.5.3-alpha.1

package/README.md

@@ -1 +1,5 @@
 # @angular-eslint/schematics
+
+Please see https://github.com/angular-eslint/angular-eslint for full usage instructions and guidance.
+
+The `@angular-eslint/schematics` package is a set of custom Angular CLI Schematics which are used to add and update dependencies and configuration files which are relevant for running ESLint on an Angular workspace.

package/dist/add-eslint-to-project/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/add-eslint-to-project/index.ts"],"names":[],"mappings":"AAQA,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAqBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/add-eslint-to-project/index.ts"],"names":[],"mappings":"AAQA,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAsBG"}

package/dist/add-eslint-to-project/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
 exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
-    const projectName = (0, utils_1.determineTargetProjectName__NX)(tree, options.project);
+    const projectName = (0, utils_1.determineTargetProjectName)(tree, options.project);
     if (!projectName) {
         throw new Error('\n' +
             `
@@ -12,7 +12,8 @@ Error: You must specify a project to add ESLint to because you have multiple pro
 E.g. npx ng g @angular-eslint/schematics:add-eslint-to-project {{YOUR_PROJECT_NAME_GOES_HERE}}
       `.trim());
     }
+    // Create the config file first so that we can check for its existence when setting the target
+    (0, utils_1.createESLintConfigForProject)(tree, projectName, options.setParserOptionsProject ?? false);
     // Update the lint builder and config in angular.json
-    (0, utils_1.addESLintTargetToProject__NX)(tree, projectName, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, projectName, options.setParserOptionsProject ?? false);
+    (0, utils_1.addESLintTargetToProject)(tree, projectName, 'lint');
 });

package/dist/application/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAWtF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAWtF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAqBG"}

package/dist/application/index.js

@@ -8,7 +8,8 @@ exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options)
     const { setParserOptionsProject, ...angularOptions } = options;
     const applicationGenerator = (0, devkit_imports_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
     await applicationGenerator(tree, angularOptions);
+    // Create the config file first so that we can check for its existence when setting the target
+    (0, utils_1.createESLintConfigForProject)(tree, options.name, options.setParserOptionsProject ?? false);
     // Update the lint builder and config in angular.json
-    (0, utils_1.addESLintTargetToProject__NX)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, options.setParserOptionsProject ?? false);
+    (0, utils_1.addESLintTargetToProject)(tree, options.name, 'lint');
 });

package/dist/library/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAWlF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAoBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAWlF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;;AAED,wBAqBG"}

package/dist/library/index.js

@@ -8,7 +8,8 @@ exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options)
     const { setParserOptionsProject, ...angularOptions } = options;
     const libraryGenerator = (0, devkit_imports_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
     await libraryGenerator(tree, angularOptions);
+    // Create the config file first so that we can check for its existence when setting the target
+    (0, utils_1.createESLintConfigForProject)(tree, options.name, options.setParserOptionsProject ?? false);
     // Update the lint builder and config in angular.json
-    (0, utils_1.addESLintTargetToProject__NX)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject__NX)(tree, options.name, options.setParserOptionsProject ?? false);
+    (0, utils_1.addESLintTargetToProject)(tree, options.name, 'lint');
 });

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

@@ -1,3 +1,5 @@
 import type { Rule } from '@angular-devkit/schematics';
+export declare const FIXED_ESLINT_V8_VERSION = "8.57.0";
+export declare const FIXED_TYPESCRIPT_ESLINT_V7_VERSION = "7.11.0";
 export default function (): Rule;
 //# sourceMappingURL=index.d.ts.map

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;AAiJ/E,MAAM,CAAC,OAAO,cAAc,IAAI,CAwB/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ng-add/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAc/E,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,kCAAkC,WAAW,CAAC;AA+K3D,MAAM,CAAC,OAAO,cAAc,IAAI,CAa/B"}

package/dist/ng-add/index.js

@@ -1,11 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION = exports.FIXED_ESLINT_V8_VERSION = void 0;
 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.0';
+exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION = '7.11.0';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const packageJSON = require('../../package.json');
-function addAngularESLintPackages() {
+function addAngularESLintPackages(json, useFlatConfig) {
     return (host, context) => {
         if (!host.exists('package.json')) {
             throw new Error('Could not find a `package.json` file at the root of your workspace');
@@ -13,50 +16,67 @@ function addAngularESLintPackages() {
         if (host.exists('tsconfig.base.json')) {
             throw new Error('\nError: Angular CLI v10.1.0 and later (and no `tsconfig.base.json`) is required in order to run this schematic. Please update your workspace and try again.\n');
         }
-        const projectPackageJSON = host.read('package.json').toString('utf-8');
-        const json = JSON.parse(projectPackageJSON);
-        json.devDependencies = json.devDependencies || {};
-        json.devDependencies['eslint'] =
-            `^${packageJSON.devDependencies['eslint']}`;
         json.scripts = json.scripts || {};
         json.scripts['lint'] = json.scripts['lint'] || 'ng lint';
-        /**
-         * @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;
-        /**
-         * It seems in certain versions of Angular CLI `ng add` will automatically add the
-         * @angular-eslint/schematics package to the dependencies section, so clean that up
-         * at this point
-         */
-        if (json.dependencies?.['@angular-eslint/schematics']) {
-            delete json.dependencies['@angular-eslint/schematics'];
+        if (useFlatConfig) {
+            applyDevDependenciesForFlatConfig(json);
+        }
+        else {
+            applyDevDependenciesForESLintRC(json);
         }
-        json.devDependencies['@angular-eslint/schematics'] = packageJSON.version;
-        json.devDependencies['@angular-eslint/template-parser'] =
-            packageJSON.version;
-        /**
-         * @typescript-eslint packages
-         */
-        const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/utils'];
-        json.devDependencies['@typescript-eslint/eslint-plugin'] =
-            typescriptESLintVersion;
-        json.devDependencies['@typescript-eslint/parser'] = typescriptESLintVersion;
         json.devDependencies = (0, utils_1.sortObjectByKeys)(json.devDependencies);
         host.overwrite('package.json', JSON.stringify(json, null, 2));
         context.addTask(new tasks_1.NodePackageInstallTask());
         context.logger.info(`
-All @angular-eslint dependencies have been successfully installed 🎉
+All angular-eslint dependencies have been successfully installed 🎉
 
 Please see https://github.com/angular-eslint/angular-eslint for how to add ESLint configuration to your project.
 `);
         return host;
     };
 }
-function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
+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']}`;
+    /**
+     * angular-eslint packages
+     */
+    json.devDependencies['angular-eslint'] = packageJSON.version;
+    // Clean up individual packages from devDependencies
+    delete json.devDependencies['@angular-eslint/builder'];
+    delete json.devDependencies['@angular-eslint/eslint-plugin'];
+    delete json.devDependencies['@angular-eslint/eslint-plugin-template'];
+    delete json.devDependencies['@angular-eslint/schematics'];
+    delete json.devDependencies['@angular-eslint/template-parser'];
+    /**
+     * typescript-eslint
+     */
+    const typescriptESLintVersion = packageJSON.devDependencies['@typescript-eslint/utils'];
+    json.devDependencies['typescript-eslint'] = typescriptESLintVersion;
+    // Clean up individual packages from devDependencies
+    delete json.devDependencies['@typescript-eslint/parser'];
+    delete json.devDependencies['@typescript-eslint/eslint-plugin'];
+    delete json.devDependencies['@typescript-eslint/utils'];
+}
+function applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig) {
     return (host, context) => {
         const angularJson = (0, utils_1.readJsonInTree)(host, 'angular.json');
         if (!angularJson || !angularJson.projects) {
@@ -73,7 +93,12 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint() {
         const projectNames = Object.keys(angularJson.projects);
         if (projectNames.length === 0) {
             return (0, schematics_1.chain)([
-                (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null)),
+                useFlatConfig
+                    ? (host) => {
+                        host.create('eslint.config.js', (0, utils_1.createStringifiedRootESLintConfig)(null));
+                        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)),
             ]);
         }
@@ -108,23 +133,12 @@ Please see https://github.com/angular-eslint/angular-eslint for more information
 }
 function default_1() {
     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(),
-            applyESLintConfigIfSingleProjectWithNoExistingTSLint(),
-            () => {
-                const additionalGitignoreEntries = `.nx/cache
-.nx/workspace-data
-`;
-                if (!host.exists('.gitignore')) {
-                    host.create('.gitignore', additionalGitignoreEntries);
-                    return;
-                }
-                const gitIgnore = host.read('.gitignore')?.toString();
-                if (gitIgnore?.includes('.nx')) {
-                    return;
-                }
-                host.overwrite('.gitignore', `${gitIgnore}\n${additionalGitignoreEntries}`);
-            },
+            addAngularESLintPackages(json, useFlatConfig),
+            applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig),
         ])(host, context);
     };
 }

package/dist/utils.d.ts

@@ -1,9 +1,3 @@
-/**
- * Some utils taken from various parts of Nx:
- * https://github.com/nrwl/nx
- *
- * Thanks, Nrwl folks!
- */
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 import type { Tree as NxTree } from './devkit-imports';
@@ -30,8 +24,7 @@ export declare function getTargetsConfigFromProject(projectConfig: {
 } & {
     targets?: TargetsConfig;
 }): TargetsConfig | null;
-export declare function addESLintTargetToProject__NX(tree: NxTree, projectName: string, targetName: 'eslint' | 'lint'): void;
-export declare function addESLintTargetToProject(projectName: string, targetName: 'eslint' | 'lint'): Rule;
+export declare function addESLintTargetToProject(tree: NxTree, projectName: string, targetName: 'eslint' | 'lint'): void;
 /**
  * Utility to act on all files in a tree that are not ignored by git.
  */
@@ -59,24 +52,26 @@ export declare function createRootESLintConfig(prefix: string | null): {
         };
     }[];
 };
-export declare function createESLintConfigForProject__NX(tree: NxTree, projectName: string, setParserOptionsProject: boolean): void;
-export declare function createESLintConfigForProject(projectName: string, setParserOptionsProject: boolean): Rule;
+export declare function createStringifiedRootESLintConfig(prefix: string | null): string;
+export declare function createESLintConfigForProject(tree: NxTree, projectName: string, setParserOptionsProject: boolean): void;
 export declare function sortObjectByKeys(obj: Record<string, unknown>): Record<string, unknown>;
 /**
  * To make certain schematic usage conversion more ergonomic, if the user does not specify a project
  * and only has a single project in their angular.json we will just go ahead and use that one.
  */
-export declare function determineTargetProjectName__NX(tree: NxTree, maybeProject?: string): string | null;
-/**
- * To make certain schematic usage conversion more ergonomic, if the user does not specify a project
- * and only has a single project in their angular.json we will just go ahead and use that one.
- */
-export declare function determineTargetProjectName(tree: Tree, maybeProject?: string): string | null;
+export declare function determineTargetProjectName(tree: NxTree, maybeProject?: string): string | null;
 /**
  * See `schematicCollections` docs here:
  * https://github.com/angular/angular-cli/blob/8431b3f0769b5f95b9e13807a09293d820c4b017/docs/specifications/schematic-collections-config.md
  */
 export declare function updateSchematicCollections(angularJson: Record<string, any>): 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: NxTree | Tree, existingJson?: Record<string, unknown>): boolean;
 export {};
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAK/E,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAwB,MAAM,kBAAkB,CAAC;AAS7E;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAcnE;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;AAQD,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;AA4CD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,QA2B9B;AAED,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,GAC5B,IAAI,CA2BN;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;AA0BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;EAyC3D;AA0FD,wBAAgB,gCAAgC,CAC9C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,QAiCjC;AAED,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,GAC/B,IAAI,CAmCN;AAsBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAcD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,uBAS1E;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"}
+{"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;AAM/E,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAwB,MAAM,kBAAkB,CAAC;AAK7E;;;;;GAKG;AAEH,wBAAgB,cAAc,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,CAcnE;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;AAqBD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,QAqC9B;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;AA0BD,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;EAyC3D;AAGD,wBAAgB,iCAAiC,CAC/C,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,MAAM,CAiDR;AAiGD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,QAsDjC;AAgBD,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,MAAM,EACZ,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,uBAS1E;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,MAAM,GAAG,IAAI,EACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CA4BT"}

package/dist/utils.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateSchematicDefaults = exports.updateSchematicCollections = exports.determineTargetProjectName = exports.determineTargetProjectName__NX = exports.sortObjectByKeys = exports.createESLintConfigForProject = exports.createESLintConfigForProject__NX = exports.createRootESLintConfig = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.addESLintTargetToProject__NX = exports.getTargetsConfigFromProject = exports.updateJsonInTree = exports.readJsonInTree = void 0;
+exports.shouldUseFlatConfig = exports.updateSchematicDefaults = exports.updateSchematicCollections = exports.determineTargetProjectName = exports.sortObjectByKeys = exports.createESLintConfigForProject = exports.createStringifiedRootESLintConfig = exports.createRootESLintConfig = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = exports.getTargetsConfigFromProject = exports.updateJsonInTree = exports.readJsonInTree = void 0;
 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 devkit_imports_1 = require("./devkit-imports");
 const DEFAULT_PREFIX = 'app';
@@ -48,11 +49,6 @@ function updateJsonInTree(path, callback) {
     };
 }
 exports.updateJsonInTree = updateJsonInTree;
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function getWorkspacePath(host) {
-    const possibleFiles = ['/workspace.json', '/angular.json', '/.angular.json'];
-    return possibleFiles.filter((path) => host.exists(path))[0];
-}
 function getTargetsConfigFromProject(projectConfig) {
     if (!projectConfig) {
         return null;
@@ -67,25 +63,9 @@ function getTargetsConfigFromProject(projectConfig) {
     return null;
 }
 exports.getTargetsConfigFromProject = getTargetsConfigFromProject;
-function offsetFromRoot(fullPathToSourceDir) {
-    const parts = (0, core_1.normalize)(fullPathToSourceDir).split('/');
-    let offset = '';
-    for (let i = 0; i < parts.length; ++i) {
-        offset += '../';
-    }
-    return offset;
-}
 function serializeJson(json) {
     return `${JSON.stringify(json, null, 2)}\n`;
 }
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function updateWorkspaceInTree(callback) {
-    return (host, context) => {
-        const path = getWorkspacePath(host);
-        host.overwrite(path, serializeJson(callback(readJsonInTree(host, path), context, host)));
-        return host;
-    };
-}
 function readProjectConfiguration(tree, projectName) {
     const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     return angularJSON.projects[projectName];
@@ -95,7 +75,7 @@ function updateProjectConfiguration(tree, projectName, projectConfig) {
     angularJSON.projects[projectName] = projectConfig;
     (0, devkit_imports_1.writeJson)(tree, 'angular.json', angularJSON);
 }
-function addESLintTargetToProject__NX(tree, projectName, targetName) {
+function addESLintTargetToProject(tree, projectName, targetName) {
     const existingProjectConfig = readProjectConfiguration(tree, projectName);
     let lintFilePatternsRoot = '';
     // Default Angular CLI project at the root of the workspace
@@ -114,35 +94,18 @@ function addESLintTargetToProject__NX(tree, projectName, targetName) {
             ],
         },
     };
+    let eslintConfig;
+    if (existingProjectConfig.root !== '') {
+        const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, 'eslint.config.js');
+        if (tree.exists(flatConfigPath)) {
+            eslintConfig = flatConfigPath;
+        }
+    }
+    eslintTargetConfig.options.eslintConfig = eslintConfig;
     existingProjectConfig.architect = existingProjectConfig.architect || {};
     existingProjectConfig.architect[targetName] = eslintTargetConfig;
     updateProjectConfiguration(tree, projectName, existingProjectConfig);
 }
-exports.addESLintTargetToProject__NX = addESLintTargetToProject__NX;
-function addESLintTargetToProject(projectName, targetName) {
-    return updateWorkspaceInTree((workspaceJson) => {
-        const existingProjectConfig = workspaceJson.projects[projectName];
-        let lintFilePatternsRoot = '';
-        // Default Angular CLI project at the root of the workspace
-        if (existingProjectConfig.root === '') {
-            lintFilePatternsRoot = existingProjectConfig.sourceRoot || 'src';
-        }
-        else {
-            lintFilePatternsRoot = existingProjectConfig.root;
-        }
-        const eslintTargetConfig = {
-            builder: '@angular-eslint/builder:lint',
-            options: {
-                lintFilePatterns: [
-                    `${lintFilePatternsRoot}/**/*.ts`,
-                    `${lintFilePatternsRoot}/**/*.html`,
-                ],
-            },
-        };
-        existingProjectConfig.architect[targetName] = eslintTargetConfig;
-        return workspaceJson;
-    });
-}
 exports.addESLintTargetToProject = addESLintTargetToProject;
 /**
  * Utility to act on all files in a tree that are not ignored by git.
@@ -235,39 +198,57 @@ function createRootESLintConfig(prefix) {
     };
 }
 exports.createRootESLintConfig = createRootESLintConfig;
-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: {},
-            },
-        ],
-    };
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+function createStringifiedRootESLintConfig(prefix) {
+    return `// @ts-check
+const eslint = require("@eslint/js");
+const tseslint = require("typescript-eslint");
+const angular = require("angular-eslint");
+  
+module.exports = tseslint.config(
+  {
+    files: ["**/*.ts"],
+    extends: [
+      eslint.configs.recommended,
+      ...tseslint.configs.recommended,
+      ...tseslint.configs.stylistic,
+      ...angular.configs.tsRecommended,
+    ],
+    processor: angular.processInlineTemplates,
+    rules: ${prefix
+        ? `{
+      "@angular-eslint/directive-selector": [
+        "error",
+        {
+          type: "attribute",
+          prefix: "${prefix}",
+          style: "camelCase",
+        },
+      ],
+      "@angular-eslint/component-selector": [
+        "error",
+        {
+          type: "element",
+          prefix: "${prefix}",
+          style: "kebab-case",
+        },
+      ],
+    }`
+        : '{}'},
+  },
+  {
+    files: ["**/*.html"],
+    extends: [
+      ...angular.configs.templateRecommended,
+      ...angular.configs.templateAccessibility,
+    ],
+    rules: {},
+  }
+);
+`;
 }
-function createProjectESLintConfig__NX(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
+exports.createStringifiedRootESLintConfig = createStringifiedRootESLintConfig;
+function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return {
         extends: `${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
@@ -299,59 +280,79 @@ function createProjectESLintConfig__NX(projectRoot, projectType, prefix, setPars
         ],
     };
 }
-function createESLintConfigForProject__NX(tree, projectName, setParserOptionsProject) {
+function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
+    return `// @ts-check
+const tseslint = require("typescript-eslint");
+const rootConfig = require("${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}eslint.config.js");
+
+module.exports = tseslint.config(
+  ...rootConfig,
+  {
+    files: ["**/*.ts"],${setParserOptionsProject
+        ? `
+    languageOptions: {
+      parserOptions: {
+        projectService: true,
+      },
+    },`
+        : ''}
+    rules: {
+      "@angular-eslint/directive-selector": [
+        "error",
+        {
+          type: "attribute",
+          prefix: "${prefix}",
+          style: "camelCase",
+        },
+      ],
+      "@angular-eslint/component-selector": [
+        "error",
+        {
+          type: "element",
+          prefix: "${prefix}",
+          style: "kebab-case",
+        },
+      ],
+    },
+  },
+  {
+    files: ["**/*.html"],
+    rules: {},
+  }
+);
+`;
+}
+function createESLintConfigForProject(tree, projectName, setParserOptionsProject) {
     const existingProjectConfig = readProjectConfiguration(tree, projectName);
     const targets = existingProjectConfig.architect || existingProjectConfig.targets;
     const { root: projectRoot, projectType, prefix } = existingProjectConfig;
     const hasE2e = !!targets?.e2e;
+    const useFlatConfig = shouldUseFlatConfig(tree);
+    const alreadyHasRootFlatConfig = tree.exists('eslint.config.js');
+    const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
     /**
      * 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__NX(tree, prefix || DEFAULT_PREFIX);
+        return createRootESLintConfigFile(tree, prefix || DEFAULT_PREFIX, useFlatConfig);
     }
-    // If, for whatever reason, the root .eslintrc.json doesn't exist yet, create it
-    if (!tree.exists('.eslintrc.json')) {
-        createRootESLintConfigFile__NX(tree, prefix || DEFAULT_PREFIX);
+    // If, for whatever reason, the root eslint.config.js/.eslintrc.json doesn't exist yet, create it
+    if (!alreadyHasRootESLintRC && !alreadyHasRootFlatConfig) {
+        createRootESLintConfigFile(tree, prefix || DEFAULT_PREFIX, useFlatConfig);
+    }
+    if (useFlatConfig) {
+        tree.write((0, core_1.join)((0, core_1.normalize)(projectRoot), 'eslint.config.js'), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
+    }
+    else {
+        (0, devkit_imports_1.writeJson)(tree, (0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
     }
-    (0, devkit_imports_1.writeJson)(tree, (0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), createProjectESLintConfig__NX(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
-}
-exports.createESLintConfigForProject__NX = createESLintConfigForProject__NX;
-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);
-        /**
-         * 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(projectName);
-        }
-        return (0, schematics_1.chain)([
-            // If, for whatever reason, the root .eslintrc.json doesn't exist yet, create it
-            tree.exists('.eslintrc.json')
-                ? () => undefined
-                : createRootESLintConfigFile(projectName),
-            updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e)),
-        ]);
-    };
 }
 exports.createESLintConfigForProject = createESLintConfigForProject;
-function createRootESLintConfigFile(projectName) {
-    return (tree) => {
-        const angularJSON = readJsonInTree(tree, getWorkspacePath(tree));
-        let lintPrefix = null;
-        if (angularJSON.projects?.[projectName]) {
-            const { prefix } = angularJSON.projects[projectName];
-            lintPrefix = prefix;
-        }
-        return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(lintPrefix));
-    };
-}
-function createRootESLintConfigFile__NX(tree, prefix) {
+function createRootESLintConfigFile(tree, prefix, useFlatConfig) {
+    if (useFlatConfig) {
+        return tree.write('eslint.config.js', createStringifiedRootESLintConfig(prefix));
+    }
     return (0, devkit_imports_1.writeJson)(tree, '.eslintrc.json', createRootESLintConfig(prefix));
 }
 function sortObjectByKeys(obj) {
@@ -365,22 +366,6 @@ function sortObjectByKeys(obj) {
     }, {});
 }
 exports.sortObjectByKeys = sortObjectByKeys;
-/**
- * To make certain schematic usage conversion more ergonomic, if the user does not specify a project
- * and only has a single project in their angular.json we will just go ahead and use that one.
- */
-function determineTargetProjectName__NX(tree, maybeProject) {
-    if (maybeProject) {
-        return maybeProject;
-    }
-    const workspaceJson = (0, devkit_imports_1.readJson)(tree, 'angular.json');
-    const projects = Object.keys(workspaceJson.projects);
-    if (projects.length === 1) {
-        return projects[0];
-    }
-    return null;
-}
-exports.determineTargetProjectName__NX = determineTargetProjectName__NX;
 /**
  * To make certain schematic usage conversion more ergonomic, if the user does not specify a project
  * and only has a single project in their angular.json we will just go ahead and use that one.
@@ -389,7 +374,7 @@ function determineTargetProjectName(tree, maybeProject) {
     if (maybeProject) {
         return maybeProject;
     }
-    const workspaceJson = readJsonInTree(tree, getWorkspacePath(tree));
+    const workspaceJson = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     const projects = Object.keys(workspaceJson.projects);
     if (projects.length === 1) {
         return projects[0];
@@ -397,15 +382,6 @@ function determineTargetProjectName(tree, maybeProject) {
     return null;
 }
 exports.determineTargetProjectName = determineTargetProjectName;
-/**
- * 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/explicit-module-boundary-types, @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
@@ -432,3 +408,39 @@ function updateSchematicDefaults(angularJson, schematicFullName, defaultValues)
     return angularJson;
 }
 exports.updateSchematicDefaults = updateSchematicDefaults;
+/**
+ * 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 = tree.exists('eslint.config.js');
+        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;
+    }
+}
+exports.shouldUseFlatConfig = shouldUseFlatConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "17.5.3-alpha.0",
+  "version": "17.5.3-alpha.1",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -27,28 +27,30 @@
       "@angular-eslint/eslint-plugin",
       "@angular-eslint/eslint-plugin-template",
       "@angular-eslint/template-parser",
-      "@angular-eslint/utils"
+      "@angular-eslint/test-utils",
+      "@angular-eslint/utils",
+      "angular-eslint"
     ]
   },
   "ng-add": {
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "17.5.3-alpha.0",
-    "@angular-eslint/eslint-plugin-template": "17.5.3-alpha.0",
-    "@nx/devkit": "^17.2.8 || ^18.0.0 || ^19.0.0",
+    "@angular-eslint/eslint-plugin": "17.5.3-alpha.1",
+    "@angular-eslint/eslint-plugin-template": "17.5.3-alpha.1",
+    "@nx/devkit": "^19.0.6",
     "ignore": "5.3.1",
-    "nx": "^17.2.8 || ^18.0.0 || ^19.0.0",
-    "strip-json-comments": "3.1.1",
-    "tmp": "0.2.3"
+    "nx": "^19.0.6",
+    "semver": "7.6.2",
+    "strip-json-comments": "3.1.1"
   },
   "devDependencies": {
-    "@types/tmp": "0.2.6",
-    "@typescript-eslint/utils": "7.11.0",
-    "eslint": "8.57.0"
+    "@typescript-eslint/utils": "8.0.0-alpha.20",
+    "eslint": "9.3.0"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 17.0.0 < 18.0.0"
+    "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
+    "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"
 }