@nx/eslint 0.0.0-pr-29750-cc9549c → 0.0.0-pr-29860-43e1fcb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-29750-cc9549c",
+  "version": "0.0.0-pr-29860-43e1fcb",
   "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": "0.0.0-pr-29750-cc9549c",
-    "@nx/js": "0.0.0-pr-29750-cc9549c",
+    "@nx/devkit": "0.0.0-pr-29860-43e1fcb",
+    "@nx/js": "0.0.0-pr-29860-43e1fcb",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

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

@@ -113,6 +113,8 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
         files: [
             '**/*.ts',
             '**/*.tsx',
+            '**/*.cts',
+            '**/*.mts',
             '**/*.js',
             '**/*.jsx',
             '**/*.cjs',

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

@@ -13,6 +13,7 @@ const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const config_file_1 = require("../../utils/config-file");
 const plugin_1 = require("../utils/plugin");
 const setup_root_eslint_1 = require("./setup-root-eslint");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function lintProjectGenerator(tree, options) {
     return lintProjectGeneratorInternal(tree, { addPlugin: false, ...options });
 }
@@ -44,7 +45,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     if (lintFilePatterns &&
         lintFilePatterns.length &&
         !lintFilePatterns.includes('{projectRoot}') &&
-        isBuildableLibraryProject(projectConfig)) {
+        isBuildableLibraryProject(tree, projectConfig)) {
         lintFilePatterns.push(`{projectRoot}/package.json`);
     }
     const hasPlugin = (0, plugin_1.hasEslintPlugin)(tree);
@@ -98,7 +99,7 @@ async function lintProjectGeneratorInternal(tree, options) {
         createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
-    if (isBuildableLibraryProject(projectConfig) &&
+    if (isBuildableLibraryProject(tree, projectConfig) &&
         !isJsAnalyzeSourceFilesEnabled(tree)) {
         (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
             json.pluginsConfig ??= {};
@@ -132,7 +133,7 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
         }
     }
     const addDependencyChecks = options.addPackageJsonDependencyChecks ||
-        isBuildableLibraryProject(projectConfig);
+        isBuildableLibraryProject(tree, projectConfig);
     const overrides = (0, flat_config_1.useFlatConfig)(tree)
         ? // For flat configs, we don't need to generate different overrides for each file. Users should add their own overrides as needed.
             []
@@ -216,8 +217,9 @@ function isJsAnalyzeSourceFilesEnabled(tree) {
     return (jsPluginConfig?.analyzeSourceFiles ??
         nxJson.extends !== 'nx/presets/npm.json');
 }
-function isBuildableLibraryProject(projectConfig) {
-    return (projectConfig.projectType === 'library' &&
+function isBuildableLibraryProject(tree, projectConfig) {
+    return ((0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, projectConfig.projectType) ===
+        'library' &&
         projectConfig.targets?.build &&
         !!projectConfig.targets.build);
 }

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

@@ -5,6 +5,7 @@ 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");
+const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
@@ -47,7 +48,7 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         supportTsx: false,
         skipSerializers: true,
         setupFile: 'none',
-        compiler: 'tsc',
+        compiler: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'swc' : 'tsc',
         skipFormat: true,
     }));
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(workspace_lint_rules_1.workspaceLintPluginDir, 'tsconfig.spec.json'), (json) => {

package/src/plugins/plugin.js

@@ -13,7 +13,18 @@ const semver_1 = require("semver");
 const config_file_1 = require("../utils/config-file");
 const resolve_eslint_class_1 = require("../utils/resolve-eslint-class");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
-const DEFAULT_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx', 'html', 'vue'];
+const DEFAULT_EXTENSIONS = [
+    'ts',
+    'cts',
+    'mts',
+    'tsx',
+    'js',
+    'cjs',
+    'mjs',
+    'jsx',
+    'html',
+    'vue',
+];
 const PROJECT_CONFIG_FILENAMES = ['project.json', 'package.json'];
 const ESLINT_CONFIG_GLOB_V1 = (0, globs_1.combineGlobPatterns)(config_file_1.ESLINT_CONFIG_FILENAMES.map((f) => `**/${f}`));
 const ESLINT_CONFIG_GLOB_V2 = (0, globs_1.combineGlobPatterns)([