@nx/eslint 20.3.0-canary.20241218-fb40366 → 20.3.0-canary.20241219-2eb5243

package/migrations.json

@@ -24,6 +24,11 @@
       "version": "20.2.0-beta.5",
       "description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
       "implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0"
+    },
+    "add-file-extensions-to-overrides": {
+      "version": "20.3.0-beta.1",
+      "description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
+      "implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.3.0-canary.20241218-fb40366",
+  "version": "20.3.0-canary.20241219-2eb5243",
   "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": "20.3.0-canary.20241218-fb40366",
-    "@nx/js": "20.3.0-canary.20241218-fb40366",
+    "@nx/devkit": "20.3.0-canary.20241219-2eb5243",
+    "@nx/js": "20.3.0-canary.20241219-2eb5243",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.6.2"

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

@@ -17,6 +17,10 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths) {
     let isESLintJSNeeded = false;
     let combinedConfig = [];
     let languageOptions = [];
+    // exclude dist and eslint config from being linted, which matches the default for new workspaces
+    exportElements.push((0, ast_utils_1.generateAst)({
+        ignores: ['**/dist'],
+    }));
     if (config.extends) {
         const extendsResult = addExtends(importsMap, exportElements, config);
         isFlatCompatNeeded = extendsResult.isFlatCompatNeeded;
@@ -122,7 +126,7 @@ function addExtends(importsMap, configBlocks, config) {
         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.js');
+            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

@@ -15,9 +15,9 @@ async function convertToFlatConfigGenerator(tree, options) {
         throw new Error('Only json and yaml eslint config files are supported for conversion');
     }
     const eslintIgnoreFiles = new Set(['.eslintignore']);
-    // convert root eslint config to eslint.config.js
+    // convert root eslint config to eslint.config.cjs
     convertRootToFlatConfig(tree, eslintFile);
-    // convert project eslint files to eslint.config.js
+    // 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);
@@ -37,9 +37,9 @@ async function convertToFlatConfigGenerator(tree, options) {
 exports.default = convertToFlatConfigGenerator;
 function convertRootToFlatConfig(tree, eslintFile) {
     if (/\.base\.(js|json|yml|yaml)$/.test(eslintFile)) {
-        convertConfigToFlatConfig(tree, '', eslintFile, 'eslint.base.config.js');
+        convertConfigToFlatConfig(tree, '', eslintFile, 'eslint.base.config.cjs');
     }
-    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), 'eslint.config.js');
+    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), 'eslint.config.cjs');
 }
 function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
@@ -67,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.js', ignorePath);
+                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, 'eslint.config.cjs', ignorePath);
                 eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
                 if (ignorePath) {
                     eslintIgnoreFiles.add(ignorePath);
@@ -83,17 +83,17 @@ function updateNxJsonConfig(tree) {
         (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.js');
+                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.js');
+                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.js');
+                inputSet.add('!{projectRoot}/eslint.config.cjs');
                 json.namedInputs.production = Array.from(inputSet);
             }
             return json;

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

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

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

@@ -85,7 +85,9 @@ const getGlobalFlatEslintConfiguration = (rootProject) => {
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/base'), { insertAtTheEnd: false });
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/typescript'));
     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'] }));
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
+        ignores: ['**/dist'],
+    }));
     if (!rootProject) {
         content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
             files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
@@ -108,7 +110,14 @@ const getGlobalFlatEslintConfiguration = (rootProject) => {
         }));
     }
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
-        files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+        files: [
+            '**/*.ts',
+            '**/*.tsx',
+            '**/*.js',
+            '**/*.jsx',
+            '**/*.cjs',
+            '**/*.mjs',
+        ],
         rules: {},
     }));
     return content;

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

@@ -27,9 +27,9 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExisti
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@eslint/js': versions_1.eslintVersion,
             }, undefined, keepExistingVersions);
-            tree.write(tree.exists('eslint.config.js')
-                ? 'eslint.base.config.js'
-                : 'eslint.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)());
+            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, '.');
@@ -80,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');
-            // extend eslint.base.config.js
+            // 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.js

@@ -13,7 +13,7 @@ function updateProductionFileset(tree) {
     const productionFileSet = nxJson.namedInputs?.production;
     if (productionFileSet) {
         productionFileSet.push('!{projectRoot}/.eslintrc.json');
-        productionFileSet.push('!{projectRoot}/eslint.config.js');
+        productionFileSet.push('!{projectRoot}/eslint.config.cjs');
         // Dedupe and set
         nxJson.namedInputs.production = Array.from(new Set(productionFileSet));
     }
@@ -28,7 +28,7 @@ function addTargetDefaults(tree) {
         'default',
         `{workspaceRoot}/.eslintrc.json`,
         `{workspaceRoot}/.eslintignore`,
-        `{workspaceRoot}/eslint.config.js`,
+        `{workspaceRoot}/eslint.config.cjs`,
     ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }

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

@@ -184,8 +184,7 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
         });
         const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes);
         const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
-        const ext = extendedRootConfig?.endsWith('.cjs') ? '.cjs' : '.js';
-        tree.write((0, path_1.join)(projectConfig.root, `eslint.config${ext}`), 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`), {

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

@@ -38,7 +38,7 @@ function setUpLegacyRootEslintRc(tree, options) {
         : () => { };
 }
 function setUpRootFlatConfig(tree, options) {
-    tree.write('eslint.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(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.js

@@ -28,6 +28,10 @@ function findEslintFile(tree, projectRoot) {
     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) {
         if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, file))) {
@@ -117,7 +121,18 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }) {
     const isBase = options.checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
+        let fileName;
+        if (isBase) {
+            fileName = (0, devkit_1.joinPathFragments)(root, config_file_1.baseEsLintFlatConfigFile);
+        }
+        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 flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
         let content = tree.read(fileName, 'utf8');
         // Check if the provided override using legacy eslintrc properties or plugins, if so we need to add compat
@@ -148,7 +163,14 @@ function updateOverrideInLintConfig(tree, rootOrFile, lookup, update) {
         root = (0, posix_1.dirname)(rootOrFile);
     }
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        fileName ??= (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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;
+                }
+            }
+        }
         let content = tree.read(fileName, 'utf8');
         content = (0, ast_utils_1.replaceOverride)(content, root, lookup, update);
         tree.write(fileName, content);
@@ -190,8 +212,18 @@ function lintConfigHasOverride(tree, rootOrFile, lookup, checkBaseConfig = false
     const isBase = !fileName &&
         checkBaseConfig &&
         findEslintFile(tree, root).includes('.base');
+    if (isBase) {
+        fileName = (0, devkit_1.joinPathFragments)(root, config_file_1.baseEsLintFlatConfigFile);
+    }
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        fileName ??= (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(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 content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
@@ -202,7 +234,13 @@ function lintConfigHasOverride(tree, rootOrFile, lookup, checkBaseConfig = false
 }
 function replaceOverridesInLintConfig(tree, root, overrides) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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;
+            }
+        }
         let content = tree.read(fileName, 'utf8');
         // 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)) {
@@ -226,7 +264,13 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
 function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const pluginExtends = [];
-        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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;
+            }
+        }
         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;
@@ -294,7 +338,13 @@ 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');
-    const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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;
+        }
+    }
     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 });
@@ -303,7 +353,13 @@ 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)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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;
+            }
+        }
         let content = tree.read(fileName, 'utf8');
         const mappedPlugins = [];
         plugins.forEach((name) => {
@@ -327,7 +383,13 @@ function addPluginsToLintConfig(tree, root, plugin) {
 }
 function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(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 block = (0, ast_utils_1.generateAst)({
             ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
         });

package/src/generators/utils/flat-config/ast-utils.js

@@ -670,10 +670,32 @@ function generateFlatOverride(_override) {
         });
     }
     // At this point we are applying the flat config compat tooling to the override
-    const { excludedFiles, parser, parserOptions, rules, files, ...rest } = override;
+    let { excludedFiles, parser, parserOptions, rules, files, ...rest } = override;
     const objectLiteralElements = [
         ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
     ];
+    // If converting the JS rule, then we need to match ESLint default and also include .cjs and .mjs files.
+    if ((Array.isArray(rest.extends) &&
+        rest.extends.includes('plugin:@nx/javascript')) ||
+        rest.extends === 'plugin:@nx/javascript') {
+        const newFiles = new Set(files);
+        newFiles.add('**/*.js');
+        newFiles.add('**/*.jsx');
+        newFiles.add('**/*.cjs');
+        newFiles.add('**/*.mjs');
+        files = Array.from(newFiles);
+    }
+    // If converting the TS rule, then we need to match ESLint default and also include .cts and .mts files.
+    if ((Array.isArray(rest.extends) &&
+        rest.extends.includes('plugin:@nx/typescript')) ||
+        rest.extends === 'plugin:@nx/typescript') {
+        const newFiles = new Set(files);
+        newFiles.add('**/*.ts');
+        newFiles.add('**/*.tsx');
+        newFiles.add('**/*.cts');
+        newFiles.add('**/*.mts');
+        files = Array.from(newFiles);
+    }
     addTSObjectProperty(objectLiteralElements, 'files', files);
     addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
     // Apply rules (and spread ...config.rules into it as the first assignment)

package/src/migrations/update-20-3-0/add-file-extensions-to-overrides.d.ts

@@ -0,0 +1,2 @@
+import { type Tree } from '@nx/devkit';
+export default function (tree: Tree): Promise<void>;

package/src/migrations/update-20-3-0/add-file-extensions-to-overrides.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const ts = require("typescript");
+const js_1 = require("@nx/js");
+async function default_1(tree) {
+    let rootConfig;
+    // NOTE: we don't support generating ESM base config currently so they are not handled.
+    for (const candidate of ['eslint.config.js', 'eslint.config.cjs']) {
+        if (tree.exists(candidate)) {
+            rootConfig = candidate;
+            break;
+        }
+    }
+    if (!rootConfig)
+        return;
+    updateOverrideFileExtensions(tree, rootConfig, 'plugin:@nx/typescript', [`'**/*.ts'`, `'**/*.tsx'`], [`'**/*.cts'`, `'**/*.mts'`]);
+    updateOverrideFileExtensions(tree, rootConfig, 'plugin:@nx/javascript', [`'**/*.js'`, `'**/*.jsx'`], [`'**/*.cjs'`, `'**/*.mjs'`]);
+}
+function updateOverrideFileExtensions(tree, configFile, plugin, matchingExts, newExts) {
+    const content = tree.read(configFile, 'utf-8');
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    let compatNode;
+    const spreadElementNodes = (0, js_1.findNodes)(source, ts.SyntaxKind.SpreadElement);
+    for (const a of spreadElementNodes) {
+        const assignmentNodes = (0, js_1.findNodes)(a, ts.SyntaxKind.PropertyAssignment);
+        if (assignmentNodes.length === 0)
+            continue;
+        for (const b of assignmentNodes) {
+            if (b.name.getText() === 'extends' &&
+                b.initializer.getText().includes(plugin)) {
+                compatNode = a;
+                break;
+            }
+        }
+    }
+    if (compatNode) {
+        const arrayNodes = (0, js_1.findNodes)(compatNode, ts.SyntaxKind.ArrayLiteralExpression);
+        for (const a of arrayNodes) {
+            if (matchingExts.every((ext) => a.elements.some((e) => e.getText() === ext))) {
+                const exts = new Set(a.elements.map((e) => e.getText()));
+                for (const ext of newExts) {
+                    exts.add(ext);
+                }
+                (0, js_1.replaceChange)(tree, source, configFile, a.getStart(a.getSourceFile()), `[${Array.from(exts).join(', ')}]`, a.getText()).getText();
+            }
+        }
+    }
+}

package/src/utils/config-file.d.ts

@@ -2,7 +2,8 @@ export declare const ESLINT_FLAT_CONFIG_FILENAMES: string[];
 export declare const ESLINT_OLD_CONFIG_FILENAMES: string[];
 export declare const ESLINT_CONFIG_FILENAMES: string[];
 export declare const baseEsLintConfigFile = ".eslintrc.base.json";
-export declare const baseEsLintFlatConfigFile = "eslint.base.config.js";
+export declare const baseEsLintFlatConfigFile = "eslint.base.config.cjs";
+export declare const legacyBaseEsLintFlatConfigFile = "eslint.base.config.js";
 export declare function isFlatConfig(configFilePath: string): boolean;
 export declare function findFlatConfigFile(directory: string, workspaceRoot: string): string | null;
 export declare function findOldConfigFile(filePathOrDirectory: string, workspaceRoot: string): string | null;

package/src/utils/config-file.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
+exports.legacyBaseEsLintFlatConfigFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
 exports.isFlatConfig = isFlatConfig;
 exports.findFlatConfigFile = findFlatConfigFile;
 exports.findOldConfigFile = findOldConfigFile;
@@ -21,7 +21,9 @@ exports.ESLINT_CONFIG_FILENAMES = [
     ...exports.ESLINT_FLAT_CONFIG_FILENAMES,
 ];
 exports.baseEsLintConfigFile = '.eslintrc.base.json';
-exports.baseEsLintFlatConfigFile = 'eslint.base.config.js';
+exports.baseEsLintFlatConfigFile = 'eslint.base.config.cjs';
+// Make sure we can handle previous file extension as well for migrations or custom generators.
+exports.legacyBaseEsLintFlatConfigFile = 'eslint.base.config.js';
 function isFlatConfig(configFilePath) {
     const configFileName = (0, path_1.basename)(configFilePath);
     return exports.ESLINT_FLAT_CONFIG_FILENAMES.includes(configFileName);

package/src/utils/flat-config.js

@@ -6,8 +6,8 @@ exports.useFlatConfig = useFlatConfig;
 const semver_1 = require("semver");
 // todo: add support for eslint.config.mjs,
 exports.eslintFlatConfigFilenames = [
-    'eslint.config.js',
     'eslint.config.cjs',
+    'eslint.config.js',
 ];
 function getRootESLintFlatConfigFilename(tree) {
     for (const file of exports.eslintFlatConfigFilenames) {