@angular-eslint/schematics 18.3.2-alpha.9 → 18.4.0

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,CAa/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;AAkL3D,MAAM,CAAC,OAAO,cAAc,IAAI,CAa/B"}

package/dist/ng-add/index.js

@@ -96,7 +96,10 @@ function applyESLintConfigIfSingleProjectWithNoExistingTSLint(useFlatConfig) {
             return (0, schematics_1.chain)([
                 useFlatConfig
                     ? (host) => {
-                        host.create('eslint.config.js', (0, utils_1.createStringifiedRootESLintConfig)(null));
+                        // If the root package.json uses type: module, generate ESM content
+                        const packageJson = (0, utils_1.readJsonInTree)(host, 'package.json');
+                        const isESM = packageJson.type === 'module';
+                        host.create('eslint.config.js', (0, utils_1.createStringifiedRootESLintConfig)(null, isESM));
                         return host;
                     }
                     : (0, utils_1.updateJsonInTree)('.eslintrc.json', () => (0, utils_1.createRootESLintConfig)(null)),

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
 import type { Path } from '@angular-devkit/core';
 import type { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+export declare const supportedFlatConfigNames: string[];
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree
@@ -51,7 +52,7 @@ export declare function createRootESLintConfig(prefix: string | null): {
         };
     }[];
 };
-export declare function createStringifiedRootESLintConfig(prefix: string | null): string;
+export declare function createStringifiedRootESLintConfig(prefix: string | null, isESM: boolean): string;
 export declare function createESLintConfigForProject(projectName: string, setParserOptionsProject: boolean): Rule;
 export declare function sortObjectByKeys(obj: Record<string, unknown>): Record<string, unknown>;
 /**
@@ -72,5 +73,10 @@ export declare function updateSchematicDefaults(angularJson: Record<string, any>
  * - their eslint version
  */
 export declare function shouldUseFlatConfig(tree: Tree, existingJson?: Record<string, unknown>): boolean;
+export declare function resolveRootESLintConfigPath(tree: Tree): string | null;
+export declare function determineNewProjectESLintConfigContentAndExtension(tree: Tree, rootConfigPath: string, projectRoot: string): {
+    isESM: boolean;
+    ext: string;
+};
 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;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"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAS/E,eAAO,MAAM,wBAAwB,UAIpC,CAAC;AAEF;;;;;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,CA2DN;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,EACrB,KAAK,EAAE,OAAO,GACb,MAAM,CAiDR;AAoGD,wBAAgB,4BAA4B,CAC1C,WAAW,EAAE,MAAM,EACnB,uBAAuB,EAAE,OAAO,GAC/B,IAAI,CA2EN;AAuBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB;AAED;;;GAGG;AACH,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,CAAC,EAAE,MAAM,GACpB,MAAM,GAAG,IAAI,CAUf;AAcD;;;GAGG;AACH,wBAAgB,0BAA0B,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,CA8BT;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAcrE;AAED,wBAAgB,kDAAkD,CAChE,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB;IACD,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;CACb,CAmCA"}

package/dist/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportedFlatConfigNames = void 0;
 exports.readJsonInTree = readJsonInTree;
 exports.updateJsonInTree = updateJsonInTree;
 exports.getTargetsConfigFromProject = getTargetsConfigFromProject;
@@ -16,12 +17,19 @@ exports.determineTargetProjectName = determineTargetProjectName;
 exports.updateSchematicCollections = updateSchematicCollections;
 exports.updateSchematicDefaults = updateSchematicDefaults;
 exports.shouldUseFlatConfig = shouldUseFlatConfig;
+exports.resolveRootESLintConfigPath = resolveRootESLintConfigPath;
+exports.determineNewProjectESLintConfigContentAndExtension = determineNewProjectESLintConfigContentAndExtension;
 const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ignore_1 = __importDefault(require("ignore"));
 const semver_1 = __importDefault(require("semver"));
 const strip_json_comments_1 = __importDefault(require("strip-json-comments"));
 const DEFAULT_PREFIX = 'app';
+exports.supportedFlatConfigNames = [
+    'eslint.config.js',
+    'eslint.config.mjs',
+    'eslint.config.cjs',
+];
 /**
  * This method is specifically for reading JSON files in a Tree
  * @param host The host tree
@@ -112,12 +120,18 @@ function addESLintTargetToProject(projectName, targetName) {
         };
         let eslintConfig;
         if (existingProjectConfig.root !== '') {
-            const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, 'eslint.config.js');
-            if (tree.exists(flatConfigPath)) {
-                eslintConfig = flatConfigPath;
+            if (shouldUseFlatConfig(tree)) {
+                const rootConfigPath = resolveRootESLintConfigPath(tree);
+                if (!rootConfigPath || !rootConfigPath.endsWith('js')) {
+                    throw new Error('Root ESLint config must be a JavaScript file (.js,.mjs,.cjs) when using Flat Config');
+                }
+                const { ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, existingProjectConfig.root);
+                const flatConfigPath = (0, core_1.join)(existingProjectConfig.root, `eslint.config.${ext}`);
+                if (tree.exists(flatConfigPath)) {
+                    eslintConfig = flatConfigPath;
+                }
             }
         }
-        // TODO: fix
         eslintTargetConfig.options.eslintConfig = eslintConfig;
         existingProjectConfig.architect = existingProjectConfig.architect || {};
         existingProjectConfig.architect[targetName] = eslintTargetConfig;
@@ -214,13 +228,13 @@ function createRootESLintConfig(prefix) {
     };
 }
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-function createStringifiedRootESLintConfig(prefix) {
+function createStringifiedRootESLintConfig(prefix, isESM) {
     return `// @ts-check
-const eslint = require("@eslint/js");
-const tseslint = require("typescript-eslint");
-const angular = require("angular-eslint");
+${isESM ? 'import eslint from "@eslint/js";' : 'const eslint = require("@eslint/js");'}
+${isESM ? 'import tseslint from "typescript-eslint";' : 'const tseslint = require("typescript-eslint");'}
+${isESM ? 'import angular from "angular-eslint";' : 'const angular = require("angular-eslint");'}
 
-module.exports = tseslint.config(
+${isESM ? 'export default' : 'module.exports ='} tseslint.config(
   {
     files: ["**/*.ts"],
     extends: [
@@ -294,12 +308,13 @@ function createProjectESLintConfig(projectRoot, projectType, prefix, setParserOp
         ],
     };
 }
-function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e) {
+function createStringifiedProjectESLintConfig(projectRoot, projectType, prefix, setParserOptionsProject, hasE2e, isESM, rootConfigPath) {
+    const relativeRootConfigPath = offsetFromRoot(projectRoot) + rootConfigPath;
     return `// @ts-check
-const tseslint = require("typescript-eslint");
-const rootConfig = require("${offsetFromRoot(projectRoot)}eslint.config.js");
+${isESM ? 'import tseslint from "typescript-eslint";' : 'const tseslint = require("typescript-eslint");'}
+${isESM ? `import rootConfig from "${relativeRootConfigPath}";` : `const rootConfig = require("${relativeRootConfigPath}");`}
 
-module.exports = tseslint.config(
+${isESM ? 'export default' : 'module.exports ='} tseslint.config(
   ...rootConfig,
   {
     files: ["**/*.ts"],${setParserOptionsProject
@@ -342,7 +357,7 @@ function createESLintConfigForProject(projectName, setParserOptionsProject) {
         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 alreadyHasRootFlatConfig = exports.supportedFlatConfigNames.some((name) => tree.exists(name));
         const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
         /**
          * If the root is an empty string it must be the initial project created at the
@@ -357,7 +372,11 @@ function createESLintConfigForProject(projectName, setParserOptionsProject) {
             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)));
+            const rootConfigPath = resolveRootESLintConfigPath(tree) ?? 'eslint.config.js';
+            rules.push((tree) => {
+                const { isESM, ext } = determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, projectRoot);
+                return tree.create((0, core_1.join)((0, core_1.normalize)(projectRoot), `eslint.config.${ext}`), createStringifiedProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e, isESM, rootConfigPath));
+            });
         }
         else {
             rules.push(updateJsonInTree((0, core_1.join)((0, core_1.normalize)(projectRoot), '.eslintrc.json'), () => createProjectESLintConfig(projectRoot, projectType || 'library', prefix || DEFAULT_PREFIX, setParserOptionsProject, hasE2e)));
@@ -368,7 +387,10 @@ function createESLintConfigForProject(projectName, setParserOptionsProject) {
 function createRootESLintConfigFile(prefix, useFlatConfig) {
     return (tree) => {
         if (useFlatConfig) {
-            return tree.create('eslint.config.js', createStringifiedRootESLintConfig(prefix));
+            // If the root package.json uses type: module, generate ESM content
+            const packageJson = readJsonInTree(tree, 'package.json');
+            const isESM = packageJson.type === 'module';
+            return tree.create('eslint.config.js', createStringifiedRootESLintConfig(prefix, isESM));
         }
         return updateJsonInTree('.eslintrc.json', () => createRootESLintConfig(prefix));
     };
@@ -440,7 +462,7 @@ function updateSchematicDefaults(angularJson, schematicFullName, defaultValues)
 function shouldUseFlatConfig(tree, existingJson) {
     let useFlatConfig = true;
     try {
-        const alreadyHasRootFlatConfig = tree.exists('eslint.config.js');
+        const alreadyHasRootFlatConfig = exports.supportedFlatConfigNames.some((name) => tree.exists(name));
         const alreadyHasRootESLintRC = tree.exists('.eslintrc.json');
         if (alreadyHasRootFlatConfig) {
             useFlatConfig = true;
@@ -466,3 +488,54 @@ function shouldUseFlatConfig(tree, existingJson) {
         return useFlatConfig;
     }
 }
+function resolveRootESLintConfigPath(tree) {
+    if (tree.exists('.eslintrc.json')) {
+        return '.eslintrc.json';
+    }
+    if (tree.exists('eslint.config.js')) {
+        return 'eslint.config.js';
+    }
+    if (tree.exists('eslint.config.mjs')) {
+        return 'eslint.config.mjs';
+    }
+    if (tree.exists('eslint.config.cjs')) {
+        return 'eslint.config.cjs';
+    }
+    return null;
+}
+function determineNewProjectESLintConfigContentAndExtension(tree, rootConfigPath, projectRoot) {
+    try {
+        /**
+         * The decision on exactly what config format an extension to use is based on the format
+         * used in the root config, and the project's local package.json type (if any).
+         */
+        const isRootESM = rootConfigPath.endsWith('.cjs')
+            ? false
+            : rootConfigPath.endsWith('.mjs') ||
+                readJsonInTree(tree, 'package.json').type === 'module';
+        const projectPackageJsonPath = (0, core_1.join)((0, core_1.normalize)(projectRoot), 'package.json');
+        let isESM = isRootESM;
+        let ext = 'js';
+        if (tree.exists(projectPackageJsonPath)) {
+            const projectPackageJson = readJsonInTree(tree, projectPackageJsonPath);
+            const isProjectESM = projectPackageJson.type === 'module';
+            if (isRootESM && !isProjectESM) {
+                ext = 'mjs';
+                isESM = true;
+            }
+            else if (!isRootESM && isProjectESM) {
+                ext = 'cjs';
+            }
+        }
+        return {
+            isESM,
+            ext,
+        };
+    }
+    catch {
+        return {
+            isESM: false,
+            ext: 'js',
+        };
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular-eslint/schematics",
-  "version": "18.3.2-alpha.9",
+  "version": "18.4.0",
   "description": "Angular Schematics for angular-eslint",
   "license": "MIT",
   "main": "dist/index.js",
@@ -39,12 +39,12 @@
     "ignore": "5.3.2",
     "semver": "7.6.3",
     "strip-json-comments": "3.1.1",
-    "@angular-eslint/eslint-plugin": "18.3.2-alpha.9",
-    "@angular-eslint/eslint-plugin-template": "18.3.2-alpha.9"
+    "@angular-eslint/eslint-plugin": "18.4.0",
+    "@angular-eslint/eslint-plugin-template": "18.4.0"
   },
   "devDependencies": {
-    "@typescript-eslint/utils": "8.5.0",
-    "eslint": "9.9.1"
+    "@typescript-eslint/utils": "8.10.0",
+    "eslint": "9.13.0"
   },
   "peerDependencies": {
     "@angular-devkit/core": ">= 18.0.0 < 19.0.0",