@nx/eslint 19.1.0 → 19.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.1.0",
+  "version": "19.1.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,12 +35,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.1.0",
-    "@nx/js": "19.1.0",
+    "@nx/devkit": "19.1.2",
+    "@nx/js": "19.1.2",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.1.0"
+    "@nx/linter": "19.1.2"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -1,4 +1,4 @@
-import { Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { ConvertToFlatConfigGeneratorSchema } from './schema';
-export declare function convertToFlatConfigGenerator(tree: Tree, options: ConvertToFlatConfigGeneratorSchema): Promise<void>;
+export declare function convertToFlatConfigGenerator(tree: Tree, options: ConvertToFlatConfigGeneratorSchema): Promise<void | GeneratorCallback>;
 export default convertToFlatConfigGenerator;

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

@@ -6,6 +6,7 @@ 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");
+let shouldInstallDeps = false;
 async function convertToFlatConfigGenerator(tree, options) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree);
     if (!eslintFile) {
@@ -32,6 +33,9 @@ async function convertToFlatConfigGenerator(tree, options) {
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
+    if (shouldInstallDeps) {
+        return () => (0, devkit_1.installPackagesTask)(tree);
+    }
 }
 exports.convertToFlatConfigGenerator = convertToFlatConfigGenerator;
 exports.default = convertToFlatConfigGenerator;
@@ -127,11 +131,13 @@ function processConvertedConfig(tree, root, source, target, { content, addESLint
     tree.write((0, path_1.join)(root, target), content);
     // add missing packages
     if (addESLintRC) {
+        shouldInstallDeps = true;
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@eslint/eslintrc': versions_1.eslintrcVersion,
         });
     }
     if (addESLintJS) {
+        shouldInstallDeps = true;
         (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@eslint/js': versions_1.eslintVersion,
         });

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

@@ -21,14 +21,14 @@ async function convertToInferred(tree, options) {
 exports.convertToInferred = convertToInferred;
 function postTargetTransformer(target, tree, projectDetails) {
     if (target.inputs) {
-        target.inputs = target.inputs.filter((input) => typeof input === 'string' &&
+        const inputs = target.inputs.filter((input) => typeof input === 'string' &&
             ![
                 'default',
                 '{workspaceRoot}/.eslintrc.json',
                 '{workspaceRoot}/.eslintignore',
                 '{workspaceRoot}/eslint.config.js',
             ].includes(input));
-        if (target.inputs.length === 0) {
+        if (inputs.length === 0) {
             delete target.inputs;
         }
     }

package/src/plugins/plugin.js

@@ -76,11 +76,17 @@ function getProjectsUsingESLintConfig(configFilePath, childProjectRoots, eslintV
     ].find((f) => (0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, f)));
     // Add a lint target for each child project without an eslint config, with the root level config as an input
     for (const projectRoot of childProjectRoots) {
-        // If there's no src folder, it's not a standalone project, do not add the target at all
-        const isStandaloneWorkspace = projectRoot === '.' &&
-            (0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot, 'src')) &&
-            (0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot, 'package.json'));
-        if (projectRoot === '.' && !isStandaloneWorkspace) {
+        let standaloneSrcPath;
+        if (projectRoot === '.' &&
+            (0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot, 'package.json'))) {
+            if ((0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot, 'src'))) {
+                standaloneSrcPath = 'src';
+            }
+            else if ((0, node_fs_1.existsSync)((0, node_path_1.join)(context.workspaceRoot, projectRoot, 'lib'))) {
+                standaloneSrcPath = 'lib';
+            }
+        }
+        if (projectRoot === '.' && !standaloneSrcPath) {
             continue;
         }
         const eslintConfigs = [configFilePath];
@@ -88,16 +94,16 @@ function getProjectsUsingESLintConfig(configFilePath, childProjectRoots, eslintV
             eslintConfigs.unshift(rootEslintConfig);
         }
         projects[projectRoot] = {
-            targets: buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, context.workspaceRoot, options, isStandaloneWorkspace),
+            targets: buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, context.workspaceRoot, options, standaloneSrcPath),
         };
     }
     return projects;
 }
-function buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, workspaceRoot, options, isStandaloneWorkspace = false) {
+function buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, workspaceRoot, options, standaloneSrcPath) {
     const isRootProject = projectRoot === '.';
     const targets = {};
     const targetConfig = {
-        command: `eslint ${isRootProject && isStandaloneWorkspace ? './src' : '.'}`,
+        command: `eslint ${isRootProject && standaloneSrcPath ? `./${standaloneSrcPath}` : '.'}`,
         cache: true,
         options: {
             cwd: projectRoot,