@nx/eslint 19.5.0-beta.0 → 19.5.0-beta.2

package/migrations.json

@@ -138,6 +138,20 @@
           "version": "~8.57.0"
         }
       }
+    },
+    "19.5.0": {
+      "version": "19.5.0-beta.1",
+      "packages": {
+        "@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": "19.5.0-beta.0",
+  "version": "19.5.0-beta.2",
   "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,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.5.0-beta.0",
-    "@nx/js": "19.5.0-beta.0",
+    "@nx/devkit": "19.5.0-beta.2",
+    "@nx/js": "19.5.0-beta.2",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.5.0-beta.0"
+    "@nx/linter": "19.5.0-beta.2"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/src/executors/lint/hasher.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Hash, ProjectGraph, ProjectsConfigurations, Task, TaskGraph, TaskHasher } from '@nx/devkit';
 export default function run(task: Task, context: {
     hasher: TaskHasher;

package/src/executors/lint/hasher.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = run;
 const devkit_1 = require("@nx/devkit");
 async function run(task, context) {
     const res = await context.hasher.hashTask(task, context.taskGraph, context.env);
@@ -31,7 +32,6 @@ async function run(task, context) {
         },
     };
 }
-exports.default = run;
 function allDeps(taskId, taskGraph, projectGraph) {
     if (!taskGraph.tasks) {
         return [];

package/src/executors/lint/lint.impl.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = run;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const utils_1 = require("nx/src/tasks-runner/utils");
@@ -143,7 +144,6 @@ Please see https://nx.dev/recipes/tips-n-tricks/eslint for full guidance on how
                     totals.warnings <= normalizedOptions.maxWarnings)),
     };
 }
-exports.default = run;
 function getTotals(lintResults) {
     let errors = 0;
     let warnings = 0;

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

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveAndInstantiateESLint = void 0;
+exports.resolveAndInstantiateESLint = resolveAndInstantiateESLint;
 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) {
     if (useFlatConfig && eslintConfigPath && !(0, config_file_1.isFlatConfig)(eslintConfigPath)) {
-        throw new Error('When using the new Flat Config with ESLint, all configs must be named eslint.config.js and .eslintrc files may not be used. See https://eslint.org/docs/latest/use/configure/configuration-files-new');
+        throw new Error(
+        // todo: add support for eslint.config.mjs,
+        'When using the new Flat Config with ESLint, all configs must be named eslint.config.js or eslint.config.cjs and .eslintrc files may not be used. See https://eslint.org/docs/latest/use/configure/configuration-files');
     }
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)(useFlatConfig);
     const eslintOptions = {
@@ -59,4 +61,3 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
         eslint,
     };
 }
-exports.resolveAndInstantiateESLint = resolveAndInstantiateESLint;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertEslintJsonToFlatConfig = void 0;
+exports.convertEslintJsonToFlatConfig = convertEslintJsonToFlatConfig;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
 const ast_utils_1 = require("../../utils/flat-config/ast-utils");
@@ -103,7 +103,6 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths) {
         addESLintJS: isESLintJSNeeded,
     };
 }
-exports.convertEslintJsonToFlatConfig = convertEslintJsonToFlatConfig;
 // add parsed extends to export blocks and add import statements
 function addExtends(importsMap, configBlocks, config) {
     let isFlatCompatNeeded = false;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToFlatConfigGenerator = void 0;
+exports.convertToFlatConfigGenerator = convertToFlatConfigGenerator;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
@@ -37,7 +37,6 @@ async function convertToFlatConfigGenerator(tree, options) {
         return () => (0, devkit_1.installPackagesTask)(tree);
     }
 }
-exports.convertToFlatConfigGenerator = convertToFlatConfigGenerator;
 exports.default = convertToFlatConfigGenerator;
 function convertRootToFlatConfig(tree, eslintFile) {
     if (/\.base\.(js|json|yml|yaml)$/.test(eslintFile)) {

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToInferred = void 0;
+exports.convertToInferred = convertToInferred;
 const devkit_1 = require("@nx/devkit");
 const plugin_1 = require("../../plugins/plugin");
 const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
@@ -23,7 +23,6 @@ async function convertToInferred(tree, options) {
         await (0, devkit_1.formatFiles)(tree);
     }
 }
-exports.convertToInferred = convertToInferred;
 function postTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
     if (target.inputs) {
         const inputs = target.inputs.filter((input) => typeof input === 'string' &&

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findLintTarget = exports.migrateConfigToMonorepoStyle = void 0;
+exports.migrateConfigToMonorepoStyle = migrateConfigToMonorepoStyle;
+exports.findLintTarget = findLintTarget;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const eslint_file_1 = require("../utils/eslint-file");
@@ -68,13 +69,11 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExisti
         '@nx/eslint-plugin': versions_1.nxVersion,
     });
 }
-exports.migrateConfigToMonorepoStyle = migrateConfigToMonorepoStyle;
 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');
 }
-exports.findLintTarget = findLintTarget;
 function migrateEslintFile(projectEslintPath, tree) {
     const baseFile = (0, eslint_file_1.findEslintFile)(tree);
     if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {

package/src/generators/init/init.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintInitGenerator = exports.initEsLint = void 0;
+exports.initEsLint = initEsLint;
+exports.lintInitGenerator = lintInitGenerator;
 const devkit_1 = require("@nx/devkit");
 const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("../../utils/versions");
@@ -75,8 +76,6 @@ async function initEsLint(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.initEsLint = initEsLint;
 async function lintInitGenerator(tree, options) {
     return await initEsLint(tree, { addPlugin: false, ...options });
 }
-exports.lintInitGenerator = lintInitGenerator;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintProjectGeneratorInternal = exports.lintProjectGenerator = void 0;
+exports.lintProjectGenerator = lintProjectGenerator;
+exports.lintProjectGeneratorInternal = lintProjectGeneratorInternal;
 const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
@@ -15,7 +16,6 @@ const setup_root_eslint_1 = require("./setup-root-eslint");
 function lintProjectGenerator(tree, options) {
     return lintProjectGeneratorInternal(tree, { addPlugin: false, ...options });
 }
-exports.lintProjectGenerator = lintProjectGenerator;
 async function lintProjectGeneratorInternal(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -108,7 +108,6 @@ async function lintProjectGeneratorInternal(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.lintProjectGeneratorInternal = lintProjectGeneratorInternal;
 function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject) {
     // we are only extending root for non-standalone projects or their complementary e2e apps
     const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);

package/src/generators/lint-project/setup-root-eslint.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupRootEsLint = void 0;
+exports.setupRootEsLint = setupRootEsLint;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const global_eslint_config_1 = require("../init/global-eslint-config");
@@ -30,4 +30,3 @@ function setupRootEsLint(tree, options) {
         })
         : () => { };
 }
-exports.setupRootEsLint = setupRootEsLint;

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

@@ -1,6 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = void 0;
+exports.findEslintFile = findEslintFile;
+exports.isEslintConfigSupported = isEslintConfigSupported;
+exports.updateRelativePathsInConfig = updateRelativePathsInConfig;
+exports.addOverrideToLintConfig = addOverrideToLintConfig;
+exports.updateOverrideInLintConfig = updateOverrideInLintConfig;
+exports.lintConfigHasOverride = lintConfigHasOverride;
+exports.replaceOverridesInLintConfig = replaceOverridesInLintConfig;
+exports.addExtendsToLintConfig = addExtendsToLintConfig;
+exports.addPluginsToLintConfig = addPluginsToLintConfig;
+exports.addIgnoresToLintConfig = addIgnoresToLintConfig;
+exports.getPluginImport = getPluginImport;
 const devkit_1 = require("@nx/devkit");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("./flat-config/ast-utils");
@@ -21,7 +31,6 @@ function findEslintFile(tree, projectRoot) {
     }
     return null;
 }
-exports.findEslintFile = findEslintFile;
 function isEslintConfigSupported(tree, projectRoot = '') {
     const eslintFile = findEslintFile(tree, projectRoot);
     if (!eslintFile) {
@@ -29,7 +38,6 @@ function isEslintConfigSupported(tree, projectRoot = '') {
     }
     return eslintFile.endsWith('.json') || eslintFile.endsWith('.config.js');
 }
-exports.isEslintConfigSupported = isEslintConfigSupported;
 function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
     if (sourcePath === destinationPath ||
         !isEslintConfigSupported(tree, destinationPath)) {
@@ -60,7 +68,6 @@ function updateRelativePathsInConfig(tree, sourcePath, destinationPath) {
         });
     }
 }
-exports.updateRelativePathsInConfig = updateRelativePathsInConfig;
 function replaceFlatConfigPaths(config, sourceRoot, offset, destinationRoot, tree) {
     let match;
     let newConfig = config;
@@ -103,7 +110,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }) {
     const isBase = options.checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.flatConfigEslintFilename)(tree));
         const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
         let content = tree.read(fileName, 'utf8');
         // we will be using compat here so we need to make sure it's added
@@ -126,13 +133,12 @@ function addOverrideToLintConfig(tree, root, override, options = {
         });
     }
 }
-exports.addOverrideToLintConfig = addOverrideToLintConfig;
 function overrideNeedsCompat(override) {
     return (override.env || override.extends || override.plugins || override.parser);
 }
 function updateOverrideInLintConfig(tree, root, lookup, update) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.flatConfigEslintFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         content = (0, ast_utils_1.replaceOverride)(content, root, lookup, update);
         tree.write(fileName, content);
@@ -161,14 +167,13 @@ function updateOverrideInLintConfig(tree, root, lookup, update) {
         });
     }
 }
-exports.updateOverrideInLintConfig = updateOverrideInLintConfig;
 function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = false) {
     if (!isEslintConfigSupported(tree, root)) {
         return false;
     }
     const isBase = checkBaseConfig && findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.flatConfigEslintFilename)(tree));
         const content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
@@ -177,10 +182,9 @@ function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = false) {
         return (0, devkit_1.readJson)(tree, fileName).overrides?.some(lookup) || false;
     }
 }
-exports.lintConfigHasOverride = lintConfigHasOverride;
 function replaceOverridesInLintConfig(tree, root, overrides) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.flatConfigEslintFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         // we will be using compat here so we need to make sure it's added
         if (overrides.some(overrideNeedsCompat)) {
@@ -201,11 +205,10 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
         });
     }
 }
-exports.replaceOverridesInLintConfig = replaceOverridesInLintConfig;
 function addExtendsToLintConfig(tree, root, plugin) {
     const plugins = Array.isArray(plugin) ? plugin : [plugin];
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.flatConfigEslintFilename)(tree));
         const pluginExtends = (0, ast_utils_1.generatePluginExtendsElement)(plugins);
         let content = tree.read(fileName, 'utf8');
         content = (0, ast_utils_1.addCompatToFlatConfig)(content);
@@ -225,11 +228,10 @@ function addExtendsToLintConfig(tree, root, plugin) {
         });
     }
 }
-exports.addExtendsToLintConfig = addExtendsToLintConfig;
 function addPluginsToLintConfig(tree, root, plugin) {
     const plugins = Array.isArray(plugin) ? plugin : [plugin];
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.flatConfigEslintFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         const mappedPlugins = [];
         plugins.forEach((name) => {
@@ -251,10 +253,9 @@ function addPluginsToLintConfig(tree, root, plugin) {
         });
     }
 }
-exports.addPluginsToLintConfig = addPluginsToLintConfig;
 function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
+        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.flatConfigEslintFilename)(tree));
         const block = (0, ast_utils_1.generateAst)({
             ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
         });
@@ -272,7 +273,6 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
         });
     }
 }
-exports.addIgnoresToLintConfig = addIgnoresToLintConfig;
 function getPluginImport(pluginName) {
     if (pluginName.includes('eslint-plugin-')) {
         return pluginName;
@@ -286,4 +286,3 @@ function getPluginImport(pluginName) {
     const [scope, name] = pluginName.split('/');
     return `${scope}/eslint-plugin-${name}`;
 }
-exports.getPluginImport = getPluginImport;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEslintTargets = void 0;
+exports.getEslintTargets = getEslintTargets;
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 function getEslintTargets(tree) {
     const eslintTargetNames = new Set();
@@ -15,4 +15,3 @@ function getEslintTargets(tree) {
     });
     return eslintTargetNames;
 }
-exports.getEslintTargets = getEslintTargets;

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

@@ -1,6 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateAst = exports.mapFilePaths = exports.generateFlatOverride = exports.generateRequire = exports.stringifyNodeList = exports.generatePluginExtendsElement = exports.generateSpreadElement = exports.createNodeList = exports.addCompatToFlatConfig = exports.addPluginsToExportsBlock = exports.removeCompatExtends = exports.removePlugin = exports.addBlockToFlatConfigExport = exports.addImportToFlatConfig = exports.replaceOverride = exports.hasOverride = exports.removeOverridesFromLintConfig = void 0;
+exports.removeOverridesFromLintConfig = removeOverridesFromLintConfig;
+exports.hasOverride = hasOverride;
+exports.replaceOverride = replaceOverride;
+exports.addImportToFlatConfig = addImportToFlatConfig;
+exports.addBlockToFlatConfigExport = addBlockToFlatConfigExport;
+exports.removePlugin = removePlugin;
+exports.removeCompatExtends = removeCompatExtends;
+exports.addPluginsToExportsBlock = addPluginsToExportsBlock;
+exports.addCompatToFlatConfig = addCompatToFlatConfig;
+exports.createNodeList = createNodeList;
+exports.generateSpreadElement = generateSpreadElement;
+exports.generatePluginExtendsElement = generatePluginExtendsElement;
+exports.stringifyNodeList = stringifyNodeList;
+exports.generateRequire = generateRequire;
+exports.generateFlatOverride = generateFlatOverride;
+exports.mapFilePaths = mapFilePaths;
+exports.generateAst = generateAst;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
 const path_utils_1 = require("./path-utils");
@@ -31,7 +47,6 @@ function removeOverridesFromLintConfig(content) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-exports.removeOverridesFromLintConfig = removeOverridesFromLintConfig;
 function findAllBlocks(source) {
     return ts.forEachChild(source, function analyze(node) {
         if (ts.isExpressionStatement(node) &&
@@ -82,7 +97,6 @@ function hasOverride(content, lookup) {
     }
     return false;
 }
-exports.hasOverride = hasOverride;
 function parseTextToJson(text) {
     return (0, devkit_1.parseJson)(text
         // ensure property names have double quotes so that JSON.parse works
@@ -138,7 +152,6 @@ function replaceOverride(content, root, lookup, update) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-exports.replaceOverride = replaceOverride;
 /**
  * Adding require statement to the top of the file
  */
@@ -213,7 +226,6 @@ function addImportToFlatConfig(content, variable, imp) {
         },
     ]);
 }
-exports.addImportToFlatConfig = addImportToFlatConfig;
 /**
  * Injects new ts.expression to the end of the module.exports array.
  */
@@ -254,7 +266,6 @@ function addBlockToFlatConfigExport(content, config, options = {
         ]);
     }
 }
-exports.addBlockToFlatConfigExport = addBlockToFlatConfigExport;
 function removePlugin(content, pluginName, pluginImport) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
     const changes = [];
@@ -365,7 +376,6 @@ function removePlugin(content, pluginName, pluginImport) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-exports.removePlugin = removePlugin;
 function removeCompatExtends(content, compatExtends) {
     const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
     const changes = [];
@@ -401,7 +411,6 @@ function removeCompatExtends(content, compatExtends) {
     });
     return (0, devkit_1.applyChangesToString)(content, changes);
 }
-exports.removeCompatExtends = removeCompatExtends;
 /**
  * Add plugins block to the top of the export blocks
  */
@@ -415,7 +424,6 @@ function addPluginsToExportsBlock(content, plugins) {
         insertAtTheEnd: false,
     });
 }
-exports.addPluginsToExportsBlock = addPluginsToExportsBlock;
 /**
  * Adds compat if missing to flat config
  */
@@ -435,7 +443,6 @@ function addCompatToFlatConfig(content) {
         },
     ]);
 }
-exports.addCompatToFlatConfig = addCompatToFlatConfig;
 const DEFAULT_FLAT_CONFIG = `
 const compat = new FlatCompat({
       baseDirectory: __dirname,
@@ -467,15 +474,12 @@ function createNodeList(importsMap, exportElements, isFlatCompatNeeded) {
         ts.factory.createExpressionStatement(ts.factory.createBinaryExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('module'), ts.factory.createIdentifier('exports')), ts.factory.createToken(ts.SyntaxKind.EqualsToken), ts.factory.createArrayLiteralExpression(exportElements, true))),
     ]);
 }
-exports.createNodeList = createNodeList;
 function generateSpreadElement(name) {
     return ts.factory.createSpreadElement(ts.factory.createIdentifier(name));
 }
-exports.generateSpreadElement = generateSpreadElement;
 function generatePluginExtendsElement(plugins) {
     return ts.factory.createSpreadElement(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('compat'), ts.factory.createIdentifier('extends')), undefined, plugins.map((plugin) => ts.factory.createStringLiteral(plugin))));
 }
-exports.generatePluginExtendsElement = generatePluginExtendsElement;
 /**
  * Stringifies TS nodes to file content string
  */
@@ -489,7 +493,6 @@ function stringifyNodeList(nodes) {
         // add new line before module.exports = ...
         .replace(/module\.exports/, '\nmodule.exports'));
 }
-exports.stringifyNodeList = stringifyNodeList;
 /**
  * generates AST require statement
  */
@@ -498,7 +501,6 @@ function generateRequire(variableName, imp) {
         ts.factory.createVariableDeclaration(variableName, undefined, undefined, ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [ts.factory.createStringLiteral(imp)])),
     ], ts.NodeFlags.Const));
 }
-exports.generateRequire = generateRequire;
 /**
  * Generates AST object or spread element based on JSON override object
  */
@@ -541,7 +543,6 @@ function generateFlatOverride(override) {
         ], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createParenthesizedExpression(ts.factory.createObjectLiteralExpression(objectLiteralElements, true))),
     ]));
 }
-exports.generateFlatOverride = generateFlatOverride;
 function mapFilePaths(override) {
     if (override.files) {
         override.files = Array.isArray(override.files)
@@ -556,7 +557,6 @@ function mapFilePaths(override) {
         override.excludedFiles = override.excludedFiles.map((file) => (0, path_utils_1.mapFilePath)(file));
     }
 }
-exports.mapFilePaths = mapFilePaths;
 function addTSObjectProperty(elements, key, value) {
     if (value) {
         elements.push(ts.factory.createPropertyAssignment(key, generateAst(value)));
@@ -591,7 +591,6 @@ function generateAst(input) {
     // since we are parsing JSON, this should never happen
     throw new Error(`Unknown type: ${typeof input} `);
 }
-exports.generateAst = generateAst;
 function isValidKey(key) {
     return /^[a-zA-Z0-9_]+$/.test(key);
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapFilePath = exports.updateFiles = void 0;
+exports.updateFiles = updateFiles;
+exports.mapFilePath = mapFilePath;
 const devkit_1 = require("@nx/devkit");
 function updateFiles(override) {
     if (override.files) {
@@ -11,7 +12,6 @@ function updateFiles(override) {
     }
     return override;
 }
-exports.updateFiles = updateFiles;
 function mapFilePath(filePath) {
     if (filePath.startsWith('!')) {
         const fileWithoutBang = filePath.slice(1);
@@ -25,4 +25,3 @@ function mapFilePath(filePath) {
     }
     return filePath;
 }
-exports.mapFilePath = mapFilePath;

package/src/generators/utils/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasEslintPlugin = void 0;
+exports.hasEslintPlugin = hasEslintPlugin;
 const devkit_1 = require("@nx/devkit");
 function hasEslintPlugin(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
@@ -8,4 +8,3 @@ function hasEslintPlugin(tree) {
         ? p === '@nx/eslint/plugin'
         : p.plugin === '@nx/eslint/plugin');
 }
-exports.hasEslintPlugin = hasEslintPlugin;

package/src/generators/workspace-rule/workspace-rule.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintWorkspaceRuleGenerator = void 0;
+exports.lintWorkspaceRuleGenerator = lintWorkspaceRuleGenerator;
 const devkit_1 = require("@nx/devkit");
 const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 const path_1 = require("path");
@@ -75,4 +75,3 @@ async function lintWorkspaceRuleGenerator(tree, options) {
 `);
     return projectGeneratorCallback;
 }
-exports.lintWorkspaceRuleGenerator = lintWorkspaceRuleGenerator;

package/src/generators/workspace-rules-project/workspace-rules-project.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lintWorkspaceRulesProjectGenerator = exports.WORKSPACE_PLUGIN_DIR = exports.WORKSPACE_RULES_PROJECT_NAME = void 0;
+exports.WORKSPACE_PLUGIN_DIR = exports.WORKSPACE_RULES_PROJECT_NAME = void 0;
+exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
@@ -79,4 +80,3 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = replacePackage;
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
 async function replacePackage(tree) {
     await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/linter', '@nx/linter');
     await (0, devkit_1.formatFiles)(tree);
 }
-exports.default = replacePackage;

package/src/migrations/update-16-8-0-add-ignored-files/update-16-8-0-add-ignored-files.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const eslint_file_1 = require("../../generators/utils/eslint-file");
@@ -41,4 +42,3 @@ function update(tree) {
     (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/esbuild:esbuild', addIgnorePattern('{projectRoot}/esbuild.config.{js,ts,mjs,mts}'));
     (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/rollup:rollup', addIgnorePattern('{projectRoot}/rollup.config.{js,ts,mjs,mts}'));
 }
-exports.default = update;

package/src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = replacePackage;
 const devkit_1 = require("@nx/devkit");
 const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
 async function replacePackage(tree) {
@@ -9,7 +10,6 @@ async function replacePackage(tree) {
     updateProjectExecutor(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
-exports.default = replacePackage;
 function updateNxJsonExecutor(tree) {
     if (!tree.exists('nx.json')) {
         return;

package/src/migrations/update-17-1-0/update-typescript-eslint.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
 const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const path_1 = require("path");
@@ -71,4 +72,3 @@ async function update(tree) {
     updateRecommended(tree);
     await (0, devkit_1.formatFiles)(tree);
 }
-exports.default = update;

package/src/migrations/update-17-2-0/simplify-eslint-patterns.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
 const devkit_1 = require("@nx/devkit");
 async function update(tree) {
     const projects = (0, devkit_1.getProjects)(tree);
@@ -37,7 +38,6 @@ async function update(tree) {
     }
     await (0, devkit_1.formatFiles)(tree);
 }
-exports.default = update;
 function getLintRoot({ root, sourceRoot }) {
     if (root === '' || root === '.') {
         return sourceRoot || './src';

package/src/migrations/update-17-2-9/move-options-to-target-defaults.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = update;
 const devkit_1 = require("@nx/devkit");
 const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
 const eslint_file_1 = require("../../generators/utils/eslint-file");
@@ -92,7 +93,6 @@ async function update(tree) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);
 }
-exports.default = update;
 function isTargetDefaultUsed(targetDefault, targetDefaults, projects, projectMap) {
     for (const p of Object.values(projects)) {
         for (const targetName in p.data?.targets ?? {}) {

package/src/utils/config-file.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findOldConfigFile = exports.findFlatConfigFile = exports.isFlatConfig = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
+exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.ESLINT_CONFIG_FILENAMES = exports.ESLINT_OLD_CONFIG_FILENAMES = exports.ESLINT_FLAT_CONFIG_FILENAMES = void 0;
+exports.isFlatConfig = isFlatConfig;
+exports.findFlatConfigFile = findFlatConfigFile;
+exports.findOldConfigFile = findOldConfigFile;
 const fs_1 = require("fs");
 const path_1 = require("path");
-// TODO(leo): add support for eslint.config.mjs and eslint.config.cjs
-exports.ESLINT_FLAT_CONFIG_FILENAMES = ['eslint.config.js'];
+const flat_config_1 = require("./flat-config");
+exports.ESLINT_FLAT_CONFIG_FILENAMES = flat_config_1.eslintFlatConfigFilenames;
 exports.ESLINT_OLD_CONFIG_FILENAMES = [
     '.eslintrc',
     '.eslintrc.js',
@@ -23,13 +26,13 @@ function isFlatConfig(configFilePath) {
     const configFileName = (0, path_1.basename)(configFilePath);
     return exports.ESLINT_FLAT_CONFIG_FILENAMES.includes(configFileName);
 }
-exports.isFlatConfig = isFlatConfig;
 // https://eslint.org/docs/latest/use/configure/configuration-files#configuration-file-resolution
 function findFlatConfigFile(directory, workspaceRoot) {
     let currentDir = (0, path_1.resolve)(workspaceRoot, directory);
     while (true) {
         const configFilePath = getConfigFileInDirectory(currentDir, exports.ESLINT_FLAT_CONFIG_FILENAMES);
         if (configFilePath) {
+            console.log(`Found eslint flat config file at: ${configFilePath}`);
             return configFilePath;
         }
         if (currentDir === workspaceRoot) {
@@ -39,7 +42,6 @@ function findFlatConfigFile(directory, workspaceRoot) {
     }
     return null;
 }
-exports.findFlatConfigFile = findFlatConfigFile;
 function findOldConfigFile(filePathOrDirectory, workspaceRoot) {
     let currentDir = (0, path_1.resolve)(workspaceRoot, filePathOrDirectory);
     if (!(0, fs_1.statSync)(currentDir).isDirectory()) {
@@ -57,7 +59,6 @@ function findOldConfigFile(filePathOrDirectory, workspaceRoot) {
     }
     return null;
 }
-exports.findOldConfigFile = findOldConfigFile;
 function getConfigFileInDirectory(directory, candidateFileNames) {
     for (const filename of candidateFileNames) {
         const filePath = (0, path_1.join)(directory, filename);

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

@@ -1,2 +1,4 @@
 import { Tree } from '@nx/devkit';
+export declare const eslintFlatConfigFilenames: string[];
+export declare function flatConfigEslintFilename(tree: Tree): string;
 export declare function useFlatConfig(tree: Tree): boolean;

package/src/utils/flat-config.js

@@ -1,7 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useFlatConfig = void 0;
+exports.eslintFlatConfigFilenames = void 0;
+exports.flatConfigEslintFilename = flatConfigEslintFilename;
+exports.useFlatConfig = useFlatConfig;
+// todo: add support for eslint.config.mjs,
+exports.eslintFlatConfigFilenames = [
+    'eslint.config.js',
+    'eslint.config.cjs',
+];
+function flatConfigEslintFilename(tree) {
+    for (const file of exports.eslintFlatConfigFilenames) {
+        if (tree.exists(file)) {
+            return file;
+        }
+    }
+    throw new Error('Could not find flat config file');
+}
 function useFlatConfig(tree) {
-    return tree.exists('eslint.config.js');
+    try {
+        return !!flatConfigEslintFilename(tree);
+    }
+    catch {
+        return false;
+    }
 }
-exports.useFlatConfig = useFlatConfig;

package/src/utils/resolve-eslint-class.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveESLintClass = void 0;
+exports.resolveESLintClass = resolveESLintClass;
 async function resolveESLintClass(useFlatConfig = false) {
     try {
         // In eslint 8.57.0 (the final v8 version), a dedicated API was added for resolving the correct ESLint class.
@@ -20,4 +20,3 @@ async function resolveESLintClass(useFlatConfig = false) {
         throw new Error('Unable to find ESLint. Ensure ESLint is installed.');
     }
 }
-exports.resolveESLintClass = resolveESLintClass;

package/src/utils/rules-requiring-type-checking.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeParserOptionsProjectIfNotRequired = exports.hasRulesRequiringTypeChecking = void 0;
+exports.hasRulesRequiringTypeChecking = hasRulesRequiringTypeChecking;
+exports.removeParserOptionsProjectIfNotRequired = removeParserOptionsProjectIfNotRequired;
 // Cache the resolved rules from node_modules
 let knownRulesRequiringTypeChecking = null;
 function resolveKnownRulesRequiringTypeChecking() {
@@ -37,7 +38,6 @@ function hasRulesRequiringTypeChecking(eslintConfig) {
     const allRulesInConfig = getAllRulesInConfig(eslintConfig);
     return allRulesInConfig.some((rule) => knownRulesRequiringTypeChecking.includes(rule));
 }
-exports.hasRulesRequiringTypeChecking = hasRulesRequiringTypeChecking;
 function removeParserOptionsProjectIfNotRequired(json) {
     // At least one rule requiring type-checking is in use, do not migrate the config
     if (hasRulesRequiringTypeChecking(json)) {
@@ -46,7 +46,6 @@ function removeParserOptionsProjectIfNotRequired(json) {
     removeProjectParserOptionFromConfig(json);
     return json;
 }
-exports.removeParserOptionsProjectIfNotRequired = removeParserOptionsProjectIfNotRequired;
 function determineEnabledRules(rules) {
     return Object.entries(rules)
         .filter(([key, value]) => {

package/src/utils/versions.d.ts

@@ -2,4 +2,4 @@ export declare const nxVersion: any;
 export declare const eslintVersion = "~8.57.0";
 export declare const eslintrcVersion = "^2.1.1";
 export declare const eslintConfigPrettierVersion = "^9.0.0";
-export declare const typescriptESLintVersion = "^7.3.0";
+export declare const typescriptESLintVersion = "^7.16.0";

package/src/utils/versions.js

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