@nx/eslint 17.3.0-canary.20231212-99ec7d8 → 17.3.0-canary.20231214-dc03c37

package/migrations.json

@@ -114,6 +114,20 @@
           "version": "~8.48.0"
         }
       }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.0",
+      "packages": {
+        "@typescript-eslint/parser": {
+          "version": "^6.13.2"
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^6.13.2"
+        },
+        "@typescript-eslint/utils": {
+          "version": "^6.13.2"
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.3.0-canary.20231212-99ec7d8",
+  "version": "17.3.0-canary.20231214-dc03c37",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -34,11 +34,11 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-canary.20231212-99ec7d8",
-    "@nx/js": "17.3.0-canary.20231212-99ec7d8",
+    "@nx/devkit": "17.3.0-canary.20231214-dc03c37",
+    "@nx/js": "17.3.0-canary.20231214-dc03c37",
     "tslib": "^2.3.0",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.3.0-canary.20231212-99ec7d8"
+    "@nx/linter": "17.3.0-canary.20231214-dc03c37"
   },
   "peerDependenciesMeta": {
     "eslint": {

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

@@ -93,6 +93,10 @@ const getGlobalFlatEslintConfiguration = (unitTestRunner, rootProject) => {
     if (unitTestRunner === 'jest') {
         content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)(jestOverride));
     }
+    // add ignore for .nx folder
+    content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateAst)({
+        ignores: ['.nx'],
+    }));
     return content;
 };
 exports.getGlobalFlatEslintConfiguration = getGlobalFlatEslintConfiguration;

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

@@ -9,24 +9,44 @@ const flat_config_1 = require("../../utils/flat-config");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner) {
-    if ((0, flat_config_1.useFlatConfig)(tree)) {
-        // we need this for the compat
-        (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@eslint/js': versions_1.eslintVersion,
-        });
-        tree.write('eslint.base.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(unitTestRunner));
+    const rootEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
+    let skipCleanup = false;
+    if (rootEslintConfig?.match(/\.base\./) &&
+        !projects.some((p) => p.root === '.')) {
+        // if the migration has been run already, we need to rename the base config
+        // and only update the extends paths
+        tree.rename(rootEslintConfig, rootEslintConfig.replace('.base.', '.'));
+        skipCleanup = true;
     }
     else {
-        (0, devkit_1.writeJson)(tree, '.eslintrc.base.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(unitTestRunner));
+        if ((0, flat_config_1.useFlatConfig)(tree)) {
+            // we need this for the compat
+            (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                '@eslint/js': versions_1.eslintVersion,
+            });
+            tree.write(tree.exists('eslint.config.js')
+                ? 'eslint.base.config.js'
+                : 'eslint.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(unitTestRunner));
+        }
+        else {
+            const eslintFile = (0, eslint_file_1.findEslintFile)(tree, '.');
+            (0, devkit_1.writeJson)(tree, eslintFile ? '.eslintrc.base.json' : '.eslintrc.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(unitTestRunner));
+        }
     }
-    // update extens in all projects' eslint configs
+    // update extends in all projects' eslint configs
     projects.forEach((project) => {
         const lintTarget = findLintTarget(project);
         if (lintTarget) {
             const eslintFile = lintTarget.options?.eslintConfig || (0, eslint_file_1.findEslintFile)(tree, project.root);
             if (eslintFile) {
                 const projectEslintPath = (0, devkit_1.joinPathFragments)(project.root, eslintFile);
-                migrateEslintFile(projectEslintPath, tree);
+                if (skipCleanup) {
+                    const content = tree.read(projectEslintPath, 'utf-8');
+                    tree.write(projectEslintPath, content.replace(rootEslintConfig, rootEslintConfig.replace('.base.', '.')));
+                }
+                else {
+                    migrateEslintFile(projectEslintPath, tree);
+                }
             }
         }
     });
@@ -39,13 +59,14 @@ function findLintTarget(project) {
 }
 exports.findLintTarget = findLintTarget;
 function migrateEslintFile(projectEslintPath, tree) {
+    const baseFile = (0, eslint_file_1.findEslintFile)(tree);
     if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {
         if ((0, flat_config_1.useFlatConfig)(tree)) {
             let config = tree.read(projectEslintPath, 'utf-8');
             // remove @nx plugin
             config = (0, ast_utils_1.removePlugin)(config, '@nx', '@nx/eslint-plugin-nx');
             // extend eslint.base.config.js
-            config = (0, ast_utils_1.addImportToFlatConfig)(config, 'baseConfig', `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}eslint.base.config.js`);
+            config = (0, ast_utils_1.addImportToFlatConfig)(config, 'baseConfig', `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}${baseFile}`);
             config = (0, ast_utils_1.addBlockToFlatConfigExport)(config, (0, ast_utils_1.generateSpreadElement)('baseConfig'), { insertAtTheEnd: false });
             // cleanup file extends
             config = (0, ast_utils_1.removeCompatExtends)(config, [
@@ -69,7 +90,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                 }
                 // add extends
                 json.extends = json.extends || [];
-                const pathToRootConfig = `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}.eslintrc.base.json`;
+                const pathToRootConfig = `${(0, devkit_1.offsetFromRoot)((0, path_1.dirname)(projectEslintPath))}${baseFile}`;
                 if (json.extends.indexOf(pathToRootConfig) === -1) {
                     json.extends.push(pathToRootConfig);
                 }

package/src/generators/utils/eslint-file.d.ts

@@ -1,5 +1,5 @@
-import { Tree } from '@nx/devkit';
-import { Linter } from 'eslint';
+import type { Tree } from '@nx/devkit';
+import type { Linter } from 'eslint';
 export declare function findEslintFile(tree: Tree, projectRoot?: string): string | null;
 export declare function isEslintConfigSupported(tree: Tree, projectRoot?: string): boolean;
 export declare function updateRelativePathsInConfig(tree: Tree, sourcePath: string, destinationPath: string): void;

package/src/utils/versions.d.ts

@@ -2,4 +2,4 @@ export declare const nxVersion: any;
 export declare const eslintVersion = "~8.48.0";
 export declare const eslintrcVersion = "^2.1.1";
 export declare const eslintConfigPrettierVersion = "^9.0.0";
-export declare const typescriptESLintVersion = "^6.9.1";
+export declare const typescriptESLintVersion = "^6.13.2";

package/src/utils/versions.js

@@ -5,4 +5,4 @@ exports.nxVersion = require('../../package.json').version;
 exports.eslintVersion = '~8.48.0';
 exports.eslintrcVersion = '^2.1.1';
 exports.eslintConfigPrettierVersion = '^9.0.0';
-exports.typescriptESLintVersion = '^6.9.1';
+exports.typescriptESLintVersion = '^6.13.2';