@nx/eslint 17.2.0-beta.1 → 17.2.0-beta.10

package/migrations.json

@@ -32,6 +32,11 @@
       "version": "17.1.0-beta.1",
       "description": "Updates for @typescript-utils/utils v6.9.1+",
       "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint"
+    },
+    "simplify-eslint-patterns": {
+      "version": "17.2.0-beta.0",
+      "description": "Simplify eslintFilePatterns",
+      "implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns"
     }
   },
   "packageJsonUpdates": {
@@ -101,6 +106,14 @@
           "version": "^6.9.1"
         }
       }
+    },
+    "17.2.0": {
+      "version": "17.2.0-beta.2",
+      "packages": {
+        "eslint": {
+          "version": "~8.48.0"
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.2.0-beta.1",
+  "version": "17.2.0-beta.10",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -30,18 +30,22 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "peerDependencies": {
-    "eslint": "^8.0.0"
+    "eslint": "^8.0.0",
+    "js-yaml": "4.1.0"
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.2.0-beta.1",
-    "@nx/js": "17.2.0-beta.1",
+    "@nx/devkit": "17.2.0-beta.10",
+    "@nx/js": "17.2.0-beta.10",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.2.0-beta.1"
+    "@nx/linter": "17.2.0-beta.10"
   },
   "peerDependenciesMeta": {
     "eslint": {
       "optional": true
+    },
+    "js-yaml": {
+      "optional": true
     }
   },
   "publishConfig": {

package/src/executors/lint/hasher.js

@@ -17,7 +17,7 @@ async function run(task, context) {
     }
     const nodes = {};
     const hashes = [];
-    for (const d of Object.keys(res.details.nodes)) {
+    for (const d of Object.keys(res.details.nodes).sort()) {
         if (d.indexOf('$fileset') === -1) {
             nodes[d] = res.details.nodes[d];
             hashes.push(res.details.nodes[d]);

package/src/executors/lint/lint.impl.js

@@ -4,6 +4,7 @@ const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const eslint_utils_1 = require("./utility/eslint-utils");
+const utils_1 = require("nx/src/tasks-runner/utils");
 async function run(options, context) {
     // this is only used for the hasher
     delete options.hasTypeAwareRules;
@@ -58,8 +59,15 @@ async function run(options, context) {
         }
     }
     let lintResults = [];
+    const normalizedLintFilePatterns = normalizedOptions.lintFilePatterns.map((pattern) => {
+        return (0, utils_1.interpolate)(pattern, {
+            workspaceRoot: '',
+            projectRoot: context.projectsConfigurations.projects[context.projectName].root,
+            projectName: context.projectName,
+        });
+    });
     try {
-        lintResults = await eslint.lintFiles(normalizedOptions.lintFilePatterns);
+        lintResults = await eslint.lintFiles(normalizedLintFilePatterns);
     }
     catch (err) {
         if (err.message.includes('You must therefore provide a value for the "parserOptions.project" property for @typescript-eslint/parser')) {
@@ -81,7 +89,7 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
         throw err;
     }
     if (lintResults.length === 0 && errorOnUnmatchedPattern) {
-        const ignoredPatterns = (await Promise.all(normalizedOptions.lintFilePatterns.map(async (pattern) => (await eslint.isPathIgnored(pattern)) ? pattern : null)))
+        const ignoredPatterns = (await Promise.all(normalizedLintFilePatterns.map(async (pattern) => (await eslint.isPathIgnored(pattern)) ? pattern : null)))
             .filter((pattern) => !!pattern)
             .map((pattern) => `- '${pattern}'`);
         if (ignoredPatterns.length) {

package/src/executors/lint/schema.json

@@ -17,7 +17,7 @@
     "lintFilePatterns": {
       "type": "array",
       "description": "One or more files/dirs/globs to pass directly to ESLint's `lintFiles()` method.",
-      "default": [],
+      "default": ["{projectRoot}"],
       "items": {
         "type": "string"
       }
@@ -144,6 +144,5 @@
       "default": true
     }
   },
-  "required": ["lintFilePatterns"],
   "examplesFile": "../../../docs/eslint-examples.md"
 }

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

@@ -1,6 +1,11 @@
 import { Tree } from '@nx/devkit';
+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, sourceFile: string, destinationFile: string, ignorePaths: string[]): void;
+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

@@ -2,25 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertEslintJsonToFlatConfig = void 0;
 const devkit_1 = require("@nx/devkit");
-const path_1 = require("path");
 const ts = require("typescript");
-const versions_1 = require("../../../utils/versions");
 const ast_utils_1 = require("../../utils/flat-config/ast-utils");
 const eslint_file_1 = require("../../utils/eslint-file");
+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, sourceFile, destinationFile, ignorePaths) {
+function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths) {
     const importsMap = new Map();
     const exportElements = [];
     let isFlatCompatNeeded = false;
+    let isESLintJSNeeded = false;
     let combinedConfig = [];
     let languageOptions = [];
-    // read original config
-    const config = (0, devkit_1.readJson)(tree, `${root}/${sourceFile}`);
     if (config.extends) {
-        isFlatCompatNeeded = addExtends(importsMap, exportElements, config, tree);
+        const extendsResult = addExtends(importsMap, exportElements, config);
+        isFlatCompatNeeded = extendsResult.isFlatCompatNeeded;
+        isESLintJSNeeded = extendsResult.isESLintJSNeeded;
     }
     if (config.plugins) {
         addPlugins(importsMap, exportElements, config);
@@ -70,7 +70,7 @@ function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile,
                 override.parser) {
                 isFlatCompatNeeded = true;
             }
-            exportElements.push((0, ast_utils_1.generateFlatOverride)(override, root));
+            exportElements.push((0, ast_utils_1.generateFlatOverride)(override));
         });
     }
     if (config.ignorePatterns) {
@@ -79,7 +79,7 @@ function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile,
             : [config.ignorePatterns]).filter((pattern) => !['**/*', '!**/*', 'node_modules'].includes(pattern)); // these are useless in a flat config
         if (patterns.length > 0) {
             exportElements.push((0, ast_utils_1.generateAst)({
-                ignores: patterns.map((path) => (0, ast_utils_1.mapFilePath)(path, root)),
+                ignores: patterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
             }));
         }
     }
@@ -89,27 +89,25 @@ function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile,
                 .read(ignorePath, 'utf-8')
                 .split('\n')
                 .filter((line) => line.length > 0 && line !== 'node_modules')
-                .map((path) => (0, ast_utils_1.mapFilePath)(path, root));
+                .map((path) => (0, path_utils_1.mapFilePath)(path));
             if (patterns.length > 0) {
                 exportElements.push((0, ast_utils_1.generateAst)({ ignores: patterns }));
             }
         }
     }
-    tree.delete((0, path_1.join)(root, sourceFile));
     // create the node list and print it to new file
     const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements, isFlatCompatNeeded);
-    const content = (0, ast_utils_1.stringifyNodeList)(nodeList, root, destinationFile);
-    tree.write((0, path_1.join)(root, destinationFile), content);
-    if (isFlatCompatNeeded) {
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@eslint/eslintrc': versions_1.eslintrcVersion,
-        });
-    }
+    return {
+        content: (0, ast_utils_1.stringifyNodeList)(nodeList),
+        addESLintRC: isFlatCompatNeeded,
+        addESLintJS: isESLintJSNeeded,
+    };
 }
 exports.convertEslintJsonToFlatConfig = convertEslintJsonToFlatConfig;
 // add parsed extends to export blocks and add import statements
-function addExtends(importsMap, configBlocks, config, tree) {
+function addExtends(importsMap, configBlocks, config) {
     let isFlatCompatNeeded = false;
+    let isESLintJSNeeded = false;
     const extendsConfig = Array.isArray(config.extends)
         ? config.extends
         : [config.extends];
@@ -138,9 +136,7 @@ function addExtends(importsMap, configBlocks, config, tree) {
             }
         });
         if (eslintPluginExtends.length) {
-            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@eslint/js': versions_1.eslintVersion,
-            });
+            isESLintJSNeeded = true;
             importsMap.set('@eslint/js', 'js');
             eslintPluginExtends.forEach((plugin) => {
                 configBlocks.push(ts.factory.createPropertyAccessExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('js'), ts.factory.createIdentifier('configs')), ts.factory.createIdentifier(plugin.slice(7)) // strip 'eslint:' prefix
@@ -150,12 +146,10 @@ function addExtends(importsMap, configBlocks, config, tree) {
     }
     if (eslintrcConfigs.length) {
         isFlatCompatNeeded = true;
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@eslint/js': versions_1.eslintVersion,
-        });
+        isESLintJSNeeded = true;
         configBlocks.push((0, ast_utils_1.generatePluginExtendsElement)(eslintrcConfigs));
     }
-    return isFlatCompatNeeded;
+    return { isFlatCompatNeeded, isESLintJSNeeded };
 }
 function addPlugins(importsMap, configBlocks, config) {
     const mappedPlugins = [];

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

@@ -3,14 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToFlatConfigGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
+const path_1 = require("path");
+const versions_1 = require("../../utils/versions");
 const json_converter_1 = require("./converters/json-converter");
+const js_yaml_1 = require("js-yaml");
 async function convertToFlatConfigGenerator(tree, options) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree);
     if (!eslintFile) {
         throw new Error('Could not find root eslint file');
     }
-    if (!eslintFile.endsWith('.json')) {
-        throw new Error('Only json eslint config files are supported for conversion');
+    if (eslintFile.endsWith('.js')) {
+        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
@@ -34,13 +37,14 @@ async function convertToFlatConfigGenerator(tree, options) {
 exports.convertToFlatConfigGenerator = convertToFlatConfigGenerator;
 exports.default = convertToFlatConfigGenerator;
 function convertRootToFlatConfig(tree, eslintFile) {
-    if (eslintFile.endsWith('.base.json')) {
-        convertConfigToFlatConfig(tree, '', '.eslintrc.base.json', 'eslint.base.config.js');
+    if (/\.base\.(js|json|yml|yaml)$/.test(eslintFile)) {
+        convertConfigToFlatConfig(tree, '', eslintFile, 'eslint.base.config.js');
     }
-    convertConfigToFlatConfig(tree, '', '.eslintrc.json', 'eslint.config.js');
+    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), 'eslint.config.js');
 }
 function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles) {
-    if (tree.exists(`${projectConfig.root}/.eslintrc.json`)) {
+    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');
             let ignorePath;
@@ -59,7 +63,7 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
                 nxJson.targetDefaults[t].executor === '@nx/eslint:lint') &&
                 projectConfig.targets?.[t]);
             if (nxHasLintTargets || eslintTargets.length > 0) {
-                convertConfigToFlatConfig(tree, projectConfig.root, '.eslintrc.json', 'eslint.config.js', ignorePath);
+                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, 'eslint.config.js', ignorePath);
                 eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
                 if (ignorePath) {
                     eslintIgnoreFiles.add(ignorePath);
@@ -96,5 +100,35 @@ function convertConfigToFlatConfig(tree, root, source, target, ignorePath) {
     const ignorePaths = ignorePath
         ? [ignorePath, `${root}/.eslintignore`]
         : [`${root}/.eslintignore`];
-    (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, source, target, ignorePaths);
+    if (source.endsWith('.json')) {
+        const config = (0, devkit_1.readJson)(tree, `${root}/${source}`);
+        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')) {
+        const originalContent = tree.read(`${root}/${source}`, 'utf-8');
+        const config = (0, js_yaml_1.load)(originalContent, {
+            json: true,
+            filename: source,
+        });
+        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths);
+        return processConvertedConfig(tree, root, source, target, conversionResult);
+    }
+}
+function processConvertedConfig(tree, root, source, target, { content, addESLintRC, addESLintJS, }) {
+    // remove original config file
+    tree.delete((0, path_1.join)(root, source));
+    // save new
+    tree.write((0, path_1.join)(root, target), content);
+    // add missing packages
+    if (addESLintRC) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@eslint/eslintrc': versions_1.eslintrcVersion,
+        });
+    }
+    if (addESLintJS) {
+        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+            '@eslint/js': versions_1.eslintVersion,
+        });
+    }
 }

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

@@ -80,18 +80,18 @@ const getGlobalEsLintConfiguration = (unitTestRunner, rootProject) => {
 exports.getGlobalEsLintConfiguration = getGlobalEsLintConfiguration;
 const getGlobalFlatEslintConfiguration = (unitTestRunner, rootProject) => {
     const nodeList = (0, ast_utils_1.createNodeList)(new Map(), [], true);
-    let content = (0, ast_utils_1.stringifyNodeList)(nodeList, '', 'eslint.config.js');
+    let content = (0, ast_utils_1.stringifyNodeList)(nodeList);
     content = (0, ast_utils_1.addImportToFlatConfig)(content, 'nxPlugin', '@nx/eslint-plugin');
     content = (0, ast_utils_1.addPluginsToExportsBlock)(content, [
         { name: '@nx', varName: 'nxPlugin', imp: '@nx/eslint-plugin' },
     ]);
     if (!rootProject) {
-        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(moduleBoundariesOverride, ''));
+        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(moduleBoundariesOverride));
     }
-    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(exports.typeScriptOverride, ''));
-    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(exports.javaScriptOverride, ''));
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(exports.typeScriptOverride));
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(exports.javaScriptOverride));
     if (unitTestRunner === 'jest') {
-        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(jestOverride, ''));
+        content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(jestOverride));
     }
     return content;
 };

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

@@ -23,7 +23,7 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner) {
     projects.forEach((project) => {
         const lintTarget = findLintTarget(project);
         if (lintTarget) {
-            const eslintFile = lintTarget.options.eslintConfig || (0, eslint_file_1.findEslintFile)(tree, project.root);
+            const eslintFile = lintTarget.options?.eslintConfig || (0, eslint_file_1.findEslintFile)(tree, project.root);
             if (eslintFile) {
                 const projectEslintPath = (0, devkit_1.joinPathFragments)(project.root, eslintFile);
                 migrateEslintFile(projectEslintPath, tree);

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

@@ -11,6 +11,5 @@ interface LintProjectOptions {
     unitTestRunner?: string;
     rootProject?: boolean;
 }
-export declare function mapLintPattern(projectRoot: string, extension: string, rootProject?: boolean): string;
 export declare function lintProjectGenerator(tree: Tree, options: LintProjectOptions): Promise<import("@nx/devkit").GeneratorCallback>;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintProjectGenerator = exports.mapLintPattern = void 0;
+exports.lintProjectGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
@@ -9,15 +9,6 @@ const init_migration_1 = require("../init/init-migration");
 const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
-function mapLintPattern(projectRoot, extension, rootProject) {
-    if (rootProject && (projectRoot === '.' || projectRoot === '')) {
-        return `${projectRoot}/src/**/*.${extension}`;
-    }
-    else {
-        return `${projectRoot}/**/*.${extension}`;
-    }
-}
-exports.mapLintPattern = mapLintPattern;
 async function lintProjectGenerator(tree, options) {
     const installTask = (0, init_1.lintInitGenerator)(tree, {
         linter: options.linter,
@@ -26,17 +17,24 @@ async function lintProjectGenerator(tree, options) {
         rootProject: options.rootProject,
     });
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    const lintFilePatterns = options.eslintFilePatterns ?? [];
-    if (isBuildableLibraryProject(projectConfig)) {
-        lintFilePatterns.push(`${projectConfig.root}/package.json`);
-    }
     projectConfig.targets['lint'] = {
         executor: '@nx/eslint:lint',
         outputs: ['{options.outputFile}'],
-        options: {
-            lintFilePatterns: lintFilePatterns,
-        },
     };
+    let lintFilePatterns = options.eslintFilePatterns;
+    if (!lintFilePatterns && options.rootProject && projectConfig.root === '.') {
+        lintFilePatterns = ['./src'];
+    }
+    if (lintFilePatterns && lintFilePatterns.length) {
+        if (isBuildableLibraryProject(projectConfig) &&
+            !lintFilePatterns.includes('{projectRoot}')) {
+            lintFilePatterns.push(`{projectRoot}/package.json`);
+        }
+        // only add lintFilePatterns if they are explicitly defined
+        projectConfig.targets['lint'].options = {
+            lintFilePatterns,
+        };
+    }
     // we are adding new project which is not the root project or
     // companion e2e app so we should check if migration to
     // monorepo style is needed
@@ -58,7 +56,7 @@ async function lintProjectGenerator(tree, options) {
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject);
+        createEsLintConfiguration(tree, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
     if (isBuildableLibraryProject(projectConfig) &&
@@ -77,10 +75,11 @@ async function lintProjectGenerator(tree, options) {
     return installTask;
 }
 exports.lintProjectGenerator = lintProjectGenerator;
-function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject) {
-    const eslintConfig = (0, eslint_file_1.findEslintFile)(tree);
-    const pathToRootConfig = eslintConfig
-        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${eslintConfig}`
+function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject, rootProject) {
+    // we are only extending root for non-standalone projects or their complementary e2e apps
+    const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
+    const pathToRootConfig = extendedRootConfig
+        ? `${(0, devkit_1.offsetFromRoot)(projectConfig.root)}${extendedRootConfig}`
         : undefined;
     const addDependencyChecks = isBuildableLibraryProject(projectConfig);
     const overrides = [
@@ -132,20 +131,20 @@ function createEsLintConfiguration(tree, projectConfig, setParserOptionsProject)
         const isCompatNeeded = addDependencyChecks;
         const nodes = [];
         const importMap = new Map();
-        if (eslintConfig) {
+        if (extendedRootConfig) {
             importMap.set(pathToRootConfig, 'baseConfig');
             nodes.push((0, ast_utils_1.generateSpreadElement)('baseConfig'));
         }
         overrides.forEach((override) => {
-            nodes.push((0, ast_utils_1.generateFlatOverride)(override, projectConfig.root));
+            nodes.push((0, ast_utils_1.generateFlatOverride)(override));
         });
         const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes, isCompatNeeded);
-        const content = (0, ast_utils_1.stringifyNodeList)(nodeList, projectConfig.root, 'eslint.config.js');
+        const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
         tree.write((0, path_1.join)(projectConfig.root, 'eslint.config.js'), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
-            extends: eslintConfig ? [pathToRootConfig] : undefined,
+            extends: extendedRootConfig ? [pathToRootConfig] : undefined,
             // Include project files to be linted since the global one excludes all files.
             ignorePatterns: ['!**/*'],
             overrides,

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

@@ -4,6 +4,7 @@ exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToL
 const devkit_1 = require("@nx/devkit");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("./flat-config/ast-utils");
+const path_utils_1 = require("./flat-config/path-utils");
 exports.eslintConfigFileWhitelist = [
     '.eslintrc',
     '.eslintrc.js',
@@ -112,7 +113,7 @@ 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 ? exports.baseEsLintFlatConfigFile : 'eslint.config.js');
-        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
+        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
         let content = tree.read(fileName, 'utf8');
         // we will be using compat here so we need to make sure it's added
         if (overrideNeedsCompat(override)) {
@@ -123,7 +124,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintConfigFile : '.eslintrc.json');
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
-            json.overrides ?? [];
+            json.overrides ??= [];
             if (options.insertAtTheEnd) {
                 json.overrides.push(override);
             }
@@ -183,7 +184,7 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
         }
         content = (0, ast_utils_1.removeOverridesFromLintConfig)(content);
         overrides.forEach((override) => {
-            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
+            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
             (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
         });
         tree.write(fileName, content);
@@ -247,7 +248,7 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const block = (0, ast_utils_1.generateAst)({
-            ignores: ignorePatterns.map((path) => (0, ast_utils_1.mapFilePath)(path, root)),
+            ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
         });
         tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), block));
     }

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

@@ -44,7 +44,7 @@ export declare function generatePluginExtendsElement(plugins: string[]): ts.Spre
 /**
  * Stringifies TS nodes to file content string
  */
-export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>, root: string, fileName: string): string;
+export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>): string;
 /**
  * generates AST require statement
  */
@@ -52,9 +52,8 @@ export declare function generateRequire(variableName: string | ts.ObjectBindingP
 /**
  * Generates AST object or spread element based on JSON override object
  */
-export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): ts.ObjectLiteralExpression | ts.SpreadElement;
-export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): void;
-export declare function mapFilePath(filePath: string, root: string): string;
+export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>): ts.ObjectLiteralExpression | ts.SpreadElement;
+export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>): void;
 /**
  * Generates an AST from a JSON-type input
  */

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAst = exports.mapFilePath = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
+exports.generateAst = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
+const path_utils_1 = require("./path-utils");
 /**
  * Remove all overrides from the config file
  */
@@ -63,7 +64,7 @@ function hasOverride(content, lookup) {
                 // strip any spread elements
                 objSource = fullNodeText.replace(/\s*\.\.\.[a-zA-Z0-9_]+,?\n?/, '');
             }
-            const data = JSON.parse(objSource
+            const data = (0, devkit_1.parseJson)(objSource
                 // ensure property names have double quotes so that JSON.parse works
                 .replace(/'/g, '"')
                 .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -77,7 +78,7 @@ function hasOverride(content, lookup) {
 exports.hasOverride = hasOverride;
 const STRIP_SPREAD_ELEMENTS = /\s*\.\.\.[a-zA-Z0-9_]+,?\n?/g;
 function parseTextToJson(text) {
-    return JSON.parse(text
+    return (0, devkit_1.parseJson)(text
         // ensure property names have double quotes so that JSON.parse works
         .replace(/'/g, '"')
         .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -118,7 +119,7 @@ function replaceOverride(content, root, lookup, update) {
                     length: end - start,
                 });
                 const updatedData = update(data);
-                mapFilePaths(updatedData, root);
+                mapFilePaths(updatedData);
                 changes.push({
                     type: devkit_1.ChangeType.Insert,
                     index: start,
@@ -470,10 +471,15 @@ exports.generatePluginExtendsElement = generatePluginExtendsElement;
 /**
  * Stringifies TS nodes to file content string
  */
-function stringifyNodeList(nodes, root, fileName) {
+function stringifyNodeList(nodes) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
-    const resultFile = ts.createSourceFile((0, devkit_1.joinPathFragments)(root, fileName), '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    return printer.printList(ts.ListFormat.MultiLine, nodes, resultFile);
+    const resultFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    return (printer
+        .printList(ts.ListFormat.MultiLine, nodes, resultFile)
+        // add new line before compat initialization
+        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat')
+        // add new line before module.exports = ...
+        .replace(/module\.exports/, '\nmodule.exports'));
 }
 exports.stringifyNodeList = stringifyNodeList;
 /**
@@ -488,8 +494,8 @@ exports.generateRequire = generateRequire;
 /**
  * Generates AST object or spread element based on JSON override object
  */
-function generateFlatOverride(override, root) {
-    mapFilePaths(override, root);
+function generateFlatOverride(override) {
+    mapFilePaths(override);
     if (!override.env &&
         !override.extends &&
         !override.plugins &&
@@ -510,41 +516,21 @@ function generateFlatOverride(override, root) {
     ]));
 }
 exports.generateFlatOverride = generateFlatOverride;
-function mapFilePaths(override, root) {
+function mapFilePaths(override) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => mapFilePath(file, root));
+        override.files = override.files.map((file) => (0, path_utils_1.mapFilePath)(file));
     }
     if (override.excludedFiles) {
         override.excludedFiles = Array.isArray(override.excludedFiles)
             ? override.excludedFiles
             : [override.excludedFiles];
-        override.excludedFiles = override.excludedFiles.map((file) => mapFilePath(file, root));
+        override.excludedFiles = override.excludedFiles.map((file) => (0, path_utils_1.mapFilePath)(file));
     }
 }
 exports.mapFilePaths = mapFilePaths;
-function mapFilePath(filePath, root) {
-    if (filePath.startsWith('!')) {
-        const fileWithoutBang = filePath.slice(1);
-        if (fileWithoutBang.startsWith('*.')) {
-            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
-        }
-        else if (!fileWithoutBang.startsWith(root)) {
-            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
-        }
-        return filePath;
-    }
-    if (filePath.startsWith('*.')) {
-        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
-    }
-    else if (!filePath.startsWith(root)) {
-        return (0, devkit_1.joinPathFragments)(root, filePath);
-    }
-    return filePath;
-}
-exports.mapFilePath = mapFilePath;
 function addTSObjectProperty(elements, key, value) {
     if (value) {
         elements.push(ts.factory.createPropertyAssignment(key, generateAst(value)));

package/src/generators/utils/flat-config/path-utils.d.ts

@@ -1,2 +1,3 @@
 import type { Linter } from 'eslint';
-export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): Linter.ConfigOverride<Linter.RulesRecord>;
+export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>): Linter.ConfigOverride<Linter.RulesRecord>;
+export declare function mapFilePath(filePath: string): string;

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

@@ -1,31 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateFiles = void 0;
+exports.mapFilePath = exports.updateFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateFiles(override, root) {
+function updateFiles(override) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => mapFilePath(file, root));
+        override.files = override.files.map((file) => mapFilePath(file));
     }
     return override;
 }
 exports.updateFiles = updateFiles;
-function mapFilePath(filePath, root) {
+function mapFilePath(filePath) {
     if (filePath.startsWith('!')) {
         const fileWithoutBang = filePath.slice(1);
         if (fileWithoutBang.startsWith('*.')) {
-            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
-        }
-        else {
-            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
+            return `!${(0, devkit_1.joinPathFragments)('**', fileWithoutBang)}`;
         }
+        return filePath;
     }
     if (filePath.startsWith('*.')) {
-        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
-    }
-    else {
-        return (0, devkit_1.joinPathFragments)(root, filePath);
+        return (0, devkit_1.joinPathFragments)('**', filePath);
     }
+    return filePath;
 }
+exports.mapFilePath = mapFilePath;

package/src/migrations/update-17-2-0/simplify-eslint-patterns.d.ts

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

package/src/migrations/update-17-2-0/simplify-eslint-patterns.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nx/devkit");
+async function update(tree) {
+    const projects = (0, devkit_1.getProjects)(tree);
+    for (const [projectName, projectConfiguration] of projects) {
+        let needsUpdate = false;
+        for (const [targetName, targetConfig] of Object.entries(projectConfiguration.targets ?? {})) {
+            if (targetConfig.executor !== '@nx/eslint:lint') {
+                continue;
+            }
+            needsUpdate = true;
+            if (projectConfiguration.targets[targetName].options?.lintFilePatterns) {
+                const rootPattern = getLintRoot(projectConfiguration);
+                const nonRootPatterns = projectConfiguration.targets[targetName].options.lintFilePatterns.filter((p) => !p.startsWith(rootPattern) && !p.startsWith('{projectRoot}'));
+                if (nonRootPatterns.length === 0 &&
+                    rootPattern === projectConfiguration.root) {
+                    // delete the lintFilePatterns option if it's the only option and matches the root of the project
+                    delete projectConfiguration.targets[targetName].options
+                        .lintFilePatterns;
+                    if (Object.keys(projectConfiguration.targets[targetName].options)
+                        .length === 0) {
+                        delete projectConfiguration.targets[targetName].options;
+                    }
+                }
+                else {
+                    projectConfiguration.targets[targetName].options.lintFilePatterns = [
+                        rootPattern,
+                        ...nonRootPatterns,
+                    ];
+                }
+            }
+        }
+        if (needsUpdate) {
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
+        }
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+exports.default = update;
+function getLintRoot({ root, sourceRoot }) {
+    if (root === '' || root === '.') {
+        return sourceRoot || './src';
+    }
+    return root;
+}

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
 export declare const nxVersion: any;
-export declare const eslintVersion = "~8.46.0";
+export declare const eslintVersion = "~8.48.0";
 export declare const eslintrcVersion = "^2.1.1";
 export declare const eslintConfigPrettierVersion = "^9.0.0";
 export declare const typescriptESLintVersion = "^6.9.1";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.eslintVersion = '~8.46.0';
+exports.eslintVersion = '~8.48.0';
 exports.eslintrcVersion = '^2.1.1';
 exports.eslintConfigPrettierVersion = '^9.0.0';
 exports.typescriptESLintVersion = '^6.9.1';