@nx/eslint 22.6.0 → 22.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "22.6.0",
+  "version": "22.6.2",
   "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,14 +35,14 @@
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "22.6.0",
-    "@nx/js": "22.6.0",
+    "@nx/devkit": "22.6.2",
+    "@nx/js": "22.6.2",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "22.6.0"
+    "nx": "22.6.2"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -1 +1 @@
-{"version":3,"file":"json-converter.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAchC;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CAuLjE"}
+{"version":3,"file":"json-converter.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAehC;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CA8OjE"}

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

@@ -68,6 +68,47 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
     }
     if (config.overrides) {
         config.overrides.forEach((override) => {
+            if (override.extends) {
+                const extendsArr = Array.isArray(override.extends)
+                    ? override.extends
+                    : [override.extends];
+                const mapped = extendsArr.map((e) => ({
+                    original: e,
+                    flatConfig: mapNxPluginToFlatConfig(e),
+                }));
+                const nxExtends = mapped.filter((m) => m.flatConfig);
+                const nonNxExtends = mapped
+                    .filter((m) => !m.flatConfig)
+                    .map((m) => m.original);
+                if (nxExtends.length > 0) {
+                    const nxVar = importsMap.get('@nx/eslint-plugin') ?? 'nx';
+                    importsMap.set('@nx/eslint-plugin', nxVar);
+                    nxExtends.forEach((ext) => {
+                        exportElements.push((0, ast_utils_1.generateFlatPredefinedConfig)(ext.flatConfig, nxVar, true));
+                    });
+                    // Build remaining override without Nx extends
+                    const remainingOverride = { ...override };
+                    if (nonNxExtends.length > 0) {
+                        remainingOverride.extends = nonNxExtends;
+                    }
+                    else {
+                        delete remainingOverride.extends;
+                    }
+                    // Emit remaining override if it has content beyond files and empty rules
+                    const { files: _files, rules: remainingRules, ...remainingRest } = remainingOverride;
+                    const hasNonEmptyRules = remainingRules && Object.keys(remainingRules).length > 0;
+                    if (Object.keys(remainingRest).length > 0 || hasNonEmptyRules) {
+                        if (remainingOverride.env ||
+                            remainingOverride.extends ||
+                            remainingOverride.plugins ||
+                            remainingOverride.parser) {
+                            isFlatCompatNeeded = true;
+                        }
+                        exportElements.push((0, ast_utils_1.generateFlatOverride)(remainingOverride, format));
+                    }
+                    return;
+                }
+            }
             if (override.env ||
                 override.extends ||
                 override.plugins ||
@@ -138,7 +179,16 @@ function addExtends(importsMap, configBlocks, config, format) {
     if (pluginExtends.length) {
         const eslintPluginExtends = pluginExtends.filter((imp) => imp.startsWith('eslint:'));
         pluginExtends.forEach((imp) => {
-            if (!imp.startsWith('eslint:')) {
+            if (imp.startsWith('eslint:')) {
+                return;
+            }
+            const nxFlatConfig = mapNxPluginToFlatConfig(imp);
+            if (nxFlatConfig) {
+                const nxVar = importsMap.get('@nx/eslint-plugin') ?? 'nx';
+                importsMap.set('@nx/eslint-plugin', nxVar);
+                configBlocks.push((0, ast_utils_1.generateFlatPredefinedConfig)(nxFlatConfig, nxVar, true));
+            }
+            else {
                 eslintrcConfigs.push(imp);
             }
         });
@@ -159,10 +209,22 @@ function addExtends(importsMap, configBlocks, config, format) {
     return { isFlatCompatNeeded, isESLintJSNeeded };
 }
 function addPlugins(importsMap, configBlocks, config) {
+    // Replace @nx plugin with flat/base predefined config to match fresh generation.
+    // flat/base registers the @nx plugin and ignores .nx directory.
+    // This runs before overrides are processed, so we set the import name here
+    // for Nx extends that may appear in overrides later.
+    if (config.plugins.includes('@nx')) {
+        importsMap.set('@nx/eslint-plugin', 'nx');
+        configBlocks.push((0, ast_utils_1.generateFlatPredefinedConfig)('flat/base', 'nx', true));
+    }
+    const remainingPlugins = config.plugins.filter((name) => name !== '@nx');
+    if (remainingPlugins.length === 0) {
+        return;
+    }
     const mappedPlugins = [];
-    config.plugins.forEach((name) => {
+    remainingPlugins.forEach((name) => {
         const imp = (0, eslint_file_1.getPluginImport)(name);
-        const varName = (0, devkit_1.names)(imp).propertyName;
+        const varName = importsMap.get(imp) ?? (0, devkit_1.names)(imp).propertyName;
         mappedPlugins.push({ name, varName, imp });
     });
     mappedPlugins.forEach(({ varName, imp }) => {
@@ -180,3 +242,18 @@ function addPlugins(importsMap, configBlocks, config) {
     ], false);
     configBlocks.push(pluginsAst);
 }
+const nxPluginToFlatConfigMap = {
+    'plugin:@nx/typescript': 'flat/typescript',
+    'plugin:@nx/javascript': 'flat/javascript',
+    'plugin:@nx/react': 'flat/react',
+    'plugin:@nx/react-base': 'flat/react-base',
+    'plugin:@nx/react-typescript': 'flat/react-typescript',
+    'plugin:@nx/react-jsx': 'flat/react-jsx',
+    'plugin:@nx/angular': 'flat/angular',
+    'plugin:@nx/angular-template': 'flat/angular-template',
+    'plugin:@nrwl/nx/typescript': 'flat/typescript',
+    'plugin:@nrwl/nx/javascript': 'flat/javascript',
+};
+function mapNxPluginToFlatConfig(pluginExtend) {
+    return nxPluginToFlatConfigMap[pluginExtend];
+}

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

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-flat-config/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAQjB,IAAI,EAGL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAa9D,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CA6CnC;AAED,eAAe,4BAA4B,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-flat-config/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAc9D,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CA6CnC;AAED,eAAe,4BAA4B,CAAC"}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToFlatConfigGenerator = convertToFlatConfigGenerator;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
+const plugin_1 = require("../utils/plugin");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const json_converter_1 = require("./converters/json-converter");
@@ -42,39 +43,47 @@ function convertRootToFlatConfig(tree, eslintFile, format) {
     }
     convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), `eslint.config.${format}`, format);
 }
+const ESLINT_LINT_EXECUTOR = '@nx/eslint:lint';
+function isEslintTarget(target) {
+    return (target.executor === ESLINT_LINT_EXECUTOR ||
+        target.command?.includes('eslint'));
+}
 function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles, format) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
-    if (eslintFile && !eslintFile.endsWith('.js')) {
-        if (projectConfig.targets) {
-            const eslintTargets = Object.keys(projectConfig.targets || {}).filter((t) => projectConfig.targets[t].executor === '@nx/eslint:lint' ||
-                projectConfig.targets[t].command?.includes('eslint'));
-            let ignorePath;
-            for (const target of eslintTargets) {
-                // remove any obsolete `eslintConfig` options pointing to the old config file
-                if (projectConfig.targets[target].options?.eslintConfig) {
-                    delete projectConfig.targets[target].options.eslintConfig;
-                }
-                if (projectConfig.targets[target].options?.ignorePath) {
-                    ignorePath = projectConfig.targets[target].options.ignorePath;
-                    delete projectConfig.targets[target].options.ignorePath;
-                }
-                (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
-            }
-            const nxHasEsLintTargets = Object.keys(nxJson.targetDefaults || {}).some((t) => (t === '@nx/eslint:lint' ||
-                nxJson.targetDefaults[t].executor === '@nx/eslint:lint' ||
-                nxJson.targetDefaults[t].command?.includes('eslint')) &&
-                projectConfig.targets?.[t]);
-            const nxHasEsLintPlugin = (nxJson.plugins || []).some((p) => typeof p === 'string'
-                ? 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);
-                eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
-                if (ignorePath) {
-                    eslintIgnoreFiles.add(ignorePath);
-                }
-            }
+    if (!eslintFile || eslintFile.endsWith('.js')) {
+        return;
+    }
+    // Clean up obsolete target options and detect explicit ESLint targets
+    let ignorePath;
+    const eslintTargets = projectConfig.targets
+        ? Object.keys(projectConfig.targets).filter((t) => isEslintTarget(projectConfig.targets[t]))
+        : [];
+    for (const target of eslintTargets) {
+        if (projectConfig.targets[target].options?.eslintConfig) {
+            delete projectConfig.targets[target].options.eslintConfig;
         }
+        if (projectConfig.targets[target].options?.ignorePath) {
+            ignorePath = projectConfig.targets[target].options.ignorePath;
+            delete projectConfig.targets[target].options.ignorePath;
+        }
+    }
+    if (eslintTargets.length > 0) {
+        (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
+    }
+    const hasEslintTargetDefaults = projectConfig.targets &&
+        Object.keys(nxJson.targetDefaults || {}).some((t) => (t === ESLINT_LINT_EXECUTOR ||
+            isEslintTarget(nxJson.targetDefaults[t])) &&
+            projectConfig.targets[t]);
+    if (eslintTargets.length === 0 &&
+        !hasEslintTargetDefaults &&
+        !(0, plugin_1.hasEslintPlugin)(tree)) {
+        devkit_1.logger.warn(`Skipping "${project}": found ${eslintFile} but no ESLint lint target detected. Convert manually if needed.`);
+        return;
+    }
+    convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, `eslint.config.${format}`, format, ignorePath);
+    eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
+    if (ignorePath) {
+        eslintIgnoreFiles.add(ignorePath);
     }
 }
 // update names of eslint files in nx.json

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

@@ -18,7 +18,13 @@ export declare function addExtendsToLintConfig(tree: Tree, root: string, plugin:
     name: string;
     needCompatFixup: boolean;
 }>, insertAtTheEnd?: boolean): GeneratorCallback;
-export declare function addPredefinedConfigToFlatLintConfig(tree: Tree, root: string, predefinedConfigName: string, moduleName?: string, moduleImportPath?: string, spread?: boolean, insertAtTheEnd?: boolean): void;
+export declare function addPredefinedConfigToFlatLintConfig(tree: Tree, root: string, predefinedConfigName: string, options?: {
+    moduleName?: string;
+    moduleImportPath?: string;
+    spread?: boolean;
+    insertAtTheEnd?: boolean;
+    checkBaseConfig?: boolean;
+}): void;
 export declare function addPluginsToLintConfig(tree: Tree, root: string, plugin: string | string[]): void;
 export declare function addIgnoresToLintConfig(tree: Tree, root: string, ignorePatterns: string[]): void;
 export declare function getPluginImport(pluginName: string): string;

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

@@ -1 +1 @@
-{"version":3,"file":"eslint-file.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/utils/eslint-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EAKtB,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAuCrC,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAmBf;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,SAAK,GAAG,OAAO,CAW7E;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,QA6CxB;AAsED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAc1E;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAC5D,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAE7D,QAiDF;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,EACxE,MAAM,EAAE,CACN,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAChD,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,QA4C/C;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,EACxE,eAAe,UAAQ,GACtB,OAAO,CAyCT;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QA8BvD;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EACF,MAAM,GACN;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,GAC1C,KAAK,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9D,cAAc,UAAQ,GACrB,iBAAiB,CA+GnB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM,EAC5B,UAAU,SAAO,EACjB,gBAAgB,SAAsB,EACtC,MAAM,UAAO,EACb,cAAc,UAAO,GACpB,IAAI,CAqBN;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,QA+B1B;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EAAE,QAuCzB;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAY1D"}
+{"version":3,"file":"eslint-file.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/utils/eslint-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,iBAAiB,EAKtB,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAuCrC,wBAAgB,cAAc,CAC5B,IAAI,EAAE,IAAI,EACV,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,GAAG,IAAI,CAmBf;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,IAAI,EAAE,WAAW,SAAK,GAAG,OAAO,CAW7E;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,QA6CxB;AAsED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CAc1E;AAED,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAC5D,OAAO,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,eAAe,CAAC,EAAE,OAAO,CAAA;CAE7D,QAiDF;AAED,wBAAgB,0BAA0B,CACxC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,EACxE,MAAM,EAAE,CACN,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAChD,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,QA4C/C;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,OAAO,EACxE,eAAe,UAAQ,GACtB,OAAO,CAyCT;AAED,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,QA8BvD;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EACF,MAAM,GACN;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,GAC1C,KAAK,CAAC,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE,CAAC,EAC9D,cAAc,UAAQ,GACrB,iBAAiB,CA+GnB;AAED,wBAAgB,mCAAmC,CACjD,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,oBAAoB,EAAE,MAAM,EAC5B,OAAO,GAAE;IACP,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;CACtB,GACL,IAAI,CA6BN;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,QA+B1B;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EAAE,QAuCzB;AAED,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAY1D"}

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

@@ -375,7 +375,8 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
         return () => { };
     }
 }
-function addPredefinedConfigToFlatLintConfig(tree, root, predefinedConfigName, moduleName = 'nx', moduleImportPath = '@nx/eslint-plugin', spread = true, insertAtTheEnd = true) {
+function addPredefinedConfigToFlatLintConfig(tree, root, predefinedConfigName, options = {}) {
+    const { moduleName = 'nx', moduleImportPath = '@nx/eslint-plugin', spread = true, insertAtTheEnd = true, checkBaseConfig = false, } = options;
     if (!(0, flat_config_1.useFlatConfig)(tree))
         throw new Error('Predefined configs can only be used with flat configs');
     let fileName;
@@ -387,7 +388,7 @@ function addPredefinedConfigToFlatLintConfig(tree, root, predefinedConfigName, m
     }
     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 });
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)(predefinedConfigName, moduleName, spread), { insertAtTheEnd, checkBaseConfig });
     tree.write(fileName, content);
 }
 function addPluginsToLintConfig(tree, root, plugin) {

package/src/generators/utils/flat-config/ast-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"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"}

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

@@ -619,9 +619,25 @@ function addBlockToFlatConfigExportESM(content, config, source, printer, options
     if (!exportDefaultStatement)
         return content;
     const exportArrayLiteral = exportDefaultStatement.expression;
-    const updatedArrayElements = options.insertAtTheEnd
-        ? [...exportArrayLiteral.elements, config]
-        : [config, ...exportArrayLiteral.elements];
+    let updatedArrayElements;
+    if (options.checkBaseConfig) {
+        const baseConfigIndex = exportArrayLiteral.elements.findIndex((el) => ts.isSpreadElement(el) &&
+            ts.isIdentifier(el.expression) &&
+            el.expression.text === 'baseConfig');
+        if (baseConfigIndex >= 0) {
+            const before = exportArrayLiteral.elements.slice(0, baseConfigIndex);
+            const after = exportArrayLiteral.elements.slice(baseConfigIndex);
+            updatedArrayElements = [...before, config, ...after];
+        }
+        else {
+            updatedArrayElements = [...exportArrayLiteral.elements, config];
+        }
+    }
+    else {
+        updatedArrayElements = options.insertAtTheEnd
+            ? [...exportArrayLiteral.elements, config]
+            : [config, ...exportArrayLiteral.elements];
+    }
     const updatedExportDefault = ts.factory.createExportAssignment(undefined, false, ts.factory.createArrayLiteralExpression(updatedArrayElements, true));
     // update the existing export default array
     const updatedStatements = source.statements.map((statement) => statement === exportDefaultStatement ? updatedExportDefault : statement);
@@ -650,6 +666,28 @@ function addBlockToFlatConfigExportCJS(content, config, source, printer, options
         printer
             .printNode(ts.EmitHint.Expression, config, source)
             .replaceAll(/\n/g, '\n    ');
+    if (options.checkBaseConfig) {
+        const baseConfigElement = exportsArray.find((el) => ts.isSpreadElement(el) &&
+            ts.isIdentifier(el.expression) &&
+            el.expression.text === 'baseConfig');
+        if (baseConfigElement) {
+            // Match baseConfig's indentation for consistent formatting
+            const baseConfigStart = baseConfigElement.getStart();
+            const lineStart = content.lastIndexOf('\n', baseConfigStart) + 1;
+            const indentation = content.substring(lineStart, baseConfigStart);
+            const configText = printer
+                .printNode(ts.EmitHint.Expression, config, source)
+                .replaceAll(/\n/g, `\n${indentation}`);
+            return (0, devkit_1.applyChangesToString)(content, [
+                {
+                    type: devkit_1.ChangeType.Insert,
+                    index: baseConfigStart,
+                    text: `${configText},\n${indentation}`,
+                },
+            ]);
+        }
+        // baseConfig not found — fall through to insertAtTheEnd behavior
+    }
     if (options.insertAtTheEnd) {
         const index = exportsArray.length > 0
             ? exportsArray.at(exportsArray.length - 1).end

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAqBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAmHD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CA8D1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAqBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAmHD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAsE1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -112,8 +112,14 @@ exports.createNodes = [
             if (eslintConfigFiles.length === 0) {
                 return [];
             }
+            // Determine flat vs legacy from root config, matching ESLint's own
+            // behavior (find-up from cwd). Nested .eslintrc.* files are irrelevant
+            // when a root flat config exists. Prefer flat config at root when both
+            // flat and legacy root configs coexist (e.g., mid-migration).
+            const rootConfigs = eslintConfigFiles.filter((f) => (0, posix_1.dirname)(f) === '.');
+            const rootConfig = rootConfigs.find(config_file_1.isFlatConfig) ?? rootConfigs[0];
             const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
-                useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(eslintConfigFiles[0]),
+                useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(rootConfig ?? eslintConfigFiles[0]),
             });
             return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(ESLint, configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache, hashByRoot), eslintConfigFiles, options, context);
         }