@nx/eslint 19.1.0-canary.20240510-1a85787 → 19.1.0-canary.20240514-cc9b7f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.1.0-canary.20240510-1a85787",
+  "version": "19.1.0-canary.20240514-cc9b7f3",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -33,12 +33,12 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.1.0-canary.20240510-1a85787",
-    "@nx/js": "19.1.0-canary.20240510-1a85787",
+    "@nx/devkit": "19.1.0-canary.20240514-cc9b7f3",
+    "@nx/js": "19.1.0-canary.20240514-cc9b7f3",
     "eslint": "^8.0.0",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.1.0-canary.20240510-1a85787"
+    "@nx/linter": "19.1.0-canary.20240514-cc9b7f3"
   },
   "peerDependenciesMeta": {
     "js-yaml": {

package/src/generators/init/init.js

@@ -38,7 +38,6 @@ async function initEsLint(tree, options) {
     options.addPlugin ??= addPluginDefault;
     const hasPlugin = (0, plugin_2.hasEslintPlugin)(tree);
     const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
     const lintTargetNames = [
         'lint',
         'eslint:lint',
@@ -48,7 +47,7 @@ async function initEsLint(tree, options) {
         '_eslint-lint',
     ];
     if (rootEslintFile && options.addPlugin && !hasPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
+        await (0, add_plugin_1.addPlugin)(tree, '@nx/eslint/plugin', plugin_1.createNodes, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
         return () => { };
@@ -58,7 +57,7 @@ async function initEsLint(tree, options) {
     }
     updateProductionFileset(tree);
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
+        await (0, add_plugin_1.addPlugin)(tree, '@nx/eslint/plugin', plugin_1.createNodes, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
     }

package/src/generators/lint-project/lint-project.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Linter as LinterEnum } from '../utils/linter';
 interface LintProjectOptions {
     project: string;

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

@@ -73,7 +73,8 @@ async function lintProjectGeneratorInternal(tree, options) {
     if (!options.rootProject) {
         const projects = {};
         (0, project_configuration_1.getProjects)(tree).forEach((v, k) => (projects[k] = v));
-        if (isMigrationToMonorepoNeeded(projects, tree)) {
+        const graph = await (0, devkit_1.createProjectGraphAsync)();
+        if (isMigrationToMonorepoNeeded(tree, graph)) {
             // we only migrate project configurations that have been created
             const filteredProjects = [];
             Object.entries(projects).forEach(([name, project]) => {
@@ -198,30 +199,24 @@ function isBuildableLibraryProject(projectConfig) {
  * Detect based on the state of lint target configuration of the root project
  * if we should migrate eslint configs to monorepo style
  */
-function isMigrationToMonorepoNeeded(projects, tree) {
+function isMigrationToMonorepoNeeded(tree, graph) {
     // the base config is already created, migration has been done
     if (tree.exists(config_file_1.baseEsLintConfigFile) ||
         tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
         return false;
     }
-    const configs = Object.values(projects);
-    if (configs.length === 1) {
-        return false;
-    }
+    const nodes = Object.values(graph.nodes);
     // get root project
-    const rootProject = configs.find((p) => p.root === '.');
-    if (!rootProject || !rootProject.targets) {
+    const rootProject = nodes.find((p) => p.data.root === '.');
+    if (!rootProject || !rootProject.data.targets) {
         return false;
     }
-    // check if we're inferring lint target from `@nx/eslint/plugin`
-    if ((0, plugin_1.hasEslintPlugin)(tree)) {
-        for (const f of config_file_1.ESLINT_CONFIG_FILENAMES) {
-            if (tree.exists(f)) {
-                return true;
-            }
+    for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
+        if (['@nx/eslint:lint', '@nrwl/linter:eslint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
+            (targetConfig.executor === 'nx:run-commands' &&
+                targetConfig.options?.command.startsWith('eslint '))) {
+            return true;
         }
     }
-    // find if root project has lint target
-    const lintTarget = (0, init_migration_1.findLintTarget)(rootProject);
-    return !!lintTarget;
+    return false;
 }

package/src/generators/utils/flat-config/ast-utils.js

@@ -4,6 +4,11 @@ exports.generateAst = exports.mapFilePaths = exports.generateFlatOverride = expo
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
 const path_utils_1 = require("./path-utils");
+/**
+ * Supports direct identifiers, and those nested within an object (of arbitrary depth)
+ * E.g. `...foo` and `...foo.bar.baz.qux` etc
+ */
+const SPREAD_ELEMENTS_REGEXP = /\s*\.\.\.[a-zA-Z0-9_]+(\.[a-zA-Z0-9_]+)*,?\n?/g;
 /**
  * Remove all overrides from the config file
  */
@@ -58,11 +63,13 @@ function hasOverride(content, lookup) {
             let objSource;
             if (ts.isObjectLiteralExpression(node)) {
                 objSource = node.getFullText();
+                // strip any spread elements
+                objSource = objSource.replace(SPREAD_ELEMENTS_REGEXP, '');
             }
             else {
                 const fullNodeText = node['expression'].arguments[0].body.expression.getFullText();
                 // strip any spread elements
-                objSource = fullNodeText.replace(/\s*\.\.\.[a-zA-Z0-9_]+,?\n?/, '');
+                objSource = fullNodeText.replace(SPREAD_ELEMENTS_REGEXP, '');
             }
             const data = (0, devkit_1.parseJson)(objSource
                 // ensure property names have double quotes so that JSON.parse works
@@ -76,7 +83,6 @@ function hasOverride(content, lookup) {
     return false;
 }
 exports.hasOverride = hasOverride;
-const STRIP_SPREAD_ELEMENTS = /\s*\.\.\.[a-zA-Z0-9_]+,?\n?/g;
 function parseTextToJson(text) {
     return (0, devkit_1.parseJson)(text
         // ensure property names have double quotes so that JSON.parse works
@@ -105,7 +111,7 @@ function replaceOverride(content, root, lookup, update) {
             else {
                 const fullNodeText = node['expression'].arguments[0].body.expression.getFullText();
                 // strip any spread elements
-                objSource = fullNodeText.replace(STRIP_SPREAD_ELEMENTS, '');
+                objSource = fullNodeText.replace(SPREAD_ELEMENTS_REGEXP, '');
                 start =
                     node['expression'].arguments[0].body.expression.properties.pos +
                         (fullNodeText.length - objSource.length);
@@ -283,7 +289,7 @@ function removePlugin(content, pluginName, pluginImport) {
                         const pluginsArray = pluginsElem.initializer;
                         const plugins = parseTextToJson(pluginsElem.initializer
                             .getText()
-                            .replace(STRIP_SPREAD_ELEMENTS, ''));
+                            .replace(SPREAD_ELEMENTS_REGEXP, ''));
                         if (plugins.length > 1) {
                             changes.push({
                                 type: devkit_1.ChangeType.Delete,
@@ -504,7 +510,7 @@ function generateFlatOverride(override) {
         !override.parser) {
         if (override.parserOptions) {
             const { parserOptions, ...rest } = override;
-            return generateAst({ ...rest, languageSettings: { parserOptions } });
+            return generateAst({ ...rest, languageOptions: { parserOptions } });
         }
         return generateAst(override);
     }
@@ -525,7 +531,7 @@ function generateFlatOverride(override) {
     ];
     objectLiteralElements.push(ts.factory.createPropertyAssignment('rules', ts.factory.createObjectLiteralExpression(updatedRulesProperties, true)));
     if (parserOptions) {
-        addTSObjectProperty(objectLiteralElements, 'languageSettings', {
+        addTSObjectProperty(objectLiteralElements, 'languageOptions', {
             parserOptions,
         });
     }