@angular-eslint/schematics 18.2.1-alpha.6 → 18.2.1-alpha.8

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

@@ -1,7 +1,8 @@
+import type { Rule } from '@angular-devkit/schematics';
 interface Schema {
     project?: string;
     setParserOptionsProject?: boolean;
 }
-declare const _default: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
-export default _default;
+export default function addESLintToProject(schema: Schema): Rule;
+export {};
 //# sourceMappingURL=index.d.ts.map

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,wBAsBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/add-eslint-to-project/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAQ,MAAM,4BAA4B,CAAC;AAQ7D,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAuB/D"}

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

@@ -1,19 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_imports_1 = require("../devkit-imports");
+exports.default = addESLintToProject;
+const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
-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' +
-            `
+function addESLintToProject(schema) {
+    return (tree) => {
+        const projectName = (0, utils_1.determineTargetProjectName)(tree, schema.project);
+        if (!projectName) {
+            throw new Error('\n' +
+                `
 Error: You must specify a project to add ESLint to because you have multiple projects in your angular.json
 
 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');
-});
+        `.trim());
+        }
+        return (0, schematics_1.chain)([
+            // Create the ESLint config file for the project
+            (0, utils_1.createESLintConfigForProject)(projectName, schema.setParserOptionsProject ?? false),
+            // Set the lint builder and config in angular.json
+            (0, utils_1.addESLintTargetToProject)(projectName, 'lint'),
+        ]);
+    };
+}

package/dist/application/index.d.ts

@@ -1,3 +1,4 @@
+import type { Rule } from '@angular-devkit/schematics';
 /**
  * We are able to use the full, unaltered Schema directly from @schematics/angular
  * The applicable json file is copied from node_modules as a prebuiid step to ensure
@@ -7,6 +8,6 @@ import type { Schema as AngularSchema } from '@schematics/angular/application/sc
 interface Schema extends AngularSchema {
     setParserOptionsProject?: boolean;
 }
-declare const _default: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
-export default _default;
+export default function (options: Schema): Rule;
+export {};
 //# sourceMappingURL=index.d.ts.map

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,wBAqBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/application/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAE/E;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,wCAAwC,CAAC;AAMtF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAcD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAW9C"}

package/dist/application/index.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_imports_1 = require("../devkit-imports");
+exports.default = default_1;
+const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
-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, 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');
-});
+function eslintRelatedChanges(options) {
+    return (0, schematics_1.chain)([
+        // Create the ESLint config file for the project
+        (0, utils_1.createESLintConfigForProject)(options.name, options.setParserOptionsProject ?? false),
+        // Update the lint builder and config in angular.json
+        (0, utils_1.addESLintTargetToProject)(options.name, 'lint'),
+    ]);
+}
+function default_1(options) {
+    return (host, context) => {
+        // Remove angular-eslint specific options before passing to the Angular schematic
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { setParserOptionsProject, ...angularOptions } = options;
+        return (0, schematics_1.chain)([
+            (0, schematics_1.externalSchematic)('@schematics/angular', 'application', angularOptions),
+            eslintRelatedChanges(options),
+        ])(host, context);
+    };
+}

package/dist/library/index.d.ts

@@ -1,3 +1,4 @@
+import type { Rule } from '@angular-devkit/schematics';
 /**
  * We are able to use the full, unaltered Schema directly from @schematics/angular
  * The applicable json file is copied from node_modules as a prebuiid step to ensure
@@ -7,6 +8,6 @@ import type { Schema as AngularSchema } from '@schematics/angular/library/schema
 interface Schema extends AngularSchema {
     setParserOptionsProject?: boolean;
 }
-declare const _default: (generatorOptions: Schema) => (tree: any, context: any) => Promise<any>;
-export default _default;
+export default function (options: Schema): Rule;
+export {};
 //# sourceMappingURL=index.d.ts.map

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,wBAqBG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/library/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAE/E;;;;GAIG;AACH,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAMlF,UAAU,MAAO,SAAQ,aAAa;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAcD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,MAAM,GAAG,IAAI,CAW9C"}

package/dist/library/index.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const devkit_imports_1 = require("../devkit-imports");
+exports.default = default_1;
+const schematics_1 = require("@angular-devkit/schematics");
 const utils_1 = require("../utils");
-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, 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');
-});
+function eslintRelatedChanges(options) {
+    return (0, schematics_1.chain)([
+        // Create the ESLint config file for the project
+        (0, utils_1.createESLintConfigForProject)(options.name, options.setParserOptionsProject ?? false),
+        // Update the lint builder and config in angular.json
+        (0, utils_1.addESLintTargetToProject)(options.name, 'lint'),
+    ]);
+}
+function default_1(options) {
+    return (host, context) => {
+        // Remove angular-eslint specific options before passing to the Angular schematic
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const { setParserOptionsProject, ...angularOptions } = options;
+        return (0, schematics_1.chain)([
+            (0, schematics_1.externalSchematic)('@schematics/angular', 'library', angularOptions),
+            eslintRelatedChanges(options),
+        ])(host, context);
+    };
+}

package/dist/migrations/update-12-0-0/update-12-0-0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-12-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-12-0-0/update-12-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AA0FvD,MAAM,CAAC,OAAO,UAAU,SAAS,IAAI,IAAI,CAuCxC"}
+{"version":3,"file":"update-12-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-12-0-0/update-12-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AA6FvD,MAAM,CAAC,OAAO,UAAU,SAAS,IAAI,IAAI,CAuCxC"}

package/dist/migrations/update-12-0-0/update-12-0-0.js

@@ -18,7 +18,7 @@ function migrateToAccessibilityLabelHasAssociatedControlSchema(rule) {
         }),
     };
 }
-function migrateFromAccessibilityLabelFor({ overrides, rules }) {
+function migrateFromAccessibilityLabelFor({ overrides, rules, }) {
     migrateToAccessibilityLabelHasAssociatedControlSchema(rules?.['@angular-eslint/template/accessibility-label-for']);
     migrateToAccessibilityLabelHasAssociatedControlName(rules);
     for (const override of overrides ?? []) {

package/dist/migrations/update-2-0-0/update-2-0-0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-2-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-2-0-0/update-2-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AA6F/E,MAAM,CAAC,OAAO,cAAc,IAAI,CAE/B"}
+{"version":3,"file":"update-2-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-2-0-0/update-2-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAgG/E,MAAM,CAAC,OAAO,cAAc,IAAI,CAE/B"}

package/dist/migrations/update-3-0-0/update-3-0-0.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-3-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-3-0-0/update-3-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AAyI/E,MAAM,CAAC,OAAO,cAAc,IAAI,CAM/B"}
+{"version":3,"file":"update-3-0-0.d.ts","sourceRoot":"","sources":["../../../src/migrations/update-3-0-0/update-3-0-0.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAA0B,MAAM,4BAA4B,CAAC;AA2I/E,MAAM,CAAC,OAAO,cAAc,IAAI,CAM/B"}

package/dist/utils.d.ts

@@ -1,6 +1,5 @@
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
-import type { Tree as NxTree } from './devkit-imports';
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree
@@ -24,7 +23,7 @@ export declare function getTargetsConfigFromProject(projectConfig: {
 } & {
     targets?: TargetsConfig;
 }): TargetsConfig | null;
-export declare function addESLintTargetToProject(tree: NxTree, projectName: string, targetName: 'eslint' | 'lint'): void;
+export declare function addESLintTargetToProject(projectName: string, targetName: 'eslint' | 'lint'): Rule;
 /**
  * Utility to act on all files in a tree that are not ignored by git.
  */
@@ -53,13 +52,13 @@ export declare function createRootESLintConfig(prefix: string | null): {
     }[];
 };
 export declare function createStringifiedRootESLintConfig(prefix: string | null): string;
-export declare function createESLintConfigForProject(tree: NxTree, projectName: string, setParserOptionsProject: boolean): void;
+export declare function createESLintConfigForProject(projectName: string, setParserOptionsProject: boolean): Rule;
 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(tree: NxTree, maybeProject?: string): string | null;
+export declare function determineTargetProjectName(tree: Tree, maybeProject?: string): string | null;
 /**
  * See `schematicCollections` docs here:
  * https://github.com/angular/angular-cli/blob/8431b3f0769b5f95b9e13807a09293d820c4b017/docs/specifications/schematic-collections-config.md
@@ -72,6 +71,6 @@ export declare function updateSchematicDefaults(angularJson: Record<string, any>
  * - their existing files
  * - their eslint version
  */
-export declare function shouldUseFlatConfig(tree: NxTree | Tree, existingJson?: Record<string, unknown>): boolean;
+export declare function shouldUseFlatConfig(tree: 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;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"}
+{"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;;;;;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;AA6BD,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,QAAQ,GAAG,MAAM,GAC5B,IAAI,CA2CN;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,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,GAC/B,IAAI,CA+DN;AAoBD,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,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,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACrC,OAAO,CA4BT"}

package/dist/utils.js

@@ -21,7 +21,6 @@ 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';
 /**
  * This method is specifically for reading JSON files in a Tree
@@ -72,48 +71,58 @@ function getTargetsConfigFromProject(projectConfig) {
     }
     return null;
 }
+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`;
 }
-function readProjectConfiguration(tree, projectName) {
-    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
-    return angularJSON.projects[projectName];
-}
-function updateProjectConfiguration(tree, projectName, projectConfig) {
-    const angularJSON = (0, devkit_imports_1.readJson)(tree, 'angular.json');
-    angularJSON.projects[projectName] = projectConfig;
-    (0, devkit_imports_1.writeJson)(tree, 'angular.json', angularJSON);
-}
-function addESLintTargetToProject(tree, projectName, targetName) {
-    const existingProjectConfig = readProjectConfiguration(tree, 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`,
-            ],
-        },
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function updateWorkspaceInTree(callback) {
+    return (host, context) => {
+        const path = 'angular.json';
+        host.overwrite(path, serializeJson(callback(readJsonInTree(host, path), context, host)));
+        return host;
     };
-    let eslintConfig;
-    if (existingProjectConfig.root !== '') {
-        const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, 'eslint.config.js');
-        if (tree.exists(flatConfigPath)) {
-            eslintConfig = flatConfigPath;
+}
+function addESLintTargetToProject(projectName, targetName) {
+    return updateWorkspaceInTree((workspaceJson, _, tree) => {
+        const existingProjectConfig = workspaceJson.projects[projectName];
+        let lintFilePatternsRoot = '';
+        // Default Angular CLI project at the root of the workspace
+        if (existingProjectConfig.root === '') {
+            lintFilePatternsRoot = existingProjectConfig.sourceRoot || 'src';
         }
-    }
-    eslintTargetConfig.options.eslintConfig = eslintConfig;
-    existingProjectConfig.architect = existingProjectConfig.architect || {};
-    existingProjectConfig.architect[targetName] = eslintTargetConfig;
-    updateProjectConfiguration(tree, projectName, existingProjectConfig);
+        else {
+            lintFilePatternsRoot = existingProjectConfig.root;
+        }
+        const eslintTargetConfig = {
+            builder: '@angular-eslint/builder:lint',
+            options: {
+                lintFilePatterns: [
+                    `${lintFilePatternsRoot}/**/*.ts`,
+                    `${lintFilePatternsRoot}/**/*.html`,
+                ],
+            },
+        };
+        let eslintConfig;
+        if (existingProjectConfig.root !== '') {
+            const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, 'eslint.config.js');
+            if (tree.exists(flatConfigPath)) {
+                eslintConfig = flatConfigPath;
+            }
+        }
+        // TODO: fix
+        eslintTargetConfig.options.eslintConfig = eslintConfig;
+        existingProjectConfig.architect = existingProjectConfig.architect || {};
+        existingProjectConfig.architect[targetName] = eslintTargetConfig;
+        return workspaceJson;
+    });
 }
 /**
  * Utility to act on all files in a tree that are not ignored by git.
@@ -255,7 +264,7 @@ module.exports = tseslint.config(
 }
 function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
     return {
-        extends: `${(0, devkit_imports_1.offsetFromRoot)(projectRoot)}.eslintrc.json`,
+        extends: `${offsetFromRoot(projectRoot)}.eslintrc.json`,
         ignorePatterns: ['!**/*'],
         overrides: [
             {
@@ -288,7 +297,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_imports_1.offsetFromRoot)(projectRoot)}eslint.config.js");
+const rootConfig = require("${offsetFromRoot(projectRoot)}eslint.config.js");
 
 module.exports = tseslint.config(
   ...rootConfig,
@@ -327,37 +336,42 @@ module.exports = tseslint.config(
 );
 `;
 }
-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(tree, prefix || DEFAULT_PREFIX, useFlatConfig);
-    }
-    // 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));
-    }
+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 = 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(prefix || DEFAULT_PREFIX, useFlatConfig);
+        }
+        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) {
+            rules.push((tree) => tree.create((0, core_1.join)((0, core_1.normalize)(projectRoot), 'eslint.config.js'), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e)));
+        }
+        else {
+            rules.push(updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e)));
+        }
+        return (0, schematics_1.chain)(rules);
+    };
 }
-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 createRootESLintConfigFile(prefix, useFlatConfig) {
+    return (tree) => {
+        if (useFlatConfig) {
+            return tree.create('eslint.config.js', createStringifiedRootESLintConfig(prefix));
+        }
+        return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(prefix));
+    };
 }
 function sortObjectByKeys(obj) {
     return Object.keys(obj)
@@ -377,13 +391,22 @@ function determineTargetProjectName(tree, maybeProject) {
     if (maybeProject) {
         return maybeProject;
     }
-    const workspaceJson = (0, devkit_imports_1.readJson)(tree, 'angular.json');
+    const workspaceJson = readJsonInTree(tree, 'angular.json');
     const projects = Object.keys(workspaceJson.projects);
     if (projects.length === 1) {
         return projects[0];
     }
     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/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "18.2.1-alpha.6",
+  "version": "18.2.1-alpha.8",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -36,11 +36,9 @@
     "save": "devDependencies"
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "18.2.1-alpha.6",
-    "@angular-eslint/eslint-plugin-template": "18.2.1-alpha.6",
-    "@nx/devkit": ">= 19.5.4 < 20.0.0",
+    "@angular-eslint/eslint-plugin": "18.2.1-alpha.8",
+    "@angular-eslint/eslint-plugin-template": "18.2.1-alpha.8",
     "ignore": "5.3.2",
-    "nx": "^19.0.6",
     "semver": "7.6.3",
     "strip-json-comments": "3.1.1"
   },