@nx/eslint 22.6.0-rc.2 → 22.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "22.6.0-rc.2",
+  "version": "22.7.0-beta.0",
   "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-rc.2",
-    "@nx/js": "22.6.0-rc.2",
+    "@nx/devkit": "22.7.0-beta.0",
+    "@nx/js": "22.7.0-beta.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "22.6.0-rc.2"
+    "nx": "22.7.0-beta.0"
   },
   "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/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);
         }