@nx/eslint 0.0.0-pr-29703-8312c59 → 0.0.0-pr-29720-6055188

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-29703-8312c59",
+  "version": "0.0.0-pr-29720-6055188",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -35,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-29703-8312c59",
-    "@nx/js": "0.0.0-pr-29703-8312c59",
+    "@nx/devkit": "0.0.0-pr-29720-6055188",
+    "@nx/js": "0.0.0-pr-29720-6055188",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

package/src/generators/convert-to-flat-config/converters/json-converter.d.ts

@@ -4,7 +4,7 @@ import { ESLint } from 'eslint';
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, config: ESLint.ConfigData, ignorePaths: string[], format: 'cjs' | 'mjs'): {
+export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, config: ESLint.ConfigData, ignorePaths: string[]): {
     content: string;
     addESLintRC: boolean;
     addESLintJS: boolean;

package/src/generators/convert-to-flat-config/converters/json-converter.js

@@ -10,7 +10,7 @@ const path_utils_1 = require("../../utils/flat-config/path-utils");
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format) {
+function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths) {
     const importsMap = new Map();
     const exportElements = [];
     let isFlatCompatNeeded = false;
@@ -22,7 +22,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
         ignores: ['**/dist'],
     }));
     if (config.extends) {
-        const extendsResult = addExtends(importsMap, exportElements, config, format);
+        const extendsResult = addExtends(importsMap, exportElements, config);
         isFlatCompatNeeded = extendsResult.isFlatCompatNeeded;
         isESLintJSNeeded = extendsResult.isESLintJSNeeded;
     }
@@ -74,7 +74,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
                 override.parser) {
                 isFlatCompatNeeded = true;
             }
-            exportElements.push((0, ast_utils_1.generateFlatOverride)(override, format));
+            exportElements.push((0, ast_utils_1.generateFlatOverride)(override));
         });
     }
     if (config.ignorePatterns) {
@@ -100,7 +100,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
         }
     }
     // create the node list and print it to new file
-    const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements, format);
+    const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements);
     let content = (0, ast_utils_1.stringifyNodeList)(nodeList);
     if (isFlatCompatNeeded) {
         content = (0, ast_utils_1.addFlatCompatToFlatConfig)(content);
@@ -112,7 +112,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
     };
 }
 // add parsed extends to export blocks and add import statements
-function addExtends(importsMap, configBlocks, config, format) {
+function addExtends(importsMap, configBlocks, config) {
     let isFlatCompatNeeded = false;
     let isESLintJSNeeded = false;
     const extendsConfig = Array.isArray(config.extends)
@@ -126,7 +126,7 @@ function addExtends(importsMap, configBlocks, config, format) {
         if (imp.match(/\.eslintrc(.base)?\.json$/)) {
             const localName = index ? `baseConfig${index}` : 'baseConfig';
             configBlocks.push((0, ast_utils_1.generateSpreadElement)(localName));
-            const newImport = imp.replace(/^(.*)\.eslintrc(.base)?\.json$/, `$1eslint$2.config.${format}`);
+            const newImport = imp.replace(/^(.*)\.eslintrc(.base)?\.json$/, '$1eslint$2.config.cjs');
             importsMap.set(newImport, localName);
         }
         else {

package/src/generators/convert-to-flat-config/generator.js

@@ -14,21 +14,20 @@ async function convertToFlatConfigGenerator(tree, options) {
     if (eslintFile.endsWith('.js')) {
         throw new Error('Only json and yaml eslint config files are supported for conversion');
     }
-    options.eslintConfigFormat ??= 'mjs';
     const eslintIgnoreFiles = new Set(['.eslintignore']);
-    // convert root eslint config to eslint.config.cjs or eslint.base.config.mjs based on eslintConfigFormat
-    convertRootToFlatConfig(tree, eslintFile, options.eslintConfigFormat);
+    // convert root eslint config to eslint.config.cjs
+    convertRootToFlatConfig(tree, eslintFile);
     // convert project eslint files to eslint.config.cjs
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [project, projectConfig] of projects) {
-        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree), eslintIgnoreFiles, options.eslintConfigFormat);
+        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree), eslintIgnoreFiles);
     }
     // delete all .eslintignore files
     for (const ignoreFile of eslintIgnoreFiles) {
         tree.delete(ignoreFile);
     }
     // replace references in nx.json
-    updateNxJsonConfig(tree, options.eslintConfigFormat);
+    updateNxJsonConfig(tree);
     // install missing packages
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -36,13 +35,13 @@ async function convertToFlatConfigGenerator(tree, options) {
     return () => (0, devkit_1.installPackagesTask)(tree);
 }
 exports.default = convertToFlatConfigGenerator;
-function convertRootToFlatConfig(tree, eslintFile, format) {
+function convertRootToFlatConfig(tree, eslintFile) {
     if (/\.base\.(js|json|yml|yaml)$/.test(eslintFile)) {
-        convertConfigToFlatConfig(tree, '', eslintFile, `eslint.base.config.${format}`, format);
+        convertConfigToFlatConfig(tree, '', eslintFile, 'eslint.base.config.cjs');
     }
-    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), `eslint.config.${format}`, format);
+    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), 'eslint.config.cjs');
 }
-function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles, format) {
+function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
     if (eslintFile && !eslintFile.endsWith('.js')) {
         if (projectConfig.targets) {
@@ -68,7 +67,7 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
                 ? p === '@nx/eslint/plugin'
                 : p.plugin === '@nx/eslint/plugin');
             if (nxHasEsLintTargets || nxHasEsLintPlugin || eslintTargets.length > 0) {
-                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, `eslint.config.${format}`, format, ignorePath);
+                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, 'eslint.config.cjs', ignorePath);
                 eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
                 if (ignorePath) {
                     eslintIgnoreFiles.add(ignorePath);
@@ -79,35 +78,35 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
 }
 // update names of eslint files in nx.json
 // and remove eslintignore
-function updateNxJsonConfig(tree, format) {
+function updateNxJsonConfig(tree) {
     if (tree.exists('nx.json')) {
         (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
             if (json.targetDefaults?.lint?.inputs) {
                 const inputSet = new Set(json.targetDefaults.lint.inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
+                inputSet.add('{workspaceRoot}/eslint.config.cjs');
                 json.targetDefaults.lint.inputs = Array.from(inputSet);
             }
             if (json.targetDefaults?.['@nx/eslint:lint']?.inputs) {
                 const inputSet = new Set(json.targetDefaults['@nx/eslint:lint'].inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
+                inputSet.add('{workspaceRoot}/eslint.config.cjs');
                 json.targetDefaults['@nx/eslint:lint'].inputs = Array.from(inputSet);
             }
             if (json.namedInputs?.production) {
                 const inputSet = new Set(json.namedInputs.production);
-                inputSet.add(`!{projectRoot}/eslint.config.${format}`);
+                inputSet.add('!{projectRoot}/eslint.config.cjs');
                 json.namedInputs.production = Array.from(inputSet);
             }
             return json;
         });
     }
 }
-function convertConfigToFlatConfig(tree, root, source, target, format, ignorePath) {
+function convertConfigToFlatConfig(tree, root, source, target, ignorePath) {
     const ignorePaths = ignorePath
         ? [ignorePath, `${root}/.eslintignore`]
         : [`${root}/.eslintignore`];
     if (source.endsWith('.json')) {
         const config = (0, devkit_1.readJson)(tree, `${root}/${source}`);
-        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths, format);
+        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths);
         return processConvertedConfig(tree, root, source, target, conversionResult);
     }
     if (source.endsWith('.yaml') || source.endsWith('.yml')) {
@@ -117,7 +116,7 @@ function convertConfigToFlatConfig(tree, root, source, target, format, ignorePat
             json: true,
             filename: source,
         });
-        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths, format);
+        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths);
         return processConvertedConfig(tree, root, source, target, conversionResult);
     }
 }

package/src/generators/convert-to-flat-config/schema.d.ts

@@ -1,5 +1,3 @@
 export interface ConvertToFlatConfigGeneratorSchema {
   skipFormat?: boolean;
-  // Internal option
-  eslintConfigFormat?: 'mjs' | 'cjs';
 }

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -34,7 +34,6 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
                 '{workspaceRoot}/.eslintrc.json',
                 '{workspaceRoot}/.eslintignore',
                 '{workspaceRoot}/eslint.config.cjs',
-                '{workspaceRoot}/eslint.config.mjs',
             ].includes(input));
         if (inputs.length === 0) {
             delete target.inputs;

package/src/generators/init/global-eslint-config.d.ts

@@ -26,4 +26,4 @@ export declare const javaScriptOverride: {
     rules: {};
 };
 export declare const getGlobalEsLintConfiguration: (unitTestRunner?: string, rootProject?: boolean) => Linter.Config;
-export declare const getGlobalFlatEslintConfiguration: (format: "cjs" | "mjs", rootProject?: boolean) => string;
+export declare const getGlobalFlatEslintConfiguration: (rootProject?: boolean) => string;

package/src/generators/init/global-eslint-config.js

@@ -78,8 +78,8 @@ const getGlobalEsLintConfiguration = (unitTestRunner, rootProject) => {
     return config;
 };
 exports.getGlobalEsLintConfiguration = getGlobalEsLintConfiguration;
-const getGlobalFlatEslintConfiguration = (format, rootProject) => {
-    const nodeList = (0, ast_utils_1.createNodeList)(new Map(), [], format);
+const getGlobalFlatEslintConfiguration = (rootProject) => {
+    const nodeList = (0, ast_utils_1.createNodeList)(new Map(), []);
     let content = (0, ast_utils_1.stringifyNodeList)(nodeList);
     content = (0, ast_utils_1.addImportToFlatConfig)(content, 'nx', '@nx/eslint-plugin');
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/base'), { insertAtTheEnd: false });
@@ -87,7 +87,7 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/javascript'));
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
         ignores: ['**/dist'],
-    }, format));
+    }));
     if (!rootProject) {
         content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
             files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
@@ -107,7 +107,7 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
                     },
                 ],
             },
-        }, format));
+        }));
     }
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
         files: [
@@ -119,7 +119,7 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
             '**/*.mjs',
         ],
         rules: {},
-    }, format));
+    }));
     return content;
 };
 exports.getGlobalFlatEslintConfiguration = getGlobalFlatEslintConfiguration;

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

@@ -1,3 +1,3 @@
 import { GeneratorCallback, ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, eslintConfigFormat: 'mjs' | 'cjs', keepExistingVersions?: boolean): GeneratorCallback;
+export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, keepExistingVersions?: boolean): GeneratorCallback;
 export declare function findLintTarget(project: ProjectConfiguration): TargetConfiguration;

package/src/generators/init/init-migration.js

@@ -11,19 +11,9 @@ const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const plugin_1 = require("../utils/plugin");
 const config_file_1 = require("../../utils/config-file");
-function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConfigFormat, keepExistingVersions) {
+function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExistingVersions) {
     const rootEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
     let skipCleanup = false;
-    if (rootEslintConfig) {
-        // We do not want to mix the formats
-        const fileExtension = (0, path_1.extname)(rootEslintConfig);
-        if (fileExtension === '.mjs' || fileExtension === '.cjs') {
-            eslintConfigFormat = fileExtension.slice(1);
-        }
-        else {
-            eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(rootEslintConfig, 'utf-8'));
-        }
-    }
     if (rootEslintConfig?.match(/\.base\./) &&
         !projects.some((p) => p.root === '.')) {
         // if the migration has been run already, we need to rename the base config
@@ -37,9 +27,9 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@eslint/js': versions_1.eslintVersion,
             }, undefined, keepExistingVersions);
-            tree.write(tree.exists(`eslint.config.${eslintConfigFormat}`)
-                ? `eslint.base.config.${eslintConfigFormat}`
-                : `eslint.config.${eslintConfigFormat}`, (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(eslintConfigFormat));
+            tree.write(tree.exists('eslint.config.cjs')
+                ? 'eslint.base.config.cjs'
+                : 'eslint.config.cjs', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)());
         }
         else {
             const eslintFile = (0, eslint_file_1.findEslintFile)(tree, '.');
@@ -90,7 +80,7 @@ function migrateEslintFile(projectEslintPath, tree) {
             let config = tree.read(projectEslintPath, 'utf-8');
             // remove @nx plugin
             config = (0, ast_utils_1.removePlugin)(config, '@nx', '@nx/eslint-plugin-nx');
-            // if base config is cjs, we will need to import it using async import
+            // extend eslint.base.config.cjs
             config = (0, ast_utils_1.addImportToFlatConfig)(config, 'baseConfig', `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}${baseFile}`);
             config = (0, ast_utils_1.addBlockToFlatConfigExport)(config, (0, ast_utils_1.generateSpreadElement)('baseConfig'), { insertAtTheEnd: false });
             // cleanup file extends

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.cjs');
         // 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,7 +28,7 @@ function addTargetDefaults(tree, format) {
         'default',
         `{workspaceRoot}/.eslintrc.json`,
         `{workspaceRoot}/.eslintignore`,
-        `{workspaceRoot}/eslint.config.${format}`,
+        `{workspaceRoot}/eslint.config.cjs`,
     ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
@@ -51,18 +50,8 @@ async function initEsLint(tree, options) {
     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,7 +70,7 @@ async function initEsLint(tree, options) {
     if (rootEslintFile) {
         return () => { };
     }
-    updateProductionFileset(tree, options.eslintConfigFormat);
+    updateProductionFileset(tree);
     updateVsCodeRecommendedExtensions(tree);
     if (options.addPlugin) {
         await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
@@ -89,7 +78,7 @@ async function initEsLint(tree, options) {
         }, 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

@@ -18,7 +18,6 @@ function lintProjectGenerator(tree, 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;
@@ -26,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);
@@ -87,7 +84,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);
         }
     }
@@ -119,18 +116,6 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
     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)
@@ -195,11 +180,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.cjs`), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
@@ -227,7 +212,8 @@ function isBuildableLibraryProject(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);

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.cjs', (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,7 +3,6 @@ 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;

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,17 @@ 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;
+    }
+    if (projectRoot === undefined &&
+        tree.exists(config_file_1.legacyBaseEsLintFlatConfigFile)) {
+        return config_file_1.legacyBaseEsLintFlatConfigFile;
     }
     projectRoot ??= '';
     for (const file of config_file_1.ESLINT_CONFIG_FILENAMES) {
@@ -49,8 +47,7 @@ function isEslintConfigSupported(tree, projectRoot = '') {
     }
     return (eslintFile.endsWith('.json') ||
         eslintFile.endsWith('.config.js') ||
-        eslintFile.endsWith('.config.cjs') ||
-        eslintFile.endsWith('.config.mjs'));
+        eslintFile.endsWith('.config.cjs'));
 }
 function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
     if (sourcePath === destinationPath ||
@@ -94,17 +91,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,12 +116,6 @@ 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,
 }) {
@@ -143,12 +123,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
     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;
-                }
-            }
+            fileName = (0, devkit_1.joinPathFragments)(root, config_file_1.baseEsLintFlatConfigFile);
         }
         else {
             for (const f of flat_config_1.eslintFlatConfigFilenames) {
@@ -158,9 +133,8 @@ function addOverrideToLintConfig(tree, root, override, options = {
                 }
             }
         }
+        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);
@@ -239,12 +213,7 @@ function lintConfigHasOverride(tree, rootOrFile, lookup, checkBaseConfig = false
         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;
-            }
-        }
+        fileName = (0, devkit_1.joinPathFragments)(root, config_file_1.baseEsLintFlatConfigFile);
     }
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         if (!fileName) {
@@ -273,14 +242,13 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
             }
         }
         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);
@@ -303,14 +271,6 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
                 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';
         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;