@angular-eslint/schematics 18.0.0-alpha.13 → 18.0.0-alpha.14

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

@@ -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":"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)(tree, options.name, 'lint');
-    (0, utils_1.createESLintConfigForProject)(tree, options.name, options.setParserOptionsProject ?? false);
 });

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)(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,CA2B/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,19 +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 || {};
-        let useFlatConfig = true;
-        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');
-            }
-        }
+        const useFlatConfig = (0, utils_1.shouldUseFlatConfig)(host, json);
         return (0, schematics_1.chain)([
             addAngularESLintPackages(json, useFlatConfig),
             applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig),

package/dist/utils.d.ts

@@ -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;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,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,CA4CR;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,7 +3,7 @@ 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 ignore_1 = __importDefault(require("ignore"));
@@ -324,35 +324,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
@@ -431,3 +405,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.13",
+  "version": "18.0.0-alpha.14",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -34,17 +34,16 @@
     "save": false
   },
   "dependencies": {
-    "@angular-eslint/eslint-plugin": "18.0.0-alpha.13",
-    "@angular-eslint/eslint-plugin-template": "18.0.0-alpha.13",
+    "@angular-eslint/eslint-plugin": "18.0.0-alpha.14",
+    "@angular-eslint/eslint-plugin-template": "18.0.0-alpha.14",
     "@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": {