@nx/eslint 19.4.0-canary.20240621-472459d → 19.4.0-canary.20240622-963f753

package/package.json

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

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

@@ -6,6 +6,7 @@ const plugin_1 = require("../../plugins/plugin");
 const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
 const target_options_map_1 = require("./lib/target-options-map");
 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);
@@ -19,7 +20,7 @@ async function convertToInferred(tree, options) {
     }
 }
 exports.convertToInferred = convertToInferred;
-function postTargetTransformer(target, tree, projectDetails) {
+function postTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
     if (target.inputs) {
         const inputs = target.inputs.filter((input) => typeof input === 'string' &&
             ![
@@ -33,48 +34,75 @@ function postTargetTransformer(target, tree, projectDetails) {
         }
     }
     if (target.options) {
-        if ('eslintConfig' in target.options) {
-            delete target.options.eslintConfig;
-        }
-        if ('force' in target.options) {
-            delete target.options.force;
-        }
-        if ('silent' in target.options) {
-            delete target.options.silent;
-        }
-        if ('hasTypeAwareRules' in target.options) {
-            delete target.options.hasTypeAwareRules;
+        handlePropertiesInOptions(target.options, projectDetails, target);
+    }
+    if (target.configurations) {
+        for (const configurationName in target.configurations) {
+            const configuration = target.configurations[configurationName];
+            handlePropertiesInOptions(configuration, projectDetails, target);
         }
-        if ('errorOnUnmatchedPattern' in target.options) {
-            if (!target.options.errorOnUnmatchedPattern) {
-                target.options['no-error-on-unmatched-pattern'] = true;
+        if (Object.keys(target.configurations).length !== 0) {
+            for (const configuration in target.configurations) {
+                if (Object.keys(target.configurations[configuration]).length === 0) {
+                    delete target.configurations[configuration];
+                }
+            }
+            if (Object.keys(target.configurations).length === 0) {
+                delete target.configurations;
             }
-            delete target.options.errorOnUnmatchedPattern;
         }
-        if ('outputFile' in target.options) {
-            target.outputs ??= [];
-            target.outputs.push(target.options.outputFile);
+    }
+    if (target.outputs) {
+        (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+            projectName: projectDetails.projectName,
+            projectRoot: projectDetails.root,
+        });
+    }
+    return target;
+}
+function handlePropertiesInOptions(options, projectDetails, target) {
+    if ('eslintConfig' in options) {
+        options.config = (0, plugin_migration_utils_1.toProjectRelativePath)(options.eslintConfig, projectDetails.root);
+        delete options.eslintConfig;
+    }
+    if ('force' in options) {
+        delete options.force;
+    }
+    if ('silent' in options) {
+        delete options.silent;
+    }
+    if ('hasTypeAwareRules' in options) {
+        delete options.hasTypeAwareRules;
+    }
+    if ('errorOnUnmatchedPattern' in options) {
+        if (!options.errorOnUnmatchedPattern) {
+            options['no-error-on-unmatched-pattern'] = true;
         }
-        for (const key in target_options_map_1.targetOptionsToCliMap) {
-            if (target.options[key]) {
-                target.options[target_options_map_1.targetOptionsToCliMap[key]] = target.options[key];
-                delete target.options[key];
-            }
+        delete options.errorOnUnmatchedPattern;
+    }
+    if ('outputFile' in options) {
+        target.outputs ??= [];
+        target.outputs.push(options.outputFile);
+    }
+    for (const key in target_options_map_1.targetOptionsToCliMap) {
+        if (options[key]) {
+            const prevValue = options[key];
+            delete options[key];
+            options[target_options_map_1.targetOptionsToCliMap[key]] = prevValue;
         }
-        if ('lintFilePatterns' in target.options) {
-            const normalizedLintFilePatterns = target.options.lintFilePatterns.map((pattern) => {
-                return (0, utils_1.interpolate)(pattern, {
-                    workspaceRoot: '',
-                    projectRoot: projectDetails.root,
-                    projectName: projectDetails.projectName,
-                });
+    }
+    if ('lintFilePatterns' in options) {
+        const normalizedLintFilePatterns = options.lintFilePatterns.map((pattern) => {
+            return (0, utils_1.interpolate)(pattern, {
+                workspaceRoot: '',
+                projectRoot: projectDetails.root,
+                projectName: projectDetails.projectName,
             });
-            target.options.args = normalizedLintFilePatterns.map((pattern) => pattern.startsWith(projectDetails.root)
-                ? pattern.replace(new RegExp(`^${projectDetails.root}/`), './')
-                : pattern);
-            delete target.options.lintFilePatterns;
-        }
+        });
+        options.args = normalizedLintFilePatterns.map((pattern) => pattern.startsWith(projectDetails.root)
+            ? pattern.replace(new RegExp(`^${projectDetails.root}/`), './')
+            : pattern);
+        delete options.lintFilePatterns;
     }
-    return target;
 }
 exports.default = convertToInferred;