@nx/eslint 0.0.0-pr-31231-180f614 → 0.0.0-pr-31222-862e973

package/src/generators/init/init.d.ts

@@ -4,7 +4,6 @@ export interface LinterInitOptions {
     keepExistingVersions?: boolean;
     updatePackageScripts?: boolean;
     addPlugin?: boolean;
-    eslintConfigFormat?: 'mjs' | 'cjs';
 }
 export declare function initEsLint(tree: Tree, options: LinterInitOptions): Promise<GeneratorCallback>;
 export declare function lintInitGenerator(tree: Tree, options: LinterInitOptions): Promise<GeneratorCallback>;

package/src/generators/init/init.js

@@ -8,19 +8,18 @@ const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../../plugins/plugin");
 const plugin_2 = require("../utils/plugin");
-const path_1 = require("path");
-function updateProductionFileset(tree, format = 'mjs') {
+function updateProductionFileset(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/.eslintrc.json');
-        productionFileSet.push(`!{projectRoot}/eslint.config.${format}`);
+        productionFileSet.push('!{projectRoot}/eslint.config.js');
         // Dedupe and set
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function addTargetDefaults(tree, format) {
+function addTargetDefaults(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     nxJson.targetDefaults ??= {};
     nxJson.targetDefaults['@nx/eslint:lint'] ??= {};
@@ -29,40 +28,17 @@ function addTargetDefaults(tree, format) {
         'default',
         `{workspaceRoot}/.eslintrc.json`,
         `{workspaceRoot}/.eslintignore`,
-        `{workspaceRoot}/eslint.config.${format}`,
+        `{workspaceRoot}/eslint.config.js`,
     ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function updateVsCodeRecommendedExtensions(host) {
-    if (!host.exists('.vscode/extensions.json')) {
-        return;
-    }
-    (0, devkit_1.updateJson)(host, '.vscode/extensions.json', (json) => {
-        json.recommendations = json.recommendations || [];
-        const extension = 'dbaeumer.vscode-eslint';
-        if (!json.recommendations.includes(extension)) {
-            json.recommendations.push(extension);
-        }
-        return json;
-    });
-}
 async function initEsLint(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    options.eslintConfigFormat ??= 'mjs';
     const hasPlugin = (0, plugin_2.hasEslintPlugin)(tree);
     const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
-    if (rootEslintFile) {
-        const fileExtension = (0, path_1.extname)(rootEslintFile);
-        if (fileExtension === '.mjs' || fileExtension === '.cjs') {
-            options.eslintConfigFormat = fileExtension.slice(1);
-        }
-        else {
-            options.eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(rootEslintFile, 'utf-8'));
-        }
-    }
     const graph = await (0, devkit_1.createProjectGraphAsync)();
     const lintTargetNames = [
         'lint',
@@ -81,15 +57,14 @@ async function initEsLint(tree, options) {
     if (rootEslintFile) {
         return () => { };
     }
-    updateProductionFileset(tree, options.eslintConfigFormat);
-    updateVsCodeRecommendedExtensions(tree);
+    updateProductionFileset(tree);
     if (options.addPlugin) {
         await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
     }
     else {
-        addTargetDefaults(tree, options.eslintConfigFormat);
+        addTargetDefaults(tree);
     }
     const tasks = [];
     if (!options.skipPackageJson) {

package/src/generators/lint-project/lint-project.d.ts

@@ -12,7 +12,6 @@ interface LintProjectOptions {
     rootProject?: boolean;
     keepExistingVersions?: boolean;
     addPlugin?: boolean;
-    eslintConfigFormat?: 'mjs' | 'cjs';
     /**
      * @internal
      */

package/src/generators/lint-project/lint-project.js

@@ -12,15 +12,12 @@ const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const config_file_1 = require("../../utils/config-file");
 const plugin_1 = require("../utils/plugin");
-const versions_1 = require("../../utils/versions");
 const setup_root_eslint_1 = require("./setup-root-eslint");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function lintProjectGenerator(tree, options) {
     return lintProjectGeneratorInternal(tree, { addPlugin: false, ...options });
 }
 async function lintProjectGeneratorInternal(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    options.eslintConfigFormat ??= 'mjs';
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
@@ -28,14 +25,12 @@ async function lintProjectGeneratorInternal(tree, options) {
     const initTask = await (0, init_1.lintInitGenerator)(tree, {
         skipPackageJson: options.skipPackageJson,
         addPlugin: options.addPlugin,
-        eslintConfigFormat: options.eslintConfigFormat,
     });
     tasks.push(initTask);
     const rootEsLintTask = (0, setup_root_eslint_1.setupRootEsLint)(tree, {
         unitTestRunner: options.unitTestRunner,
         skipPackageJson: options.skipPackageJson,
         rootProject: options.rootProject,
-        eslintConfigFormat: options.eslintConfigFormat,
     });
     tasks.push(rootEsLintTask);
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
@@ -46,7 +41,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     if (lintFilePatterns &&
         lintFilePatterns.length &&
         !lintFilePatterns.includes('{projectRoot}') &&
-        isBuildableLibraryProject(tree, projectConfig)) {
+        isBuildableLibraryProject(projectConfig)) {
         lintFilePatterns.push(`{projectRoot}/package.json`);
     }
     const hasPlugin = (0, plugin_1.hasEslintPlugin)(tree);
@@ -54,7 +49,6 @@ async function lintProjectGeneratorInternal(tree, options) {
         if (lintFilePatterns &&
             lintFilePatterns.length &&
             lintFilePatterns.some((p) => !['./src', '{projectRoot}', projectConfig.root].includes(p))) {
-            projectConfig.targets ??= {};
             projectConfig.targets['lint'] = {
                 command: `eslint ${lintFilePatterns
                     .join(' ')
@@ -63,7 +57,6 @@ async function lintProjectGeneratorInternal(tree, options) {
         }
     }
     else {
-        projectConfig.targets ??= {};
         projectConfig.targets['lint'] = {
             executor: '@nx/eslint:lint',
         };
@@ -89,7 +82,7 @@ async function lintProjectGeneratorInternal(tree, options) {
                     filteredProjects.push(project);
                 }
             });
-            const migrateTask = (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner, options.eslintConfigFormat, options.keepExistingVersions);
+            const migrateTask = (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner, options.keepExistingVersions);
             tasks.push(migrateTask);
         }
     }
@@ -97,15 +90,10 @@ async function lintProjectGeneratorInternal(tree, options) {
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        const addDependencyChecks = options.addPackageJsonDependencyChecks ||
-            isBuildableLibraryProject(tree, projectConfig);
-        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject, addDependencyChecks);
-        if (addDependencyChecks) {
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'jsonc-eslint-parser': versions_1.jsoncEslintParserVersion }, undefined, true));
-        }
+        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
-    if (isBuildableLibraryProject(tree, projectConfig) &&
+    if (isBuildableLibraryProject(projectConfig) &&
         !isJsAnalyzeSourceFilesEnabled(tree)) {
         (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
             json.pluginsConfig ??= {};
@@ -120,24 +108,14 @@ async function lintProjectGeneratorInternal(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject, addDependencyChecks) {
+function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject) {
     // we are only extending root for non-standalone projects or their complementary e2e apps
     const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
     const pathToRootConfig = extendedRootConfig
         ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${extendedRootConfig}`
         : undefined;
-    if (extendedRootConfig) {
-        // We do not want to mix the formats
-        // if the base file extension is `.mjs` we should use `mjs` for the new file
-        // or if base the file extension is `.cjs` then the format should be `cjs`
-        const fileExtension = (0, path_1.extname)(extendedRootConfig);
-        if (fileExtension === '.mjs' || fileExtension === '.cjs') {
-            options.eslintConfigFormat = fileExtension.slice(1);
-        }
-        else {
-            options.eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(extendedRootConfig, 'utf-8'));
-        }
-    }
+    const addDependencyChecks = options.addPackageJsonDependencyChecks ||
+        isBuildableLibraryProject(projectConfig);
     const overrides = (0, flat_config_1.useFlatConfig)(tree)
         ? // For flat configs, we don't need to generate different overrides for each file. Users should add their own overrides as needed.
             []
@@ -200,11 +178,11 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
             nodes.push((0, ast_utils_1.generateSpreadElement)('baseConfig'));
         }
         overrides.forEach((override) => {
-            nodes.push((0, ast_utils_1.generateFlatOverride)(override, options.eslintConfigFormat));
+            nodes.push((0, ast_utils_1.generateFlatOverride)(override));
         });
-        const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes, options.eslintConfigFormat);
+        const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes);
         const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
-        tree.write((0, path_1.join)(projectConfig.root, `eslint.config.${options.eslintConfigFormat}`), content);
+        tree.write((0, path_1.join)(projectConfig.root, 'eslint.config.js'), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
@@ -221,9 +199,8 @@ function isJsAnalyzeSourceFilesEnabled(tree) {
     return (jsPluginConfig?.analyzeSourceFiles ??
         nxJson.extends !== 'nx/presets/npm.json');
 }
-function isBuildableLibraryProject(tree, projectConfig) {
-    return ((0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, projectConfig.projectType) ===
-        'library' &&
+function isBuildableLibraryProject(projectConfig) {
+    return (projectConfig.projectType === 'library' &&
         projectConfig.targets?.build &&
         !!projectConfig.targets.build);
 }
@@ -233,7 +210,8 @@ function isBuildableLibraryProject(tree, projectConfig) {
  */
 function isMigrationToMonorepoNeeded(tree, graph) {
     // the base config is already created, migration has been done
-    if ([config_file_1.baseEsLintConfigFile, ...config_file_1.BASE_ESLINT_CONFIG_FILENAMES].some((f) => tree.exists(f))) {
+    if (tree.exists(config_file_1.baseEsLintConfigFile) ||
+        tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
         return false;
     }
     const nodes = Object.values(graph.nodes);
@@ -243,7 +221,7 @@ function isMigrationToMonorepoNeeded(tree, graph) {
         return false;
     }
     for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
-        if (['@nx/eslint:lint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
+        if (['@nx/eslint:lint', '@nrwl/linter:eslint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
             (targetConfig.executor === 'nx:run-commands' &&
                 targetConfig.options?.command &&
                 targetConfig.options?.command.startsWith('eslint '))) {

package/src/generators/lint-project/setup-root-eslint.d.ts

@@ -3,6 +3,5 @@ export type SetupRootEsLintOptions = {
     unitTestRunner?: string;
     skipPackageJson?: boolean;
     rootProject?: boolean;
-    eslintConfigFormat?: 'mjs' | 'cjs';
 };
 export declare function setupRootEsLint(tree: Tree, options: SetupRootEsLintOptions): GeneratorCallback;

package/src/generators/lint-project/setup-root-eslint.js

@@ -11,7 +11,6 @@ function setupRootEsLint(tree, options) {
     if (rootEslintFile) {
         return () => { };
     }
-    options.eslintConfigFormat ??= 'mjs';
     if (!(0, flat_config_1.useFlatConfig)(tree)) {
         return setUpLegacyRootEslintRc(tree, options);
     }
@@ -39,7 +38,7 @@ function setUpLegacyRootEslintRc(tree, options) {
         : () => { };
 }
 function setUpRootFlatConfig(tree, options) {
-    tree.write(`eslint.config.${options.eslintConfigFormat}`, (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(options.eslintConfigFormat, options.rootProject));
+    tree.write('eslint.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(options.rootProject));
     return !options.skipPackageJson
         ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@eslint/js': versions_1.eslint9__eslintVersion,

package/src/generators/utils/eslint-file.d.ts

@@ -3,13 +3,12 @@ import type { Linter } from 'eslint';
 export declare function findEslintFile(tree: Tree, projectRoot?: string): string | null;
 export declare function isEslintConfigSupported(tree: Tree, projectRoot?: string): boolean;
 export declare function updateRelativePathsInConfig(tree: Tree, sourcePath: string, destinationPath: string): void;
-export declare function determineEslintConfigFormat(content: string): 'mjs' | 'cjs';
 export declare function addOverrideToLintConfig(tree: Tree, root: string, override: Partial<Linter.ConfigOverride<Linter.RulesRecord>>, options?: {
     insertAtTheEnd?: boolean;
     checkBaseConfig?: boolean;
 }): void;
-export declare function updateOverrideInLintConfig(tree: Tree, rootOrFile: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): void;
-export declare function lintConfigHasOverride(tree: Tree, rootOrFile: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, checkBaseConfig?: boolean): boolean;
+export declare function updateOverrideInLintConfig(tree: Tree, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): void;
+export declare function lintConfigHasOverride(tree: Tree, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, checkBaseConfig?: boolean): boolean;
 export declare function replaceOverridesInLintConfig(tree: Tree, root: string, overrides: Linter.ConfigOverride<Linter.RulesRecord>[]): void;
 export declare function addExtendsToLintConfig(tree: Tree, root: string, plugin: string | {
     name: string;

package/src/generators/utils/eslint-file.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findEslintFile = findEslintFile;
 exports.isEslintConfigSupported = isEslintConfigSupported;
 exports.updateRelativePathsInConfig = updateRelativePathsInConfig;
-exports.determineEslintConfigFormat = determineEslintConfigFormat;
 exports.addOverrideToLintConfig = addOverrideToLintConfig;
 exports.updateOverrideInLintConfig = updateOverrideInLintConfig;
 exports.lintConfigHasOverride = lintConfigHasOverride;
@@ -21,18 +20,12 @@ const version_utils_1 = require("../../utils/version-utils");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("./flat-config/ast-utils");
 const path_utils_1 = require("./flat-config/path-utils");
-const ts = require("typescript");
-const posix_1 = require("node:path/posix");
 function findEslintFile(tree, projectRoot) {
-    if (projectRoot === undefined) {
-        for (const file of [
-            config_file_1.baseEsLintConfigFile,
-            ...config_file_1.BASE_ESLINT_CONFIG_FILENAMES,
-        ]) {
-            if (tree.exists(file)) {
-                return file;
-            }
-        }
+    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintConfigFile)) {
+        return config_file_1.baseEsLintConfigFile;
+    }
+    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
+        return config_file_1.baseEsLintFlatConfigFile;
     }
     projectRoot ??= '';
     for (const file of config_file_1.ESLINT_CONFIG_FILENAMES) {
@@ -47,10 +40,7 @@ function isEslintConfigSupported(tree, projectRoot = '') {
     if (!eslintFile) {
         return false;
     }
-    return (eslintFile.endsWith('.json') ||
-        eslintFile.endsWith('.config.js') ||
-        eslintFile.endsWith('.config.cjs') ||
-        eslintFile.endsWith('.config.mjs'));
+    return eslintFile.endsWith('.json') || eslintFile.endsWith('.config.js');
 }
 function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
     if (sourcePath === destinationPath ||
@@ -94,17 +84,6 @@ function replaceFlatConfigPaths(config, sourceRoot, offset, destinationRoot, tre
                 `require('${newPath}')` +
                 newConfig.slice(match.index + match[0].length);
     }
-    // Handle import statements
-    const importRegex = RegExp(/import\s+.*?\s+from\s+['"](.*)['"]/g);
-    while ((match = importRegex.exec(newConfig)) !== null) {
-        const oldPath = match[1];
-        const newPath = offsetFilePath(sourceRoot, oldPath, offset, tree);
-        // Replace the old path with the updated path
-        newConfig =
-            newConfig.slice(0, match.index + match[0].indexOf(oldPath)) +
-                newPath +
-                newConfig.slice(match.index + match[0].indexOf(oldPath) + oldPath.length);
-    }
     // replace projects
     const projectRegex = RegExp(/project:\s?\[?['"](.*)['"]\]?/g);
     while ((match = projectRegex.exec(newConfig)) !== null) {
@@ -130,37 +109,14 @@ function offsetFilePath(projectRoot, pathToFile, offset, tree) {
     }
     return (0, devkit_1.joinPathFragments)(offset, projectRoot, pathToFile);
 }
-function determineEslintConfigFormat(content) {
-    const sourceFile = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true);
-    // Check if there's an `export default` in the AST
-    const hasExportDefault = sourceFile.statements.some((statement) => ts.isExportAssignment(statement) && !statement.isExportEquals);
-    return hasExportDefault ? 'mjs' : 'cjs';
-}
 function addOverrideToLintConfig(tree, root, override, options = {
     insertAtTheEnd: true,
 }) {
     const isBase = options.checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        let fileName;
-        if (isBase) {
-            for (const file of config_file_1.BASE_ESLINT_CONFIG_FILENAMES) {
-                if (tree.exists((0, devkit_1.joinPathFragments)(root, file))) {
-                    fileName = (0, devkit_1.joinPathFragments)(root, file);
-                    break;
-                }
-            }
-        }
-        else {
-            for (const f of flat_config_1.eslintFlatConfigFilenames) {
-                if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                    fileName = (0, devkit_1.joinPathFragments)(root, f);
-                    break;
-                }
-            }
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
+        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
         let content = tree.read(fileName, 'utf8');
-        const format = content.includes('export default') ? 'mjs' : 'cjs';
-        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, format);
         // Check if the provided override using legacy eslintrc properties or plugins, if so we need to add compat
         if ((0, ast_utils_1.overrideNeedsCompat)(override)) {
             content = (0, ast_utils_1.addFlatCompatToFlatConfig)(content);
@@ -181,28 +137,15 @@ function addOverrideToLintConfig(tree, root, override, options = {
         });
     }
 }
-function updateOverrideInLintConfig(tree, rootOrFile, lookup, update) {
-    let fileName;
-    let root = rootOrFile;
-    if (tree.exists(rootOrFile) && tree.isFile(rootOrFile)) {
-        fileName = rootOrFile;
-        root = (0, posix_1.dirname)(rootOrFile);
-    }
+function updateOverrideInLintConfig(tree, root, lookup, update) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        if (!fileName) {
-            for (const f of flat_config_1.eslintFlatConfigFilenames) {
-                if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                    fileName = (0, devkit_1.joinPathFragments)(root, f);
-                    break;
-                }
-            }
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         content = (0, ast_utils_1.replaceOverride)(content, root, lookup, update);
         tree.write(fileName, content);
     }
     else {
-        fileName ??= (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
         if (!tree.exists(fileName)) {
             return;
         }
@@ -225,62 +168,32 @@ function updateOverrideInLintConfig(tree, rootOrFile, lookup, update) {
         });
     }
 }
-function lintConfigHasOverride(tree, rootOrFile, lookup, checkBaseConfig = false) {
-    let fileName;
-    let root = rootOrFile;
-    if (tree.exists(rootOrFile) && tree.isFile(rootOrFile)) {
-        fileName = rootOrFile;
-        root = (0, posix_1.dirname)(rootOrFile);
-    }
-    if (!fileName && !isEslintConfigSupported(tree, root)) {
+function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = false) {
+    if (!isEslintConfigSupported(tree, root)) {
         return false;
     }
-    const isBase = !fileName &&
-        checkBaseConfig &&
-        findEslintFile(tree, root).includes('.base');
-    if (isBase) {
-        for (const file of config_file_1.BASE_ESLINT_CONFIG_FILENAMES) {
-            if (tree.exists((0, devkit_1.joinPathFragments)(root, file))) {
-                fileName = (0, devkit_1.joinPathFragments)(root, file);
-                break;
-            }
-        }
-    }
+    const isBase = checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        if (!fileName) {
-            for (const f of flat_config_1.eslintFlatConfigFilenames) {
-                if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                    fileName = (0, devkit_1.joinPathFragments)(root, f);
-                    break;
-                }
-            }
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         const content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
     else {
-        fileName ??= (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
         return (0, devkit_1.readJson)(tree, fileName).overrides?.some(lookup) || false;
     }
 }
 function replaceOverridesInLintConfig(tree, root, overrides) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        let fileName;
-        for (const f of flat_config_1.eslintFlatConfigFilenames) {
-            if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                fileName = (0, devkit_1.joinPathFragments)(root, f);
-                break;
-            }
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         let content = tree.read(fileName, 'utf8');
-        const format = content.includes('export default') ? 'mjs' : 'cjs';
         // Check if any of the provided overrides using legacy eslintrc properties or plugins, if so we need to add compat
         if (overrides.some(ast_utils_1.overrideNeedsCompat)) {
             content = (0, ast_utils_1.addFlatCompatToFlatConfig)(content);
         }
         content = (0, ast_utils_1.removeOverridesFromLintConfig)(content);
         overrides.forEach((override) => {
-            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, format);
+            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
             content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
         });
         tree.write(fileName, content);
@@ -296,21 +209,7 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
 function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const pluginExtends = [];
-        let fileName;
-        for (const f of flat_config_1.eslintFlatConfigFilenames) {
-            if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                fileName = (0, devkit_1.joinPathFragments)(root, f);
-                break;
-            }
-        }
-        // Check the file extension to determine the format of the config if it is .js we look for the export
-        const eslintConfigFormat = fileName.endsWith('.mjs')
-            ? 'mjs'
-            : fileName.endsWith('.cjs')
-                ? 'cjs'
-                : tree.read(fileName, 'utf-8').includes('module.exports')
-                    ? 'cjs'
-                    : 'mjs';
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         let shouldImportEslintCompat = false;
         // assume eslint version is 9 if not found, as it's what we'd be generating by default
         const eslintVersion = (0, version_utils_1.getInstalledEslintVersion)(tree) ?? versions_1.eslint9__eslintVersion;
@@ -357,9 +256,9 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
         }
         tree.write(fileName, content);
         if (shouldImportEslintCompat) {
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/compat': versions_1.eslintCompat, '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/compat': versions_1.eslintCompat }, undefined, true);
         }
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
+        return () => { };
     }
     else {
         const plugins = (Array.isArray(plugin) ? plugin : [plugin]).map((p) => typeof p === 'string' ? p : p.name);
@@ -378,13 +277,7 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
 function addPredefinedConfigToFlatLintConfig(tree, root, predefinedConfigName, moduleName = 'nx', moduleImportPath = '@nx/eslint-plugin', spread = true, insertAtTheEnd = true) {
     if (!(0, flat_config_1.useFlatConfig)(tree))
         throw new Error('Predefined configs can only be used with flat configs');
-    let fileName;
-    for (const f of flat_config_1.eslintFlatConfigFilenames) {
-        if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-            fileName = (0, devkit_1.joinPathFragments)(root, f);
-            break;
-        }
-    }
+    const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
     let content = tree.read(fileName, 'utf8');
     content = (0, ast_utils_1.addImportToFlatConfig)(content, moduleName, moduleImportPath);
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)(predefinedConfigName, moduleName, spread), { insertAtTheEnd });
@@ -393,13 +286,7 @@ function addPredefinedConfigToFlatLintConfig(tree, root, predefinedConfigName, m
 function addPluginsToLintConfig(tree, root, plugin) {
     const plugins = Array.isArray(plugin) ? plugin : [plugin];
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        let fileName;
-        for (const f of flat_config_1.eslintFlatConfigFilenames) {
-            if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                fileName = (0, devkit_1.joinPathFragments)(root, f);
-                break;
-            }
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         const mappedPlugins = [];
         plugins.forEach((name) => {
@@ -423,33 +310,14 @@ function addPluginsToLintConfig(tree, root, plugin) {
 }
 function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        let fileName;
-        for (const f of flat_config_1.eslintFlatConfigFilenames) {
-            if (tree.exists((0, devkit_1.joinPathFragments)(root, f))) {
-                fileName = (0, devkit_1.joinPathFragments)(root, f);
-                break;
-            }
-        }
-        if (!fileName) {
-            return;
-        }
-        let content = tree.read(fileName, 'utf8');
-        if ((0, ast_utils_1.hasFlatConfigIgnoresBlock)(content)) {
-            content = (0, ast_utils_1.addPatternsToFlatConfigIgnoresBlock)(content, ignorePatterns);
-            tree.write(fileName, content);
-        }
-        else {
-            const block = (0, ast_utils_1.generateAst)({
-                ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
-            });
-            tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, block));
-        }
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
+        const block = (0, ast_utils_1.generateAst)({
+            ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
+        });
+        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), block));
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
-        if (!tree.exists(fileName)) {
-            return;
-        }
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
             const ignoreSet = new Set([
                 ...(json.ignorePatterns ?? []),