@nx/eslint 20.0.0-canary.20240925-6182d20 → 20.0.0-canary.20240928-f221a41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.0.0-canary.20240925-6182d20",
+  "version": "20.0.0-canary.20240928-f221a41",
   "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,11 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.0-canary.20240925-6182d20",
-    "@nx/js": "20.0.0-canary.20240925-6182d20",
+    "@nx/devkit": "20.0.0-canary.20240928-f221a41",
+    "@nx/js": "20.0.0-canary.20240928-f221a41",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "typescript": "~5.4.2",
-    "@nx/linter": "20.0.0-canary.20240925-6182d20"
+    "typescript": "~5.4.2"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/src/generators/init/global-eslint-config.js

@@ -85,6 +85,7 @@ const getGlobalFlatEslintConfiguration = (rootProject) => {
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/base'), { insertAtTheEnd: false });
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/typescript'));
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatPredefinedConfig)('flat/javascript'));
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({ ignores: ['**/dist'] }));
     if (!rootProject) {
         content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
             files: ['*.ts', '*.tsx', '*.js', '*.jsx'],

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

@@ -49,6 +49,7 @@ async function lintProjectGeneratorInternal(tree, options) {
         if (lintFilePatterns &&
             lintFilePatterns.length &&
             lintFilePatterns.some((p) => !['./src', '{projectRoot}', projectConfig.root].includes(p))) {
+            projectConfig.targets ??= {};
             projectConfig.targets['lint'] = {
                 command: `eslint ${lintFilePatterns
                     .join(' ')
@@ -57,6 +58,7 @@ async function lintProjectGeneratorInternal(tree, options) {
         }
     }
     else {
+        projectConfig.targets ??= {};
         projectConfig.targets['lint'] = {
             executor: '@nx/eslint:lint',
         };

package/src/generators/utils/flat-config/ast-utils.d.ts

@@ -62,9 +62,11 @@ export declare function overrideNeedsCompat(override: Partial<Linter.ConfigOverr
  * Generates an AST object or spread element representing a modern flat config entry,
  * based on a given legacy eslintrc JSON override object
  */
-export declare function generateFlatOverride(_override: Partial<Linter.ConfigOverride<Linter.RulesRecord>>): ts.ObjectLiteralExpression | ts.SpreadElement;
+export declare function generateFlatOverride(_override: Partial<Linter.ConfigOverride<Linter.RulesRecord>> & {
+    ignores?: Linter.FlatConfig['ignores'];
+}): ts.ObjectLiteralExpression | ts.SpreadElement;
 export declare function generateFlatPredefinedConfig(predefinedConfigName: string, moduleName?: string, spread?: boolean): ts.ObjectLiteralExpression | ts.SpreadElement | ts.ElementAccessExpression;
-export declare function mapFilePaths(_override: Partial<Linter.ConfigOverride<Linter.RulesRecord>>): Partial<Linter.ConfigOverride<Linter.RulesRecord>>;
+export declare function mapFilePaths<T extends Partial<Linter.ConfigOverride<Linter.RulesRecord>>>(_override: T): T;
 /**
  * Generates an AST from a JSON-type input
  */

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

@@ -148,12 +148,16 @@ function replaceOverride(content, root, lookup, update) {
                     changes.push({
                         type: devkit_1.ChangeType.Insert,
                         index: start,
-                        text: JSON.stringify(updatedData, null, 2)
-                            // restore any parser require calls that were stripped during JSON parsing
-                            .replace(/"parser": "([^"]+)"/g, (_, parser) => {
-                            return `"parser": require('${parser}')`;
-                        })
-                            .slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
+                        // NOTE: Indentation added to format without formatting tools like Prettier.
+                        text: '    ' +
+                            JSON.stringify(updatedData, null, 2)
+                                // restore any parser require calls that were stripped during JSON parsing
+                                .replace(/"parser": "([^"]+)"/g, (_, parser) => {
+                                return `"parser": require('${parser}')`;
+                            })
+                                .slice(2, -2) // remove curly braces and start/end line breaks since we are injecting just properties
+                                // Append indentation so file is formatted without Prettier
+                                .replaceAll(/\n/g, '\n    '),
                     });
                 }
             }
@@ -282,7 +286,10 @@ function addBlockToFlatConfigExport(content, config, options = {
     // base config was not generated by Nx.
     if (!exportsArray)
         return content;
-    const insert = printer.printNode(ts.EmitHint.Expression, config, source);
+    const insert = '    ' +
+        printer
+            .printNode(ts.EmitHint.Expression, config, source)
+            .replaceAll(/\n/g, '\n    ');
     if (options.insertAtTheEnd) {
         const index = exportsArray.length > 0
             ? exportsArray.at(exportsArray.length - 1).end
@@ -301,7 +308,7 @@ function addBlockToFlatConfigExport(content, config, options = {
             {
                 type: devkit_1.ChangeType.Insert,
                 index,
-                text: `\n${insert},`,
+                text: `\n${insert},\n`,
             },
         ]);
     }
@@ -608,6 +615,9 @@ function generateFlatOverride(_override) {
         const flatConfigOverride = {
             files,
         };
+        if (override.ignores) {
+            flatConfigOverride.ignores = override.ignores;
+        }
         if (override.rules) {
             flatConfigOverride.rules = override.rules;
         }