@nx/eslint 0.0.0-pr-31231-180f614 → 0.0.0-pr-31222-862e973

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2025 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -9,7 +9,7 @@
 
 [![CircleCI](https://circleci.com/gh/nrwl/nx.svg?style=svg)](https://circleci.com/gh/nrwl/nx)
 [![License](https://img.shields.io/npm/l/@nx/workspace.svg?style=flat-square)]()
-[![NPM Version](https://badge.fury.io/js/nx.svg)](https://www.npmjs.com/package/nx)
+[![NPM Version](https://badge.fury.io/js/%40nrwl%2Fworkspace.svg)](https://www.npmjs.com/@nx/workspace)
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)]()
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join the chat at https://gitter.im/nrwl-nx/community](https://badges.gitter.im/nrwl-nx/community.svg)](https://gitter.im/nrwl-nx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

package/migrations.json

@@ -1,112 +1,155 @@
 {
   "generators": {
-    "update-typescript-eslint-v8.13.0": {
-      "version": "20.2.0-beta.5",
-      "description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
-      "implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0"
+    "update-16-0-0-add-nx-packages": {
+      "cli": "nx",
+      "version": "16.0.0-beta.1",
+      "description": "Replace @nrwl/linter with @nx/linter",
+      "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
     },
-    "add-file-extensions-to-overrides": {
-      "version": "20.3.0-beta.1",
-      "description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
-      "implementation": "./src/migrations/update-20-3-0/add-file-extensions-to-overrides"
+    "update-16-8-0-add-ignored-files": {
+      "version": "16.8.0",
+      "description": "update-16-8-0-add-ignored-files",
+      "implementation": "./src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files"
+    },
+    "update-17-0-0-rename-to-eslint": {
+      "version": "17.0.0-beta.7",
+      "description": "update-17-0-0-rename-to-eslint",
+      "implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint"
+    },
+    "update-typescript-eslint": {
+      "version": "17.1.0-beta.1",
+      "description": "Updates for @typescript-utils/utils v6.9.1+",
+      "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint"
+    },
+    "simplify-eslint-patterns": {
+      "version": "17.2.0-beta.0",
+      "description": "Simplify eslintFilePatterns",
+      "implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns"
+    },
+    "move-options-to-target-defaults": {
+      "version": "17.2.9",
+      "description": "Move executor options to target defaults",
+      "implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults"
     }
   },
   "packageJsonUpdates": {
-    "19.5.0": {
-      "version": "19.5.0-beta.1",
+    "16.0.0": {
+      "version": "16.0.0-beta.0",
       "packages": {
         "@typescript-eslint/parser": {
-          "version": "^7.16.0"
+          "version": "^5.58.0"
         },
         "@typescript-eslint/eslint-plugin": {
-          "version": "^7.16.0"
+          "version": "^5.58.0"
         },
         "@typescript-eslint/utils": {
-          "version": "^7.16.0"
-        },
-        "@typescript-eslint/rule-tester": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
+          "version": "^5.58.0"
         }
       }
     },
-    "20.4.0-typescript-eslint": {
-      "version": "20.4.0-beta.1",
-      "requires": {
-        "typescript-eslint": ">8.0.0 <8.19.0"
-      },
+    "16.5.0": {
+      "version": "16.5.0-beta.2",
       "packages": {
-        "typescript-eslint": {
-          "version": "^8.19.0"
+        "@typescript-eslint/parser": {
+          "version": "^5.60.1"
         },
         "@typescript-eslint/eslint-plugin": {
-          "version": "^8.19.0"
-        },
-        "@typescript-eslint/parser": {
-          "version": "^8.19.0"
+          "version": "^5.60.1"
         },
         "@typescript-eslint/utils": {
-          "version": "^8.19.0"
+          "version": "^5.60.1"
+        }
+      }
+    },
+    "16.7.0": {
+      "version": "16.7.0-beta.2",
+      "packages": {
+        "eslint": {
+          "version": "~8.46.0"
         },
-        "@typescript-eslint/rule-tester": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "@typescript-eslint/parser": {
+          "version": "^5.60.1"
         },
-        "@typescript-eslint/scope-manager": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^5.60.1"
         },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "@typescript-eslint/utils": {
+          "version": "^5.60.1"
         }
       }
     },
-    "20.4.0-@typescript-eslint": {
-      "version": "20.4.0-beta.1",
-      "requires": {
-        "@typescript-eslint/eslint-plugin": ">8.0.0 <8.19.0"
-      },
+    "17.0.0": {
+      "version": "17.0.0-rc.2",
       "packages": {
-        "typescript-eslint": {
-          "version": "^8.19.0"
+        "eslint-config-prettier": {
+          "version": "^9.0.0"
+        }
+      }
+    },
+    "17.1.0": {
+      "version": "17.1.0-beta.1",
+      "packages": {
+        "@typescript-eslint/parser": {
+          "version": "^6.9.1"
         },
         "@typescript-eslint/eslint-plugin": {
-          "version": "^8.19.0"
+          "version": "^6.9.1"
         },
+        "@typescript-eslint/utils": {
+          "version": "^6.9.1"
+        }
+      }
+    },
+    "17.2.0": {
+      "version": "17.2.0-beta.2",
+      "packages": {
+        "eslint": {
+          "version": "~8.48.0"
+        }
+      }
+    },
+    "17.3.0": {
+      "version": "17.3.0-beta.0",
+      "packages": {
         "@typescript-eslint/parser": {
-          "version": "^8.19.0"
+          "version": "^6.13.2"
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^6.13.2"
         },
         "@typescript-eslint/utils": {
-          "version": "^8.19.0"
+          "version": "^6.13.2"
+        }
+      }
+    },
+    "18.2.0": {
+      "version": "18.2.0-beta.0",
+      "packages": {
+        "@typescript-eslint/parser": {
+          "version": "^7.3.0"
         },
-        "@typescript-eslint/rule-tester": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^7.3.0"
         },
-        "@typescript-eslint/scope-manager": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "@typescript-eslint/utils": {
+          "version": "^7.3.0"
         },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
+        "eslint": {
+          "version": "~8.57.0"
         }
       }
     },
-    "20.7.0": {
-      "version": "20.7.0-beta.4",
+    "19.5.0": {
+      "version": "19.5.0-beta.1",
       "packages": {
-        "eslint-config-prettier": {
-          "version": "^10.0.0"
+        "@typescript-eslint/parser": {
+          "version": "^7.16.0"
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^7.16.0"
+        },
+        "@typescript-eslint/utils": {
+          "version": "^7.16.0"
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-31231-180f614",
+  "version": "0.0.0-pr-31222-862e973",
   "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,11 +35,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "0.0.0-pr-31231-180f614",
-    "@nx/js": "0.0.0-pr-31231-180f614",
+    "@nx/devkit": "0.0.0-pr-31222-862e973",
+    "@nx/js": "0.0.0-pr-31222-862e973",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "typescript": "~5.7.2"
+    "typescript": "~5.4.2",
+    "@nx/linter": "0.0.0-pr-31222-862e973"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {
@@ -49,6 +50,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "types": "./index.d.ts",
-  "type": "commonjs"
+  "type": "commonjs",
+  "types": "./index.d.ts"
 }

package/src/executors/lint/utility/eslint-utils.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAndInstantiateESLint = resolveAndInstantiateESLint;
-const semver_1 = require("semver");
 const config_file_1 = require("../../../utils/config-file");
 const resolve_eslint_class_1 = require("../../../utils/resolve-eslint-class");
 async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatConfig = false) {
@@ -13,7 +12,6 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
         useFlatConfigOverrideVal: useFlatConfig,
     });
-    // ruleFilter exist only in eslint 9+, remove this type when eslint 8 support dropped
     const eslintOptions = {
         overrideConfigFile: eslintConfigPath,
         fix: !!options.fix,
@@ -59,10 +57,6 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
         eslintOptions.reportUnusedDisableDirectives =
             options.reportUnusedDisableDirectives || undefined;
     }
-    // pass --quiet to eslint 9+ directly: filter only errors
-    if (options.quiet && (0, semver_1.gte)(ESLint.version, '9.0.0')) {
-        eslintOptions.ruleFilter = (rule) => rule.severity === 2;
-    }
     const eslint = new ESLint(eslintOptions);
     return {
         ESLint,

package/src/generators/convert-to-flat-config/converters/json-converter.d.ts

@@ -4,7 +4,7 @@ import { ESLint } from 'eslint';
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, config: ESLint.ConfigData, ignorePaths: string[], format: 'cjs' | 'mjs'): {
+export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, config: ESLint.ConfigData, ignorePaths: string[]): {
     content: string;
     addESLintRC: boolean;
     addESLintJS: boolean;

package/src/generators/convert-to-flat-config/converters/json-converter.js

@@ -10,19 +10,15 @@ const path_utils_1 = require("../../utils/flat-config/path-utils");
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format) {
+function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths) {
     const importsMap = new Map();
     const exportElements = [];
     let isFlatCompatNeeded = false;
     let isESLintJSNeeded = false;
     let combinedConfig = [];
     let languageOptions = [];
-    // exclude dist and eslint config from being linted, which matches the default for new workspaces
-    exportElements.push((0, ast_utils_1.generateAst)({
-        ignores: ['**/dist'],
-    }));
     if (config.extends) {
-        const extendsResult = addExtends(importsMap, exportElements, config, format);
+        const extendsResult = addExtends(importsMap, exportElements, config);
         isFlatCompatNeeded = extendsResult.isFlatCompatNeeded;
         isESLintJSNeeded = extendsResult.isESLintJSNeeded;
     }
@@ -74,7 +70,19 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
                 override.parser) {
                 isFlatCompatNeeded = true;
             }
-            exportElements.push((0, ast_utils_1.generateFlatOverride)(override, format));
+            exportElements.push((0, ast_utils_1.generateFlatOverride)(override));
+            // eslint-plugin-import cannot be used with ESLint v9 yet
+            // TODO(jack): Once v9 support is released, remove this block.
+            // See: https://github.com/import-js/eslint-plugin-import/pull/2996
+            if (override.extends === 'plugin:@nx/react') {
+                exportElements.push((0, ast_utils_1.generateFlatOverride)({
+                    rules: {
+                        'import/first': 'off',
+                        'import/no-amd': 'off',
+                        'import/no-webpack-loader-syntax': 'off',
+                    },
+                }));
+            }
         });
     }
     if (config.ignorePatterns) {
@@ -100,7 +108,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
         }
     }
     // create the node list and print it to new file
-    const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements, format);
+    const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements);
     let content = (0, ast_utils_1.stringifyNodeList)(nodeList);
     if (isFlatCompatNeeded) {
         content = (0, ast_utils_1.addFlatCompatToFlatConfig)(content);
@@ -112,7 +120,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
     };
 }
 // add parsed extends to export blocks and add import statements
-function addExtends(importsMap, configBlocks, config, format) {
+function addExtends(importsMap, configBlocks, config) {
     let isFlatCompatNeeded = false;
     let isESLintJSNeeded = false;
     const extendsConfig = Array.isArray(config.extends)
@@ -126,7 +134,7 @@ function addExtends(importsMap, configBlocks, config, format) {
         if (imp.match(/\.eslintrc(.base)?\.json$/)) {
             const localName = index ? `baseConfig${index}` : 'baseConfig';
             configBlocks.push((0, ast_utils_1.generateSpreadElement)(localName));
-            const newImport = imp.replace(/^(.*)\.eslintrc(.base)?\.json$/, `$1eslint$2.config.${format}`);
+            const newImport = imp.replace(/^(.*)\.eslintrc(.base)?\.json$/, '$1eslint$2.config.js');
             importsMap.set(newImport, localName);
         }
         else {

package/src/generators/convert-to-flat-config/generator.js

@@ -14,21 +14,20 @@ async function convertToFlatConfigGenerator(tree, options) {
     if (eslintFile.endsWith('.js')) {
         throw new Error('Only json and yaml eslint config files are supported for conversion');
     }
-    options.eslintConfigFormat ??= 'mjs';
     const eslintIgnoreFiles = new Set(['.eslintignore']);
-    // convert root eslint config to eslint.config.cjs or eslint.base.config.mjs based on eslintConfigFormat
-    convertRootToFlatConfig(tree, eslintFile, options.eslintConfigFormat);
-    // convert project eslint files to eslint.config.cjs
+    // convert root eslint config to eslint.config.js
+    convertRootToFlatConfig(tree, eslintFile);
+    // convert project eslint files to eslint.config.js
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [project, projectConfig] of projects) {
-        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree), eslintIgnoreFiles, options.eslintConfigFormat);
+        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree), eslintIgnoreFiles);
     }
     // delete all .eslintignore files
     for (const ignoreFile of eslintIgnoreFiles) {
         tree.delete(ignoreFile);
     }
     // replace references in nx.json
-    updateNxJsonConfig(tree, options.eslintConfigFormat);
+    updateNxJsonConfig(tree);
     // install missing packages
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -36,13 +35,13 @@ async function convertToFlatConfigGenerator(tree, options) {
     return () => (0, devkit_1.installPackagesTask)(tree);
 }
 exports.default = convertToFlatConfigGenerator;
-function convertRootToFlatConfig(tree, eslintFile, format) {
+function convertRootToFlatConfig(tree, eslintFile) {
     if (/\.base\.(js|json|yml|yaml)$/.test(eslintFile)) {
-        convertConfigToFlatConfig(tree, '', eslintFile, `eslint.base.config.${format}`, format);
+        convertConfigToFlatConfig(tree, '', eslintFile, 'eslint.base.config.js');
     }
-    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), `eslint.config.${format}`, format);
+    convertConfigToFlatConfig(tree, '', eslintFile.replace('.base.', '.'), 'eslint.config.js');
 }
-function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles, format) {
+function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
     if (eslintFile && !eslintFile.endsWith('.js')) {
         if (projectConfig.targets) {
@@ -68,7 +67,7 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
                 ? p === '@nx/eslint/plugin'
                 : p.plugin === '@nx/eslint/plugin');
             if (nxHasEsLintTargets || nxHasEsLintPlugin || eslintTargets.length > 0) {
-                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, `eslint.config.${format}`, format, ignorePath);
+                convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, 'eslint.config.js', ignorePath);
                 eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
                 if (ignorePath) {
                     eslintIgnoreFiles.add(ignorePath);
@@ -79,35 +78,35 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
 }
 // update names of eslint files in nx.json
 // and remove eslintignore
-function updateNxJsonConfig(tree, format) {
+function updateNxJsonConfig(tree) {
     if (tree.exists('nx.json')) {
         (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
             if (json.targetDefaults?.lint?.inputs) {
                 const inputSet = new Set(json.targetDefaults.lint.inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
+                inputSet.add('{workspaceRoot}/eslint.config.js');
                 json.targetDefaults.lint.inputs = Array.from(inputSet);
             }
             if (json.targetDefaults?.['@nx/eslint:lint']?.inputs) {
                 const inputSet = new Set(json.targetDefaults['@nx/eslint:lint'].inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
+                inputSet.add('{workspaceRoot}/eslint.config.js');
                 json.targetDefaults['@nx/eslint:lint'].inputs = Array.from(inputSet);
             }
             if (json.namedInputs?.production) {
                 const inputSet = new Set(json.namedInputs.production);
-                inputSet.add(`!{projectRoot}/eslint.config.${format}`);
+                inputSet.add('!{projectRoot}/eslint.config.js');
                 json.namedInputs.production = Array.from(inputSet);
             }
             return json;
         });
     }
 }
-function convertConfigToFlatConfig(tree, root, source, target, format, ignorePath) {
+function convertConfigToFlatConfig(tree, root, source, target, ignorePath) {
     const ignorePaths = ignorePath
         ? [ignorePath, `${root}/.eslintignore`]
         : [`${root}/.eslintignore`];
     if (source.endsWith('.json')) {
         const config = (0, devkit_1.readJson)(tree, `${root}/${source}`);
-        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths, format);
+        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths);
         return processConvertedConfig(tree, root, source, target, conversionResult);
     }
     if (source.endsWith('.yaml') || source.endsWith('.yml')) {
@@ -117,7 +116,7 @@ function convertConfigToFlatConfig(tree, root, source, target, format, ignorePat
             json: true,
             filename: source,
         });
-        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths, format);
+        const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths);
         return processConvertedConfig(tree, root, source, target, conversionResult);
     }
 }

package/src/generators/convert-to-flat-config/schema.d.ts

@@ -1,5 +1,3 @@
 export interface ConvertToFlatConfigGeneratorSchema {
   skipFormat?: boolean;
-  // Internal option
-  eslintConfigFormat?: 'mjs' | 'cjs';
 }

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

@@ -33,8 +33,7 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
                 'default',
                 '{workspaceRoot}/.eslintrc.json',
                 '{workspaceRoot}/.eslintignore',
-                '{workspaceRoot}/eslint.config.cjs',
-                '{workspaceRoot}/eslint.config.mjs',
+                '{workspaceRoot}/eslint.config.js',
             ].includes(input));
         if (inputs.length === 0) {
             delete target.inputs;

package/src/generators/init/global-eslint-config.d.ts

@@ -26,4 +26,4 @@ export declare const javaScriptOverride: {
     rules: {};
 };
 export declare const getGlobalEsLintConfiguration: (unitTestRunner?: string, rootProject?: boolean) => Linter.Config;
-export declare const getGlobalFlatEslintConfiguration: (format: "cjs" | "mjs", rootProject?: boolean) => string;
+export declare const getGlobalFlatEslintConfiguration: (rootProject?: boolean) => string;

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

@@ -78,16 +78,14 @@ const getGlobalEsLintConfiguration = (unitTestRunner, rootProject) => {
     return config;
 };
 exports.getGlobalEsLintConfiguration = getGlobalEsLintConfiguration;
-const getGlobalFlatEslintConfiguration = (format, rootProject) => {
-    const nodeList = (0, ast_utils_1.createNodeList)(new Map(), [], format);
+const getGlobalFlatEslintConfiguration = (rootProject) => {
+    const nodeList = (0, ast_utils_1.createNodeList)(new Map(), []);
     let content = (0, ast_utils_1.stringifyNodeList)(nodeList);
     content = (0, ast_utils_1.addImportToFlatConfig)(content, 'nx', '@nx/eslint-plugin');
     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'],
-    }, format));
+    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'],
@@ -107,21 +105,12 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
                     },
                 ],
             },
-        }, format));
+        }));
     }
     content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, (0, ast_utils_1.generateFlatOverride)({
-        files: [
-            '**/*.ts',
-            '**/*.tsx',
-            '**/*.cts',
-            '**/*.mts',
-            '**/*.js',
-            '**/*.jsx',
-            '**/*.cjs',
-            '**/*.mjs',
-        ],
+        files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
         rules: {},
-    }, format));
+    }));
     return content;
 };
 exports.getGlobalFlatEslintConfiguration = getGlobalFlatEslintConfiguration;

package/src/generators/init/init-migration.d.ts

@@ -1,3 +1,3 @@
 import { GeneratorCallback, ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
-export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, eslintConfigFormat: 'mjs' | 'cjs', keepExistingVersions?: boolean): GeneratorCallback;
+export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, keepExistingVersions?: boolean): GeneratorCallback;
 export declare function findLintTarget(project: ProjectConfiguration): TargetConfiguration;

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

@@ -11,19 +11,9 @@ const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const plugin_1 = require("../utils/plugin");
 const config_file_1 = require("../../utils/config-file");
-function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConfigFormat, keepExistingVersions) {
+function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExistingVersions) {
     const rootEslintConfig = (0, eslint_file_1.findEslintFile)(tree);
     let skipCleanup = false;
-    if (rootEslintConfig) {
-        // We do not want to mix the formats
-        const fileExtension = (0, path_1.extname)(rootEslintConfig);
-        if (fileExtension === '.mjs' || fileExtension === '.cjs') {
-            eslintConfigFormat = fileExtension.slice(1);
-        }
-        else {
-            eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(rootEslintConfig, 'utf-8'));
-        }
-    }
     if (rootEslintConfig?.match(/\.base\./) &&
         !projects.some((p) => p.root === '.')) {
         // if the migration has been run already, we need to rename the base config
@@ -37,9 +27,9 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
                 '@eslint/js': versions_1.eslintVersion,
             }, undefined, keepExistingVersions);
-            tree.write(tree.exists(`eslint.config.${eslintConfigFormat}`)
-                ? `eslint.base.config.${eslintConfigFormat}`
-                : `eslint.config.${eslintConfigFormat}`, (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(eslintConfigFormat));
+            tree.write(tree.exists('eslint.config.js')
+                ? 'eslint.base.config.js'
+                : 'eslint.config.js', (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)());
         }
         else {
             const eslintFile = (0, eslint_file_1.findEslintFile)(tree, '.');
@@ -81,7 +71,8 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
 }
 function findLintTarget(project) {
     return Object.values(project.targets ?? {}).find((target) => target.executor === '@nx/eslint:lint' ||
-        target.executor === '@nx/linter:eslint');
+        target.executor === '@nx/linter:eslint' ||
+        target.executor === '@nrwl/linter:eslint');
 }
 function migrateEslintFile(projectEslintPath, tree) {
     const baseFile = (0, eslint_file_1.findEslintFile)(tree);
@@ -90,13 +81,15 @@ function migrateEslintFile(projectEslintPath, tree) {
             let config = tree.read(projectEslintPath, 'utf-8');
             // remove @nx plugin
             config = (0, ast_utils_1.removePlugin)(config, '@nx', '@nx/eslint-plugin-nx');
-            // if base config is cjs, we will need to import it using async import
+            // extend 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, [
                 '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',
@@ -111,7 +104,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                 delete json.root;
                 // remove nrwl/nx plugins
                 if (json.plugins) {
-                    json.plugins = json.plugins.filter((p) => p !== '@nx');
+                    json.plugins = json.plugins.filter((p) => p !== '@nx' && p !== '@nrwl/nx');
                     if (json.plugins.length === 0) {
                         delete json.plugins;
                     }
@@ -131,7 +124,9 @@ function migrateEslintFile(projectEslintPath, tree) {
                     json.overrides.forEach((override) => {
                         if (override.extends) {
                             override.extends = override.extends.filter((ext) => ext !== 'plugin:@nx/typescript' &&
-                                ext !== 'plugin:@nx/javascript');
+                                ext !== 'plugin:@nrwl/nx/typescript' &&
+                                ext !== 'plugin:@nx/javascript' &&
+                                ext !== 'plugin:@nrwl/nx/javascript');
                             if (override.extends.length === 0) {
                                 delete override.extends;
                             }