@angular-eslint/schematics 18.0.0-alpha.9 → 18.0.0

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     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)(tree, projectName, 'lint');
-    (0, utils_1.createESLintConfigForProject)(tree, projectName, options.setParserOptionsProject ?? false);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAMtF,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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { setParserOptionsProject, ...angularOptions } = options;
-    const applicationGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'application');
+    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)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject)(tree, options.name, options.setParserOptionsProject ?? false);
 });

package/dist/devkit-imports.d.ts

@@ -0,0 +1,11 @@
+/**
+ * In order to prevent the project graph cache from showing up at the root of the user's
+ * workspace, we set a custom cache directory before importing anything from `@nx/devkit`.
+ *
+ * `no-restricted-imports` eslint rule has been configured for this project to prevent
+ * accidental imports in other files. All imports should come from here to ensure consistency.
+ */
+export { convertNxGenerator, offsetFromRoot, readJson, writeJson, } from '@nx/devkit';
+export type { ProjectConfiguration, Tree } from '@nx/devkit';
+export { wrapAngularDevkitSchematic } from '@nx/devkit/ngcli-adapter';
+//# sourceMappingURL=devkit-imports.d.ts.map

package/dist/devkit-imports.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"devkit-imports.d.ts","sourceRoot":"","sources":["../src/devkit-imports.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,SAAS,GACV,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC"}

package/dist/devkit-imports.js

@@ -0,0 +1,21 @@
+"use strict";
+/**
+ * In order to prevent the project graph cache from showing up at the root of the user's
+ * workspace, we set a custom cache directory before importing anything from `@nx/devkit`.
+ *
+ * `no-restricted-imports` eslint rule has been configured for this project to prevent
+ * accidental imports in other files. All imports should come from here to ensure consistency.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapAngularDevkitSchematic = exports.writeJson = exports.readJson = exports.offsetFromRoot = exports.convertNxGenerator = void 0;
+const node_path_1 = require("node:path");
+process.env.NX_PROJECT_GRAPH_CACHE_DIRECTORY = (0, node_path_1.join)(__dirname, '..', '.nx-cache');
+/* eslint-disable no-restricted-imports */
+var devkit_1 = require("@nx/devkit");
+Object.defineProperty(exports, "convertNxGenerator", { enumerable: true, get: function () { return devkit_1.convertNxGenerator; } });
+Object.defineProperty(exports, "offsetFromRoot", { enumerable: true, get: function () { return devkit_1.offsetFromRoot; } });
+Object.defineProperty(exports, "readJson", { enumerable: true, get: function () { return devkit_1.readJson; } });
+Object.defineProperty(exports, "writeJson", { enumerable: true, get: function () { return devkit_1.writeJson; } });
+var ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+Object.defineProperty(exports, "wrapAngularDevkitSchematic", { enumerable: true, get: function () { return ngcli_adapter_1.wrapAngularDevkitSchematic; } });
+/* eslint-enable no-restricted-imports */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAMlF,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

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_1 = require("@nx/devkit");
-const ngcli_adapter_1 = require("@nx/devkit/ngcli-adapter");
+const devkit_imports_1 = require("../devkit-imports");
 const utils_1 = require("../utils");
-exports.default = (0, devkit_1.convertNxGenerator)(async (tree, options) => {
+exports.default = (0, devkit_imports_1.convertNxGenerator)(async (tree, options) => {
     // Remove angular-eslint specific options before passing to the Angular schematic
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     const { setParserOptionsProject, ...angularOptions } = options;
-    const libraryGenerator = (0, ngcli_adapter_1.wrapAngularDevkitSchematic)('@schematics/angular', 'library');
+    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)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject)(tree, options.name, options.setParserOptionsProject ?? false);
 });

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;AAc/E,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAChD,eAAO,MAAM,kCAAkC,WAAW,CAAC;AA+K3D,MAAM,CAAC,OAAO,cAAc,IAAI,CAuB/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,12 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 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 semver_1 = __importDefault(require("semver"));
 const utils_1 = require("../utils");
 exports.FIXED_ESLINT_V8_VERSION = '8.57.0';
 exports.FIXED_TYPESCRIPT_ESLINT_V7_VERSION = '7.11.0';
@@ -139,13 +135,7 @@ function default_1() {
     return (host, context) => {
         const workspacePackageJSON = host.read('package.json').toString('utf-8');
         const json = JSON.parse(workspacePackageJSON);
-        /**
-         * Until eslint v9, typescript-eslint v8 and flat config stabilize completely, allow the user to set a previous version of eslint
-         * as a signal for what kind of config and dependencies to set up.
-         */
-        json.devDependencies = json.devDependencies || {};
-        const existingESLintVersion = json.devDependencies['eslint'];
-        const useFlatConfig = !(existingESLintVersion && semver_1.default.major(existingESLintVersion) < 9);
+        const useFlatConfig = (0, utils_1.shouldUseFlatConfig)(host, json);
         return (0, schematics_1.chain)([
             addAngularESLintPackages(json, useFlatConfig),
             applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig),

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import type { Tree as NxTree } from '@nx/devkit';
+import type { Tree as NxTree } from './devkit-imports';
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree
@@ -66,5 +66,12 @@ export declare function determineTargetProjectName(tree: NxTree, maybeProject?:
  */
 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,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAE/E,OAAO,KAAK,EAAE,IAAI,IAAI,MAAM,EAAwB,MAAM,YAAY,CAAC;AASvE;;;;;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,QA2B9B;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,CA4CR;AAiGD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,QA8EjC;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"}
+{"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,13 +3,13 @@ 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.sortObjectByKeys = exports.createESLintConfigForProject = exports.createStringifiedRootESLintConfig = exports.createRootESLintConfig = exports.visitNotIgnoredFiles = exports.addESLintTargetToProject = 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 devkit_1 = require("@nx/devkit");
 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';
 /**
  * This method is specifically for reading JSON files in a Tree
@@ -67,13 +67,13 @@ function serializeJson(json) {
     return `${JSON.stringify(json, null, 2)}\n`;
 }
 function readProjectConfiguration(tree, projectName) {
-    const angularJSON = (0, devkit_1.readJson)(tree, 'angular.json');
+    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     return angularJSON.projects[projectName];
 }
 function updateProjectConfiguration(tree, projectName, projectConfig) {
-    const angularJSON = (0, devkit_1.readJson)(tree, 'angular.json');
+    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     angularJSON.projects[projectName] = projectConfig;
-    (0, devkit_1.writeJson)(tree, 'angular.json', angularJSON);
+    (0, devkit_imports_1.writeJson)(tree, 'angular.json', angularJSON);
 }
 function addESLintTargetToProject(tree, projectName, targetName) {
     const existingProjectConfig = readProjectConfiguration(tree, projectName);
@@ -94,6 +94,14 @@ function addESLintTargetToProject(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);
@@ -192,22 +200,6 @@ function createRootESLintConfig(prefix) {
 exports.createRootESLintConfig = createRootESLintConfig;
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 function createStringifiedRootESLintConfig(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 `// @ts-check
 const eslint = require("@eslint/js");
 const tseslint = require("typescript-eslint");
@@ -223,7 +215,26 @@ module.exports = tseslint.config(
       ...angular.configs.tsRecommended,
     ],
     processor: angular.processInlineTemplates,
-    rules: ${JSON.stringify(codeRules, null, 2)},
+    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"],
@@ -239,7 +250,7 @@ module.exports = tseslint.config(
 exports.createStringifiedRootESLintConfig = createStringifiedRootESLintConfig;
 function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return {
-        extends: `${(0, devkit_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
+        extends: `${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
             {
@@ -272,7 +283,7 @@ function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOp
 function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return `// @ts-check
 const tseslint = require("typescript-eslint");
-const rootConfig = require("${(0, devkit_1.offsetFromRoot)(projectRoot)}eslint.config.js");
+const rootConfig = require("${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}eslint.config.js");
 
 module.exports = tseslint.config(
   ...rootConfig,
@@ -316,35 +327,9 @@ function createESLintConfigForProject(tree, projectName, setParserOptionsProject
     const targets = existingProjectConfig.architect || existingProjectConfig.targets;
     const { root: projectRoot, projectType, prefix } = existingProjectConfig;
     const hasE2e = !!targets?.e2e;
-    /**
-     * 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
-     */
-    let useFlatConfig = true;
+    const useFlatConfig = shouldUseFlatConfig(tree);
     const alreadyHasRootFlatConfig = tree.exists('eslint.config.js');
     const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
-    if (alreadyHasRootFlatConfig) {
-        useFlatConfig = true;
-    }
-    else if (alreadyHasRootESLintRC) {
-        useFlatConfig = false;
-    }
-    else {
-        // If no existing config file, check if they are using at least eslint 9 (when flat config became the default)
-        let eslintVersion;
-        try {
-            eslintVersion = JSON.parse(tree.read('package.json', 'utf-8'))
-                .devDependencies?.['eslint'];
-            // eslint-disable-next-line no-empty
-        }
-        catch { }
-        if (eslintVersion) {
-            const v = semver_1.default.minVersion(eslintVersion);
-            useFlatConfig = semver_1.default.gte(v.raw, '9.0.0');
-        }
-    }
     /**
      * If the root is an empty string it must be the initial project created at the
      * root by the Angular CLI's workspace schematic
@@ -360,7 +345,7 @@ function createESLintConfigForProject(tree, projectName, setParserOptionsProject
         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_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(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e));
     }
 }
 exports.createESLintConfigForProject = createESLintConfigForProject;
@@ -368,7 +353,7 @@ function createRootESLintConfigFile(tree, prefix, useFlatConfig) {
     if (useFlatConfig) {
         return tree.write('eslint.config.js', createStringifiedRootESLintConfig(prefix));
     }
-    return (0, devkit_1.writeJson)(tree, '.eslintrc.json', createRootESLintConfig(prefix));
+    return (0, devkit_imports_1.writeJson)(tree, '.eslintrc.json', createRootESLintConfig(prefix));
 }
 function sortObjectByKeys(obj) {
     return Object.keys(obj)
@@ -389,7 +374,7 @@ function determineTargetProjectName(tree, maybeProject) {
     if (maybeProject) {
         return maybeProject;
     }
-    const workspaceJson = (0, devkit_1.readJson)(tree, 'angular.json');
+    const workspaceJson = (0, devkit_imports_1.readJson)(tree, 'angular.json');
     const projects = Object.keys(workspaceJson.projects);
     if (projects.length === 1) {
         return projects[0];
@@ -423,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": "18.0.0-alpha.9",
+  "version": "18.0.0",
   "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": false
+    "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "18.0.0-alpha.9",
-    "@angular-eslint/eslint-plugin-template": "18.0.0-alpha.9",
+    "@angular-eslint/eslint-plugin": "18.0.0",
+    "@angular-eslint/eslint-plugin-template": "18.0.0",
     "@nx/devkit": "^19.0.6",
     "ignore": "5.3.1",
     "nx": "^19.0.6",
-    "strip-json-comments": "3.1.1",
-    "tmp": "0.2.3"
+    "semver": "7.6.2",
+    "strip-json-comments": "3.1.1"
   },
   "devDependencies": {
-    "@types/tmp": "0.2.6",
-    "@typescript-eslint/utils": "8.0.0-alpha.17",
+    "@typescript-eslint/utils": "8.0.0-alpha.20",
     "eslint": "9.3.0"
   },
   "peerDependencies": {
-    "@angular/cli": ">= 18.0.0 < 19.0.0"
+    "@angular-devkit/core": ">= 18.0.0 < 19.0.0",
+    "@angular-devkit/schematics": ">= 18.0.0 < 19.0.0"
   },
   "gitHead": "e2006e5e9c99e5a943d1a999e0efa5247d29ec24"
 }