@nx/eslint 19.4.0-canary.20240622-963f753 → 19.4.0-canary.20240627-c2c6a13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.4.0-canary.20240622-963f753",
+  "version": "19.4.0-canary.20240627-c2c6a13",
   "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.4.0-canary.20240622-963f753",
-    "@nx/js": "19.4.0-canary.20240622-963f753",
+    "@nx/devkit": "19.4.0-canary.20240627-c2c6a13",
+    "@nx/js": "19.4.0-canary.20240627-c2c6a13",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.4.0-canary.20240622-963f753"
+    "@nx/linter": "19.4.0-canary.20240627-c2c6a13"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -31,7 +31,7 @@ async function run(options, context) {
     // the flat config would be resolved starting from the cwd, which we changed to the workspace root
     // so we explicitly set the config path to the flat config file path we previously found
     if (hasFlatConfig && !normalizedOptions.eslintConfig) {
-        normalizedOptions.eslintConfig = path_1.posix.relative(systemRoot, flatConfigFilePath);
+        normalizedOptions.eslintConfig = (0, path_1.relative)(systemRoot, flatConfigFilePath);
     }
     /**
      * We want users to have the option of not specifying the config path, and let

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

@@ -9,10 +9,14 @@ const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjectsModern = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nx/eslint:lint', '@nx/eslint/plugin', (targetName) => ({ targetName }), postTargetTransformer, plugin_1.createNodesV2, options.project);
-    const migratedProjectsLegacy = await (0, executor_to_plugin_migrator_1.migrateExecutorToPlugin)(tree, projectGraph, '@nrwl/linter:eslint', '@nx/eslint/plugin', (targetName) => ({ targetName }), postTargetTransformer, plugin_1.createNodesV2, options.project);
-    const migratedProjects = migratedProjectsModern.size + migratedProjectsLegacy.size;
-    if (migratedProjects === 0) {
+    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodesV2, { targetName: 'lint' }, [
+        {
+            executors: ['@nx/eslint:lint', '@nrwl/linter:eslint'],
+            postTargetTransformer,
+            targetPluginOptionMapper: (targetName) => ({ targetName }),
+        },
+    ], options.project);
+    if (migratedProjects.size === 0) {
         throw new Error('Could not find any targets to migrate.');
     }
     if (!options.skipFormat) {

package/src/generators/init/init-migration.d.ts

@@ -1,3 +1,3 @@
-import { ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, keepExistingVersions?: boolean): void;
+import { GeneratorCallback, ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
+export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, keepExistingVersions?: boolean): GeneratorCallback;
 export declare function findLintTarget(project: ProjectConfiguration): TargetConfiguration;

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

@@ -64,6 +64,9 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExisti
             }
         }
     });
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@nx/eslint-plugin': versions_1.nxVersion,
+    });
 }
 exports.migrateConfigToMonorepoStyle = migrateConfigToMonorepoStyle;
 function findLintTarget(project) {

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

@@ -82,7 +82,8 @@ async function lintProjectGeneratorInternal(tree, options) {
                     filteredProjects.push(project);
                 }
             });
-            (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner, options.keepExistingVersions);
+            const migrateTask = (0, init_migration_1.migrateConfigToMonorepoStyle)(filteredProjects, tree, options.unitTestRunner, options.keepExistingVersions);
+            tasks.push(migrateTask);
         }
     }
     // our root `.eslintrc` is already the project config, so we should not override it