@nx/eslint 19.2.0-canary.20240604-0594deb → 19.2.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.2.0-canary.20240604-0594deb",
+  "version": "19.2.0-rc.0",
   "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.2.0-canary.20240604-0594deb",
-    "@nx/js": "19.2.0-canary.20240604-0594deb",
+    "@nx/devkit": "19.2.0-rc.0",
+    "@nx/js": "19.2.0-rc.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.2.0-canary.20240604-0594deb"
+    "@nx/linter": "19.2.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/plugin.d.ts

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

package/plugin.js

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

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

@@ -189,7 +189,7 @@ function replaceOverridesInLintConfig(tree, root, overrides) {
         content = (0, ast_utils_1.removeOverridesFromLintConfig)(content);
         overrides.forEach((override) => {
             const flatOverride = (0, ast_utils_1.generateFlatOverride)(override);
-            (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
+            content = (0, ast_utils_1.addBlockToFlatConfigExport)(content, flatOverride);
         });
         tree.write(fileName, content);
     }
@@ -209,7 +209,9 @@ function addExtendsToLintConfig(tree, root, plugin) {
         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)(content, pluginExtends, {
+            insertAtTheEnd: false,
+        }));
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');

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

@@ -425,7 +425,7 @@ function addCompatToFlatConfig(content) {
     if (result.includes('const compat = new FlatCompat')) {
         return result;
     }
-    result = addImportToFlatConfig(result, 'FlatCompat', '@eslint/eslintrc');
+    result = addImportToFlatConfig(result, ['FlatCompat'], '@eslint/eslintrc');
     const index = result.indexOf('module.exports');
     return (0, devkit_1.applyChangesToString)(result, [
         {

package/src/plugins/plugin.js

@@ -88,7 +88,7 @@ exports.createNodesV2 = [
     ESLINT_CONFIG_GLOB,
     async (configFiles, options, context) => {
         const optionsHash = (0, file_hasher_1.hashObject)(options);
-        const cachePath = (0, node_path_1.join)(cache_directory_1.projectGraphCacheDirectory, `eslint-${optionsHash}.hash`);
+        const cachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `eslint-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         try {
             return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodes(configFile, options, context, targetsCache), configFiles, options, context);