@nx/eslint 17.0.5 → 17.0.6

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

@@ -1,20 +1,28 @@
 "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.getPluginImport = exports.addIgnoresToLintConfig = exports.addPluginsToLintConfig = exports.addExtendsToLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.updateOverrideInLintConfig = exports.addOverrideToLintConfig = exports.updateRelativePathsInConfig = exports.isEslintConfigSupported = exports.findEslintFile = exports.baseEsLintFlatConfigFile = exports.baseEsLintConfigFile = exports.eslintConfigFileWhitelist = void 0;
 const devkit_1 = require("@nx/devkit");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("./flat-config/ast-utils");
-const path_utils_1 = require("./flat-config/path-utils");
-const config_file_1 = require("../../utils/config-file");
-function findEslintFile(tree, projectRoot) {
-    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintConfigFile)) {
-        return config_file_1.baseEsLintConfigFile;
+exports.eslintConfigFileWhitelist = [
+    '.eslintrc',
+    '.eslintrc.js',
+    '.eslintrc.cjs',
+    '.eslintrc.yaml',
+    '.eslintrc.yml',
+    '.eslintrc.json',
+    'eslint.config.js',
+];
+exports.baseEsLintConfigFile = '.eslintrc.base.json';
+exports.baseEsLintFlatConfigFile = 'eslint.base.config.js';
+function findEslintFile(tree, projectRoot = '') {
+    if (projectRoot === '' && tree.exists(exports.baseEsLintConfigFile)) {
+        return exports.baseEsLintConfigFile;
     }
-    if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintFlatConfigFile)) {
-        return config_file_1.baseEsLintFlatConfigFile;
+    if (projectRoot === '' && tree.exists(exports.baseEsLintFlatConfigFile)) {
+        return exports.baseEsLintFlatConfigFile;
     }
-    projectRoot ??= '';
-    for (const file of config_file_1.ESLINT_CONFIG_FILENAMES) {
+    for (const file of exports.eslintConfigFileWhitelist) {
         if (tree.exists((0, devkit_1.joinPathFragments)(projectRoot, file))) {
             return file;
         }
@@ -85,7 +93,7 @@ function replaceFlatConfigPaths(config, sourceRoot, offset, destinationRoot, tre
     return newConfig;
 }
 function offsetFilePath(projectRoot, pathToFile, offset, tree) {
-    if (config_file_1.ESLINT_CONFIG_FILENAMES.some((eslintFile) => pathToFile.includes(eslintFile))) {
+    if (exports.eslintConfigFileWhitelist.some((eslintFile) => pathToFile.includes(eslintFile))) {
         // if the file is point to base eslint
         const rootEslint = findEslintFile(tree);
         if (rootEslint) {
@@ -103,8 +111,8 @@ 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 flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintFlatConfigFile : 'eslint.config.js');
+        const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
         let content = tree.read(fileName, 'utf8');
         // we will be using compat here so we need to make sure it's added
         if (overrideNeedsCompat(override)) {
@@ -113,9 +121,9 @@ function addOverrideToLintConfig(tree, root, override, options = {
         tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride, options));
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintConfigFile : '.eslintrc.json');
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
-            json.overrides ??= [];
+            json.overrides ?? [];
             if (options.insertAtTheEnd) {
                 json.overrides.push(override);
             }
@@ -128,7 +136,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }
 exports.addOverrideToLintConfig = addOverrideToLintConfig;
 function overrideNeedsCompat(override) {
-    return (override.env || override.extends || override.plugins || override.parser);
+    return (!override.env && !override.extends && !override.plugins && !override.parser);
 }
 function updateOverrideInLintConfig(tree, root, lookup, update) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
@@ -139,23 +147,10 @@ function updateOverrideInLintConfig(tree, root, lookup, update) {
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
-        if (!tree.exists(fileName)) {
-            return;
-        }
-        const existingJson = (0, devkit_1.readJson)(tree, fileName);
-        if (!existingJson.overrides || !existingJson.overrides.some(lookup)) {
-            return;
-        }
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
             const index = json.overrides.findIndex(lookup);
             if (index !== -1) {
-                const newOverride = update(json.overrides[index]);
-                if (newOverride) {
-                    json.overrides[index] = newOverride;
-                }
-                else {
-                    json.overrides.splice(index, 1);
-                }
+                json.overrides[index] = update(json.overrides[index]);
             }
             return json;
         });
@@ -168,12 +163,12 @@ function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = 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 ? exports.baseEsLintFlatConfigFile : 'eslint.config.js');
         const content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
+        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? exports.baseEsLintConfigFile : '.eslintrc.json');
         return (0, devkit_1.readJson)(tree, fileName).overrides?.some(lookup) || false;
     }
 }
@@ -188,7 +183,7 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
         }
         content = (0, ast_utils_1.removeOverridesFromLintConfig)(content);
         overrides.forEach((override) => {
-            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
+            const flatOverride = (0, ast_utils_1.generateFlatOverride)(override, root);
             (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
         });
         tree.write(fileName, content);
@@ -207,9 +202,7 @@ function addExtendsToLintConfig(tree, root, plugin) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const pluginExtends = (0, ast_utils_1.generatePluginExtendsElement)(plugins);
-        let content = tree.read(fileName, 'utf8');
-        content = (0, ast_utils_1.addCompatToFlatConfig)(content);
-        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, pluginExtends));
+        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), pluginExtends));
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
@@ -254,7 +247,7 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const block = (0, ast_utils_1.generateAst)({
-            ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
+            ignores: ignorePatterns.map((path) => (0, ast_utils_1.mapFilePath)(path, root)),
         });
         tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), block));
     }

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

@@ -8,7 +8,7 @@ export declare function hasOverride(content: string, lookup: (override: Linter.C
 /**
  * Finds an override matching the lookup function and applies the update function to it
  */
-export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update?: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
+export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
 /**
  * Adding require statement to the top of the file
  */
@@ -44,7 +44,7 @@ export declare function generatePluginExtendsElement(plugins: string[]): ts.Spre
 /**
  * Stringifies TS nodes to file content string
  */
-export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>): string;
+export declare function stringifyNodeList(nodes: ts.NodeArray<ts.VariableStatement | ts.Identifier | ts.ExpressionStatement | ts.SourceFile>, root: string, fileName: string): string;
 /**
  * generates AST require statement
  */
@@ -52,8 +52,9 @@ export declare function generateRequire(variableName: string | ts.ObjectBindingP
 /**
  * Generates AST object or spread element based on JSON override object
  */
-export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>): ts.ObjectLiteralExpression | ts.SpreadElement;
-export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>): void;
+export declare function generateFlatOverride(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): ts.ObjectLiteralExpression | ts.SpreadElement;
+export declare function mapFilePaths(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): void;
+export declare function mapFilePath(filePath: string, root: string): string;
 /**
  * Generates an AST from a JSON-type input
  */

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

@@ -1,9 +1,8 @@
 "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.generateAst = exports.mapFilePath = 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;
 const devkit_1 = require("@nx/devkit");
 const ts = require("typescript");
-const path_utils_1 = require("./path-utils");
 /**
  * Remove all overrides from the config file
  */
@@ -64,7 +63,7 @@ function hasOverride(content, lookup) {
                 // strip any spread elements
                 objSource = fullNodeText.replace(/\s*\.\.\.[a-zA-Z0-9_]+,?\n?/, '');
             }
-            const data = (0, devkit_1.parseJson)(objSource
+            const data = JSON.parse(objSource
                 // ensure property names have double quotes so that JSON.parse works
                 .replace(/'/g, '"')
                 .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -78,7 +77,7 @@ function hasOverride(content, lookup) {
 exports.hasOverride = hasOverride;
 const STRIP_SPREAD_ELEMENTS = /\s*\.\.\.[a-zA-Z0-9_]+,?\n?/g;
 function parseTextToJson(text) {
-    return (0, devkit_1.parseJson)(text
+    return JSON.parse(text
         // ensure property names have double quotes so that JSON.parse works
         .replace(/'/g, '"')
         .replace(/\s([a-zA-Z0-9_]+)\s*:/g, ' "$1": '));
@@ -119,14 +118,12 @@ function replaceOverride(content, root, lookup, update) {
                     length: end - start,
                 });
                 const updatedData = update(data);
-                if (updatedData) {
-                    mapFilePaths(updatedData);
-                    changes.push({
-                        type: devkit_1.ChangeType.Insert,
-                        index: start,
-                        text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
-                    });
-                }
+                mapFilePaths(updatedData, root);
+                changes.push({
+                    type: devkit_1.ChangeType.Insert,
+                    index: start,
+                    text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
+                });
             }
         }
     });
@@ -473,15 +470,10 @@ exports.generatePluginExtendsElement = generatePluginExtendsElement;
 /**
  * Stringifies TS nodes to file content string
  */
-function stringifyNodeList(nodes) {
+function stringifyNodeList(nodes, root, fileName) {
     const printer = ts.createPrinter({ newLine: ts.NewLineKind.LineFeed });
-    const resultFile = ts.createSourceFile('', '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
-    return (printer
-        .printList(ts.ListFormat.MultiLine, nodes, resultFile)
-        // add new line before compat initialization
-        .replace(/const compat = new FlatCompat/, '\nconst compat = new FlatCompat')
-        // add new line before module.exports = ...
-        .replace(/module\.exports/, '\nmodule.exports'));
+    const resultFile = ts.createSourceFile((0, devkit_1.joinPathFragments)(root, fileName), '', ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    return printer.printList(ts.ListFormat.MultiLine, nodes, resultFile);
 }
 exports.stringifyNodeList = stringifyNodeList;
 /**
@@ -496,30 +488,21 @@ exports.generateRequire = generateRequire;
 /**
  * Generates AST object or spread element based on JSON override object
  */
-function generateFlatOverride(override) {
-    mapFilePaths(override);
+function generateFlatOverride(override, root) {
+    mapFilePaths(override, root);
     if (!override.env &&
         !override.extends &&
         !override.plugins &&
         !override.parser) {
-        if (override.parserOptions) {
-            const { parserOptions, ...rest } = override;
-            return generateAst({ ...rest, languageSettings: { parserOptions } });
-        }
         return generateAst(override);
     }
-    const { files, excludedFiles, rules, parserOptions, ...rest } = override;
+    const { files, excludedFiles, rules, ...rest } = override;
     const objectLiteralElements = [
         ts.factory.createSpreadAssignment(ts.factory.createIdentifier('config')),
     ];
     addTSObjectProperty(objectLiteralElements, 'files', files);
     addTSObjectProperty(objectLiteralElements, 'excludedFiles', excludedFiles);
     addTSObjectProperty(objectLiteralElements, 'rules', rules);
-    if (parserOptions) {
-        addTSObjectProperty(objectLiteralElements, 'languageSettings', {
-            parserOptions,
-        });
-    }
     return ts.factory.createSpreadElement(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier('compat'), ts.factory.createIdentifier('config')), undefined, [generateAst(rest)]), ts.factory.createIdentifier('map')), undefined, [
         ts.factory.createArrowFunction(undefined, undefined, [
             ts.factory.createParameterDeclaration(undefined, undefined, 'config'),
@@ -527,21 +510,41 @@ function generateFlatOverride(override) {
     ]));
 }
 exports.generateFlatOverride = generateFlatOverride;
-function mapFilePaths(override) {
+function mapFilePaths(override, root) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => (0, path_utils_1.mapFilePath)(file));
+        override.files = override.files.map((file) => mapFilePath(file, root));
     }
     if (override.excludedFiles) {
         override.excludedFiles = Array.isArray(override.excludedFiles)
             ? override.excludedFiles
             : [override.excludedFiles];
-        override.excludedFiles = override.excludedFiles.map((file) => (0, path_utils_1.mapFilePath)(file));
+        override.excludedFiles = override.excludedFiles.map((file) => mapFilePath(file, root));
     }
 }
 exports.mapFilePaths = mapFilePaths;
+function mapFilePath(filePath, root) {
+    if (filePath.startsWith('!')) {
+        const fileWithoutBang = filePath.slice(1);
+        if (fileWithoutBang.startsWith('*.')) {
+            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
+        }
+        else if (!fileWithoutBang.startsWith(root)) {
+            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
+        }
+        return filePath;
+    }
+    if (filePath.startsWith('*.')) {
+        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
+    }
+    else if (!filePath.startsWith(root)) {
+        return (0, devkit_1.joinPathFragments)(root, filePath);
+    }
+    return filePath;
+}
+exports.mapFilePath = mapFilePath;
 function addTSObjectProperty(elements, key, value) {
     if (value) {
         elements.push(ts.factory.createPropertyAssignment(key, generateAst(value)));

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

@@ -1,3 +1,2 @@
 import type { Linter } from 'eslint';
-export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>): Linter.ConfigOverride<Linter.RulesRecord>;
-export declare function mapFilePath(filePath: string): string;
+export declare function updateFiles(override: Linter.ConfigOverride<Linter.RulesRecord>, root: string): Linter.ConfigOverride<Linter.RulesRecord>;

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

@@ -1,28 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapFilePath = exports.updateFiles = void 0;
+exports.updateFiles = void 0;
 const devkit_1 = require("@nx/devkit");
-function updateFiles(override) {
+function updateFiles(override, root) {
     if (override.files) {
         override.files = Array.isArray(override.files)
             ? override.files
             : [override.files];
-        override.files = override.files.map((file) => mapFilePath(file));
+        override.files = override.files.map((file) => mapFilePath(file, root));
     }
     return override;
 }
 exports.updateFiles = updateFiles;
-function mapFilePath(filePath) {
+function mapFilePath(filePath, root) {
     if (filePath.startsWith('!')) {
         const fileWithoutBang = filePath.slice(1);
         if (fileWithoutBang.startsWith('*.')) {
-            return `!${(0, devkit_1.joinPathFragments)('**', fileWithoutBang)}`;
+            return `!${(0, devkit_1.joinPathFragments)(root, '**', fileWithoutBang)}`;
+        }
+        else {
+            return `!${(0, devkit_1.joinPathFragments)(root, fileWithoutBang)}`;
         }
-        return filePath;
     }
     if (filePath.startsWith('*.')) {
-        return (0, devkit_1.joinPathFragments)('**', filePath);
+        return (0, devkit_1.joinPathFragments)(root, '**', filePath);
+    }
+    else {
+        return (0, devkit_1.joinPathFragments)(root, filePath);
     }
-    return filePath;
 }
-exports.mapFilePath = mapFilePath;

package/src/generators/workspace-rule/files/__name__.ts__tmpl__

@@ -16,7 +16,7 @@
 
 import { ESLintUtils } from '@typescript-eslint/utils';
 
-// NOTE: The rule will be available in ESLint configs as "@nx/workspace-<%= name %>"
+// NOTE: The rule will be available in ESLint configs as "@nx/workspace/<%= name %>"
 export const RULE_NAME = '<%= name %>';
 
 export const rule = ESLintUtils.RuleCreator(() => __filename)({
@@ -25,7 +25,7 @@ export const rule = ESLintUtils.RuleCreator(() => __filename)({
     type: 'problem',
     docs: {
       description: ``,
-      recommended: 'recommended',
+      recommended: 'error',
     },
     schema: [],
     messages: {},

package/src/generators/workspace-rule/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxWorkspaceRule",
   "cli": "nx",
   "title": "Create a new Workspace Lint Rule",

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

@@ -8,13 +8,8 @@ const ts = require("typescript");
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
 const workspace_rules_project_1 = require("../workspace-rules-project/workspace-rules-project");
 async function lintWorkspaceRuleGenerator(tree, options) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
     // Ensure that the workspace rules project has been created
-    const projectGeneratorCallback = await (0, workspace_rules_project_1.lintWorkspaceRulesProjectGenerator)(tree, {
-        skipFormat: true,
-        addPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
-            nxJson.useInferencePlugins !== false,
-    });
+    const projectGeneratorCallback = await (0, workspace_rules_project_1.lintWorkspaceRulesProjectGenerator)(tree, { skipFormat: true });
     const ruleDir = (0, devkit_1.joinPathFragments)(workspace_lint_rules_1.workspaceLintPluginDir, options.directory ?? '');
     // Generate the required files for the new rule
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), ruleDir, {
@@ -70,7 +65,7 @@ async function lintWorkspaceRuleGenerator(tree, options) {
     devkit_1.logger.info(`NX Reminder: Once you have finished writing your rule logic, you need to actually enable the rule within an appropriate ESLint config in your workspace, for example:
 
        "rules": {
-         "@nx/workspace-${options.name}": "error"
+         "@nx/workspace/${options.name}": "error"
        }
 `);
     return projectGeneratorCallback;

package/src/generators/workspace-rules-project/files/tsconfig.json__tmpl__

@@ -1,8 +1,7 @@
 {
   "extends": "<%= rootTsConfigPath %>",
   "compilerOptions": {
-    "moduleResolution": "node16",
-    "module": "node16"
+    "module": "commonjs"
   },
   "files": [],
   "include": [],

package/src/generators/workspace-rules-project/schema.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://json-schema.org/schema",
+  "$schema": "http://json-schema.org/schema",
   "$id": "NxWorkspaceRulesProject",
   "cli": "nx",
   "title": "Create the Workspace Lint Rules Project",

package/src/generators/workspace-rules-project/workspace-rules-project.d.ts

@@ -1,8 +1,7 @@
-import { GeneratorCallback, Tree } from '@nx/devkit';
+import { Tree } from '@nx/devkit';
 export declare const WORKSPACE_RULES_PROJECT_NAME = "eslint-rules";
 export declare const WORKSPACE_PLUGIN_DIR = "tools/eslint-rules";
 export interface LintWorkspaceRulesProjectGeneratorOptions {
     skipFormat?: boolean;
-    addPlugin?: boolean;
 }
-export declare function lintWorkspaceRulesProjectGenerator(tree: Tree, options?: LintWorkspaceRulesProjectGeneratorOptions): Promise<GeneratorCallback>;
+export declare function lintWorkspaceRulesProjectGenerator(tree: Tree, options?: LintWorkspaceRulesProjectGeneratorOptions): Promise<import("@nx/devkit").GeneratorCallback>;

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

@@ -10,8 +10,7 @@ const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
 exports.WORKSPACE_RULES_PROJECT_NAME = 'eslint-rules';
 exports.WORKSPACE_PLUGIN_DIR = 'tools/eslint-rules';
 async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
-    const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-    const tasks = [];
+    const { addPropertyToJestConfig, configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
     // Noop if the workspace rules project already exists
     try {
         (0, devkit_1.readProjectConfiguration)(tree, exports.WORKSPACE_RULES_PROJECT_NAME);
@@ -40,17 +39,15 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     // Add jest to the project and return installation task
-    tasks.push(await configurationGenerator(tree, {
-        ...options,
+    const installTask = await configurationGenerator(tree, {
         project: exports.WORKSPACE_RULES_PROJECT_NAME,
         supportTsx: false,
         skipSerializers: true,
         setupFile: 'none',
         compiler: 'tsc',
         skipFormat: true,
-    }));
+    });
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(workspace_lint_rules_1.workspaceLintPluginDir, 'tsconfig.spec.json'), (json) => {
-        delete json.compilerOptions?.module;
         if (json.include) {
             json.include = json.include.map((v) => {
                 if (v.startsWith('src/**')) {
@@ -70,13 +67,14 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         return json;
     });
     // Add swc dependencies
-    tasks.push((0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree));
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@typescript-eslint/utils': versions_1.typescriptESLintVersion,
-    }));
+    (0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree);
+    // Add extra config to the jest.config.ts file to allow ESLint 8 exports mapping to work with jest
+    addPropertyToJestConfig(tree, (0, devkit_1.joinPathFragments)(exports.WORKSPACE_PLUGIN_DIR, 'jest.config.ts'), 'moduleNameMapper', {
+        '@eslint/eslintrc': '@eslint/eslintrc/dist/eslintrc-universal.cjs',
+    });
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
-    return (0, devkit_1.runTasksInSerial)(...tasks);
+    return installTask;
 }
 exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;

package/src/migrations/update-15-0-0/add-eslint-inputs.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
+const eslint_file_1 = require("../../generators/utils/eslint-file");
 const eslint_targets_1 = require("../../generators/utils/eslint-targets");
-const config_file_1 = require("../../utils/config-file");
 async function addEslintInputs(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const globalEslintFile = config_file_1.ESLINT_CONFIG_FILENAMES.find((file) => tree.exists(file));
+    const globalEslintFile = eslint_file_1.eslintConfigFileWhitelist.find((file) => tree.exists(file));
     if (globalEslintFile && nxJson.namedInputs?.production) {
         const productionFileset = new Set(nxJson.namedInputs.production);
         productionFileset.add(`!{projectRoot}/${globalEslintFile}`);

package/src/migrations/update-15-7-1/add-eslint-ignore.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
+const eslint_file_1 = require("../../generators/utils/eslint-file");
 const eslint_targets_1 = require("../../generators/utils/eslint-targets");
-const config_file_1 = require("../../utils/config-file");
 async function addEslintIgnore(tree) {
     const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
-    const globalEslintFile = config_file_1.ESLINT_CONFIG_FILENAMES.find((file) => tree.exists(file));
+    const globalEslintFile = eslint_file_1.eslintConfigFileWhitelist.find((file) => tree.exists(file));
     if (globalEslintFile) {
         if (tree.exists('.eslintignore')) {
             const content = tree.read('.eslintignore', 'utf-8');

package/src/utils/versions.d.ts

@@ -1,5 +1,5 @@
 export declare const nxVersion: any;
-export declare const eslintVersion = "~8.57.0";
+export declare const eslintVersion = "~8.46.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 = "^5.60.1";

package/src/utils/versions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
-exports.eslintVersion = '~8.57.0';
+exports.eslintVersion = '~8.46.0';
 exports.eslintrcVersion = '^2.1.1';
 exports.eslintConfigPrettierVersion = '^9.0.0';
-exports.typescriptESLintVersion = '^7.3.0';
+exports.typescriptESLintVersion = '^5.60.1';

package/plugin.d.ts

@@ -1 +0,0 @@
-export { createNodes, EslintPluginOptions } from './src/plugins/plugin';

package/plugin.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNodes = void 0;
-var plugin_1 = require("./src/plugins/plugin");
-Object.defineProperty(exports, "createNodes", { enumerable: true, get: function () { return plugin_1.createNodes; } });

package/src/generators/init/schema.json

@@ -1,28 +0,0 @@
-{
-  "$schema": "https://json-schema.org/schema",
-  "cli": "nx",
-  "$id": "NxESLintInit",
-  "title": "Initialize ESLint Plugin",
-  "description": "Set up the ESLint plugin.",
-  "type": "object",
-  "properties": {
-    "skipPackageJson": {
-      "description": "Do not add dependencies to `package.json`.",
-      "type": "boolean",
-      "default": false
-    },
-    "keepExistingVersions": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Keep existing dependencies versions",
-      "default": false
-    },
-    "updatePackageScripts": {
-      "type": "boolean",
-      "x-priority": "internal",
-      "description": "Update `package.json` scripts with inferred targets",
-      "default": false
-    }
-  },
-  "required": []
-}

package/src/generators/lint-project/setup-root-eslint.d.ts

@@ -1,7 +0,0 @@
-import { type GeneratorCallback, type Tree } from '@nx/devkit';
-export type SetupRootEsLintOptions = {
-    unitTestRunner?: string;
-    skipPackageJson?: boolean;
-    rootProject?: boolean;
-};
-export declare function setupRootEsLint(tree: Tree, options: SetupRootEsLintOptions): GeneratorCallback;

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

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupRootEsLint = void 0;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-const global_eslint_config_1 = require("../init/global-eslint-config");
-const eslint_file_1 = require("../utils/eslint-file");
-function setupRootEsLint(tree, options) {
-    const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
-    if (rootEslintFile) {
-        return () => { };
-    }
-    (0, devkit_1.writeJson)(tree, '.eslintrc.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(options.unitTestRunner, options.rootProject));
-    if (tree.exists('.eslintignore')) {
-        let content = tree.read('.eslintignore', 'utf-8');
-        if (!/^node_modules$/gm.test(content)) {
-            content = `${content}\nnode_modules\n`;
-            tree.write('.eslintignore', content);
-        }
-    }
-    else {
-        tree.write('.eslintignore', 'node_modules\n');
-    }
-    return !options.skipPackageJson
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/eslint-plugin': versions_1.nxVersion,
-            '@typescript-eslint/parser': versions_1.typescriptESLintVersion,
-            '@typescript-eslint/eslint-plugin': versions_1.typescriptESLintVersion,
-            'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
-        })
-        : () => { };
-}
-exports.setupRootEsLint = setupRootEsLint;