@nx/eslint 17.3.0-canary.20231222-d819e6c → 17.3.0-canary.20231226-cb09f25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.3.0-canary.20231222-d819e6c",
+  "version": "17.3.0-canary.20231226-cb09f25",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -34,11 +34,11 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-canary.20231222-d819e6c",
-    "@nx/js": "17.3.0-canary.20231222-d819e6c",
+    "@nx/devkit": "17.3.0-canary.20231226-cb09f25",
+    "@nx/js": "17.3.0-canary.20231226-cb09f25",
     "tslib": "^2.3.0",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.3.0-canary.20231222-d819e6c"
+    "@nx/linter": "17.3.0-canary.20231226-cb09f25"
   },
   "peerDependenciesMeta": {
     "eslint": {

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

@@ -14,17 +14,11 @@ async function run(options, context) {
     // root to be able to run the lint executor from any subfolder.
     process.chdir(systemRoot);
     const projectName = context.projectName || '<???>';
+    const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
     const printInfo = options.format && !options.silent;
     if (printInfo) {
         console.info(`\nLinting ${JSON.stringify(projectName)}...`);
     }
-    /**
-     * We want users to have the option of not specifying the config path, and let
-     * eslint automatically resolve the `.eslintrc.json` files in each folder.
-     */
-    let eslintConfigPath = options.eslintConfig
-        ? (0, path_1.resolve)(systemRoot, options.eslintConfig)
-        : undefined;
     options.cacheLocation = options.cacheLocation
         ? (0, devkit_1.joinPathFragments)(options.cacheLocation, projectName)
         : undefined;
@@ -35,6 +29,21 @@ async function run(options, context) {
      * their root ESLint config to use eslint.config.js
      */
     const hasFlatConfig = (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'eslint.config.js'));
+    // while standard eslint uses by default closest config to the file, if otherwise not specified,
+    // the flat config would always use the root config, so we need to explicitly set it to the local one
+    if (hasFlatConfig && !normalizedOptions.eslintConfig) {
+        const eslintConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'eslint.config.js');
+        if ((0, fs_1.existsSync)(eslintConfigPath)) {
+            normalizedOptions.eslintConfig = eslintConfigPath;
+        }
+    }
+    /**
+     * We want users to have the option of not specifying the config path, and let
+     * eslint automatically resolve the `.eslintrc.json` files in each folder.
+     */
+    let eslintConfigPath = normalizedOptions.eslintConfig
+        ? (0, path_1.resolve)(systemRoot, normalizedOptions.eslintConfig)
+        : undefined;
     const { eslint, ESLint } = await (0, eslint_utils_1.resolveAndInstantiateESLint)(eslintConfigPath, normalizedOptions, hasFlatConfig);
     const version = ESLint.version?.split('.');
     if (!version ||
@@ -62,7 +71,7 @@ async function run(options, context) {
     const normalizedLintFilePatterns = normalizedOptions.lintFilePatterns.map((pattern) => {
         return (0, utils_1.interpolate)(pattern, {
             workspaceRoot: '',
-            projectRoot: context.projectsConfigurations.projects[context.projectName].root,
+            projectRoot,
             projectName: context.projectName,
         });
     });