@nx/eslint 19.0.6 → 19.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.0.6",
+  "version": "19.0.8",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -13,7 +13,8 @@
     "Web",
     "Lint",
     "ESLint",
-    "CLI"
+    "CLI",
+    "Testing"
   ],
   "main": "./index",
   "typings": "./index.d.ts",
@@ -30,18 +31,19 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "js-yaml": "npm:@zkochan/js-yaml@0.0.7"
+    "@zkochan/js-yaml": "0.0.7"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.6",
-    "@nx/js": "19.0.6",
-    "eslint": "^8.0.0 || ^9.0.0",
+    "@nx/devkit": "19.0.8",
+    "@nx/js": "19.0.8",
+    "eslint": "^8.0.0",
+    "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.0.6"
+    "@nx/linter": "19.0.8"
   },
   "peerDependenciesMeta": {
-    "js-yaml": {
+    "@zkochan/js-yaml": {
       "optional": true
     }
   },

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

@@ -6,7 +6,6 @@ const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const json_converter_1 = require("./converters/json-converter");
-const js_yaml_1 = require("js-yaml");
 async function convertToFlatConfigGenerator(tree, options) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree);
     if (!eslintFile) {
@@ -112,7 +111,8 @@ function convertConfigToFlatConfig(tree, root, source, target, ignorePath) {
     }
     if (source.endsWith('.yaml') || source.endsWith('.yml')) {
         const originalContent = tree.read(`${root}/${source}`, 'utf-8');
-        const config = (0, js_yaml_1.load)(originalContent, {
+        const { load } = require('@zkochan/js-yaml');
+        const config = load(originalContent, {
             json: true,
             filename: source,
         });

package/src/plugins/plugin.js

@@ -7,6 +7,7 @@ const globs_1 = require("nx/src/utils/globs");
 const workspace_context_1 = require("nx/src/utils/workspace-context");
 const config_file_1 = require("../utils/config-file");
 const resolve_eslint_class_1 = require("../utils/resolve-eslint-class");
+const semver_1 = require("semver");
 const DEFAULT_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx', 'html', 'vue'];
 exports.createNodes = [
     (0, globs_1.combineGlobPatterns)([
@@ -41,6 +42,7 @@ exports.createNodes = [
         const dedupedProjectRoots = Array.from(new Set(projectFiles.map((f) => (0, node_path_1.dirname)(f)))).sort((a, b) => (a !== b && isSubDir(a, b) ? -1 : 1));
         const excludePatterns = dedupedProjectRoots.map((root) => `${root}/**/*`);
         const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)((0, config_file_1.isFlatConfig)(configFilePath));
+        const eslintVersion = ESLint.version;
         const childProjectRoots = new Set();
         await Promise.all(dedupedProjectRoots.map(async (childProjectRoot, index) => {
             // anything after is either a nested project or a sibling project, can be excluded
@@ -61,11 +63,11 @@ exports.createNodes = [
         }));
         const uniqueChildProjectRoots = Array.from(childProjectRoots);
         return {
-            projects: getProjectsUsingESLintConfig(configFilePath, uniqueChildProjectRoots, options, context),
+            projects: getProjectsUsingESLintConfig(configFilePath, uniqueChildProjectRoots, eslintVersion, options, context),
         };
     },
 ];
-function getProjectsUsingESLintConfig(configFilePath, childProjectRoots, options, context) {
+function getProjectsUsingESLintConfig(configFilePath, childProjectRoots, eslintVersion, options, context) {
     const projects = {};
     const rootEslintConfig = [
         config_file_1.baseEsLintConfigFile,
@@ -86,12 +88,12 @@ function getProjectsUsingESLintConfig(configFilePath, childProjectRoots, options
             eslintConfigs.unshift(rootEslintConfig);
         }
         projects[projectRoot] = {
-            targets: buildEslintTargets(eslintConfigs, projectRoot, context.workspaceRoot, options, isStandaloneWorkspace),
+            targets: buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, context.workspaceRoot, options, isStandaloneWorkspace),
         };
     }
     return projects;
 }
-function buildEslintTargets(eslintConfigs, projectRoot, workspaceRoot, options, isStandaloneWorkspace = false) {
+function buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, workspaceRoot, options, isStandaloneWorkspace = false) {
     const isRootProject = projectRoot === '.';
     const targets = {};
     const targetConfig = {
@@ -115,9 +117,13 @@ function buildEslintTargets(eslintConfigs, projectRoot, workspaceRoot, options,
     };
     // Always set the environment variable to ensure that the ESLint CLI can run on eslint v8 and v9
     const useFlatConfig = eslintConfigs.some((config) => (0, config_file_1.isFlatConfig)(config));
-    targetConfig.options.env = {
-        ESLINT_USE_FLAT_CONFIG: useFlatConfig ? 'true' : 'false',
-    };
+    // Flat config is default for 9.0.0+
+    const defaultSetting = (0, semver_1.gte)(eslintVersion, '9.0.0');
+    if (useFlatConfig !== defaultSetting) {
+        targetConfig.options.env = {
+            ESLINT_USE_FLAT_CONFIG: useFlatConfig ? 'true' : 'false',
+        };
+    }
     targets[options.targetName] = targetConfig;
     return targets;
 }