@nx/eslint 20.1.0-canary.20241029-4b70d1b → 20.1.0-canary.20241031-ce05a98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.1.0-canary.20241029-4b70d1b",
+  "version": "20.1.0-canary.20241031-ce05a98",
   "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,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.1.0-canary.20241029-4b70d1b",
-    "@nx/js": "20.1.0-canary.20241029-4b70d1b",
+    "@nx/devkit": "20.1.0-canary.20241031-ce05a98",
+    "@nx/js": "20.1.0-canary.20241031-ce05a98",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2"

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

@@ -71,8 +71,7 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExisti
 }
 function findLintTarget(project) {
     return Object.values(project.targets ?? {}).find((target) => target.executor === '@nx/eslint:lint' ||
-        target.executor === '@nx/linter:eslint' ||
-        target.executor === '@nrwl/linter:eslint');
+        target.executor === '@nx/linter:eslint');
 }
 function migrateEslintFile(projectEslintPath, tree) {
     const baseFile = (0, eslint_file_1.findEslintFile)(tree);
@@ -88,8 +87,6 @@ function migrateEslintFile(projectEslintPath, tree) {
             config = (0, ast_utils_1.removeCompatExtends)(config, [
                 'plugin:@nx/typescript',
                 'plugin:@nx/javascript',
-                'plugin:@nrwl/typescript',
-                'plugin:@nrwl/javascript',
             ]);
             config = (0, ast_utils_1.removePredefinedConfigs)(config, '@nx/eslint-plugin', 'nx', [
                 'flat/base',
@@ -104,7 +101,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                 delete json.root;
                 // remove nrwl/nx plugins
                 if (json.plugins) {
-                    json.plugins = json.plugins.filter((p) => p !== '@nx' && p !== '@nrwl/nx');
+                    json.plugins = json.plugins.filter((p) => p !== '@nx');
                     if (json.plugins.length === 0) {
                         delete json.plugins;
                     }
@@ -124,9 +121,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                     json.overrides.forEach((override) => {
                         if (override.extends) {
                             override.extends = override.extends.filter((ext) => ext !== 'plugin:@nx/typescript' &&
-                                ext !== 'plugin:@nrwl/nx/typescript' &&
-                                ext !== 'plugin:@nx/javascript' &&
-                                ext !== 'plugin:@nrwl/nx/javascript');
+                                ext !== 'plugin:@nx/javascript');
                             if (override.extends.length === 0) {
                                 delete override.extends;
                             }

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

@@ -184,7 +184,8 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
         });
         const nodeList = (0, ast_utils_1.createNodeList)(importMap, nodes);
         const content = (0, ast_utils_1.stringifyNodeList)(nodeList);
-        tree.write((0, path_1.join)(projectConfig.root, 'eslint.config.js'), content);
+        const ext = extendedRootConfig?.endsWith('.cjs') ? '.cjs' : '.js';
+        tree.write((0, path_1.join)(projectConfig.root, `eslint.config${ext}`), content);
     }
     else {
         (0, devkit_1.writeJson)(tree, (0, path_1.join)(projectConfig.root, `.eslintrc.json`), {
@@ -223,7 +224,7 @@ function isMigrationToMonorepoNeeded(tree, graph) {
         return false;
     }
     for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
-        if (['@nx/eslint:lint', '@nrwl/linter:eslint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
+        if (['@nx/eslint:lint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
             (targetConfig.executor === 'nx:run-commands' &&
                 targetConfig.options?.command &&
                 targetConfig.options?.command.startsWith('eslint '))) {

package/src/generators/utils/eslint-file.js

@@ -40,7 +40,9 @@ function isEslintConfigSupported(tree, projectRoot = '') {
     if (!eslintFile) {
         return false;
     }
-    return eslintFile.endsWith('.json') || eslintFile.endsWith('.config.js');
+    return (eslintFile.endsWith('.json') ||
+        eslintFile.endsWith('.config.js') ||
+        eslintFile.endsWith('.config.cjs'));
 }
 function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
     if (sourcePath === destinationPath ||