@nx/eslint 21.0.4-beta.0 → 21.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "21.0.4-beta.0",
+  "version": "21.0.4",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -35,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "21.0.4-beta.0",
-    "@nx/js": "21.0.4-beta.0",
+    "@nx/devkit": "21.0.4",
+    "@nx/js": "21.0.4",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

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

@@ -1,10 +1,19 @@
-import { TSESLint } from '@typescript-eslint/utils';
+<% if (flatConfig) { %>import { RuleTester } from '@typescript-eslint/rule-tester';
+import type { RuleTesterConfig } from '@typescript-eslint/rule-tester';
+import { rule, RULE_NAME } from './<%= name %>';
+
+const ruleTester = new RuleTester({
+  languageOptions: {
+    parser: require('@typescript-eslint/parser'),
+  },
+} as RuleTesterConfig);
+<% } else { %>import { TSESLint } from '@typescript-eslint/utils';
 import { rule, RULE_NAME } from './<%= name %>';
 
 const ruleTester = new TSESLint.RuleTester({
   parser: require.resolve('@typescript-eslint/parser'),
 });
-
+<% } %>
 ruleTester.run(RULE_NAME, rule, {
   valid: [`const example = true;`],
   invalid: [],

package/src/generators/workspace-rule/workspace-rule.d.ts

@@ -1,6 +1,6 @@
-import { Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 export interface LintWorkspaceRuleGeneratorOptions {
     name: string;
     directory: string;
 }
-export declare function lintWorkspaceRuleGenerator(tree: Tree, options: LintWorkspaceRuleGeneratorOptions): Promise<import("@nx/devkit").GeneratorCallback>;
+export declare function lintWorkspaceRuleGenerator(tree: Tree, options: LintWorkspaceRuleGeneratorOptions): Promise<GeneratorCallback>;

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

@@ -7,19 +7,27 @@ const path_1 = require("path");
 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");
+const flat_config_1 = require("../../utils/flat-config");
+const versions_1 = require("../../utils/versions");
 async function lintWorkspaceRuleGenerator(tree, options) {
+    const tasks = [];
+    const flatConfig = (0, flat_config_1.useFlatConfig)(tree);
     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, {
+    tasks.push(await (0, workspace_rules_project_1.lintWorkspaceRulesProjectGenerator)(tree, {
         skipFormat: true,
         addPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false,
-    });
+    }));
+    if (flatConfig) {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@typescript-eslint/rule-tester': versions_1.eslint9__typescriptESLintVersion }));
+    }
     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, {
         tmpl: '',
         name: options.name,
+        flatConfig,
     });
     const nameCamelCase = (0, string_utils_1.camelize)(options.name);
     /**
@@ -73,5 +81,5 @@ async function lintWorkspaceRuleGenerator(tree, options) {
          "@nx/workspace-${options.name}": "error"
        }
 `);
-    return projectGeneratorCallback;
+    return (0, devkit_1.runTasksInSerial)(...tasks);
 }

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

@@ -50,6 +50,7 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         setupFile: 'none',
         compiler: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'swc' : 'tsc',
         skipFormat: true,
+        testEnvironment: 'node',
     }));
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(workspace_lint_rules_1.workspaceLintPluginDir, 'tsconfig.spec.json'), (json) => {
         delete json.compilerOptions?.module;