@nx/eslint 19.2.0-beta.5 → 19.2.0-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.2.0-beta.5",
+  "version": "19.2.0-beta.7",
   "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.2.0-beta.5",
-    "@nx/js": "19.2.0-beta.5",
+    "@nx/devkit": "19.2.0-beta.7",
+    "@nx/js": "19.2.0-beta.7",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.2.0-beta.5"
+    "@nx/linter": "19.2.0-beta.7"
   },
   "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/plugins/plugin.js

@@ -32,7 +32,7 @@ exports.createNodes = [
                 nestedEslintRootPatterns.push(`${eslintRootDir}/**/*`);
             }
         }
-        const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [
+        const projectFiles = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [
             'project.json',
             'package.json',
             '**/project.json',
@@ -48,7 +48,7 @@ exports.createNodes = [
             // anything after is either a nested project or a sibling project, can be excluded
             const nestedProjectRootPatterns = excludePatterns.slice(index + 1);
             // Ignore project roots where the project does not contain any lintable files
-            const lintableFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [(0, node_path_1.join)(childProjectRoot, `**/*.{${options.extensions.join(',')}}`)], 
+            const lintableFiles = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [(0, node_path_1.join)(childProjectRoot, `**/*.{${options.extensions.join(',')}}`)], 
             // exclude nested eslint roots and nested project roots
             [...nestedEslintRootPatterns, ...nestedProjectRootPatterns]);
             const eslint = new ESLint({