@nx/eslint 23.0.0-beta.4 → 23.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.0.0-beta.4",
+  "version": "23.0.0-beta.6",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -32,19 +32,19 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/jest": "23.0.0-beta.4",
+    "@nx/jest": "23.0.0-beta.6",
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.4",
-    "@nx/js": "23.0.0-beta.4",
+    "@nx/devkit": "23.0.0-beta.6",
+    "@nx/js": "23.0.0-beta.6",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.4"
+    "nx": "23.0.0-beta.6"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA4BlE;AAyJD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA4BlE;AAyJD,eAAe,iBAAiB,CAAC"}

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const posix_1 = require("node:path/posix");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_1 = require("../../plugins/plugin");
@@ -11,7 +10,7 @@ const config_file_1 = require("../../utils/config-file");
 const target_options_map_1 = require("./lib/target-options-map");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodesV2, { targetName: 'lint' }, [
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodesV2, { targetName: 'lint' }, [
         {
             executors: ['@nx/eslint:lint', '@nrwl/linter:eslint'],
             postTargetTransformer,
@@ -20,7 +19,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -75,7 +74,7 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
         }
     }
     if (target.outputs) {
-        (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+        (0, internal_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
             projectName: projectDetails.projectName,
             projectRoot: projectDetails.root,
         });

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;CACpC;AA+CD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,8BAG3B"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;CACpC;AA+CD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,8BAG3B"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initEsLint = initEsLint;
 exports.lintInitGenerator = lintInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../../plugins/plugin");
@@ -75,7 +75,7 @@ async function initEsLint(tree, options) {
         '_eslint-lint',
     ];
     if (rootEslintFile && options.addPlugin && !hasPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
         return () => { };
@@ -86,7 +86,7 @@ async function initEsLint(tree, options) {
     updateProductionFileset(tree, options.eslintConfigFormat);
     updateVsCodeRecommendedExtensions(tree);
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
     }

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

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getEslintTargets = getEslintTargets;
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
+const internal_1 = require("@nx/devkit/internal");
 function getEslintTargets(tree) {
     const eslintTargetNames = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/eslint:lint', (_, __, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/eslint:lint', (_, __, target) => {
         eslintTargetNames.add(target);
     });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/linter:eslint', (_, __, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nx/linter:eslint', (_, __, target) => {
         eslintTargetNames.add(target);
     });
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/linter:eslint', (_, __, target) => {
+    (0, internal_1.forEachExecutorOptions)(tree, '@nrwl/linter:eslint', (_, __, target) => {
         eslintTargetNames.add(target);
     });
     return eslintTargetNames;

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

@@ -1 +1 @@
-{"version":3,"file":"workspace-rule.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iCAAiC,8BAiH3C"}
+{"version":3,"file":"workspace-rule.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":"AACA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAQpB,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iCAAiC,8BAiH3C"}

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintWorkspaceRuleGenerator = lintWorkspaceRuleGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 const path_1 = require("path");
 const ts = tslib_1.__importStar(require("typescript"));
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
@@ -30,7 +30,7 @@ async function lintWorkspaceRuleGenerator(tree, options) {
         name: options.name,
         flatConfig,
     });
-    const nameCamelCase = (0, string_utils_1.camelize)(options.name);
+    const nameCamelCase = (0, internal_1.camelize)(options.name);
     /**
      * Import the new rule into the workspace plugin index.ts and
      * register it ready for use in lint configs.

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAwBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAuHD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAoF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,aAAa,EAId,MAAM,YAAY,CAAC;AAuBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AA2GD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAoF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/src/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix_1 = require("node:path/posix");
@@ -32,14 +32,6 @@ const ESLINT_CONFIG_GLOB_V2 = (0, globs_1.combineGlobPatterns)([
     ...config_file_1.ESLINT_CONFIG_FILENAMES.map((f) => `**/${f}`),
     ...PROJECT_CONFIG_FILENAMES.map((f) => `**/${f}`),
 ]);
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, tsconfigChainsByProjectRoot, projectsCache, hashByRoot, pmc) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
     const eslintVersion = ESLint.version;
@@ -56,9 +48,10 @@ const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, p
     const projects = {};
     await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
         const hash = hashByRoot.get(projectRoot);
-        if (projectsCache[hash]) {
+        const cached = projectsCache.get(hash);
+        if (cached) {
             // We can reuse the projects in the cache.
-            Object.assign(projects, projectsCache[hash]);
+            Object.assign(projects, cached);
             return;
         }
         let hasNonIgnoredLintableFiles = false;
@@ -76,18 +69,18 @@ const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, p
         }
         if (!hasNonIgnoredLintableFiles) {
             // No lintable files in the project, store in the cache and skip further processing
-            projectsCache[hash] = {};
+            projectsCache.set(hash, {});
             return;
         }
         const project = getProjectUsingESLintConfig(configFilePath, projectRoot, eslintVersion, options, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []);
         if (project) {
             projects[projectRoot] = project;
             // Store project into the cache
-            projectsCache[hash] = { [projectRoot]: project };
+            projectsCache.set(hash, { [projectRoot]: project });
         }
         else {
             // No project found, store in the cache
-            projectsCache[hash] = {};
+            projectsCache.set(hash, {});
         }
     }));
     return {
@@ -101,12 +94,12 @@ exports.createNodes = [
         const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, posix_1.join)(cache_directory_1.workspaceDataDirectory, `eslint-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
         const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
         const tsconfigChainsByProjectRoot = collectTsconfigChainsByProjectRoot(projectRoots, context.workspaceRoot);
         const lockFilePattern = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
+        const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
             const parentConfigs = eslintConfigFiles.filter((eslintConfig) => isSubDir(root, (0, posix_1.dirname)(eslintConfig)));
             return [
                 ...parentConfigs,
@@ -132,7 +125,7 @@ exports.createNodes = [
             return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(ESLint, configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, tsconfigChainsByProjectRoot, targetsCache, hashByRoot, pmc), eslintConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
@@ -197,7 +190,7 @@ function collectTsconfigChainsByProjectRoot(projectRoots, workspaceRoot) {
             continue;
         const outside = [];
         const projectPrefix = `${projectRoot}/`;
-        (0, internal_1.walkTsconfigExtendsChain)((0, posix_1.join)(workspaceRoot, tsconfigPath), (absolutePath) => {
+        (0, internal_2.walkTsconfigExtendsChain)((0, posix_1.join)(workspaceRoot, tsconfigPath), (absolutePath) => {
             const wsRelative = (0, node_path_1.relative)(workspaceRoot, absolutePath)
                 .split(node_path_1.sep)
                 .join('/');

package/src/utils/version-utils.js

@@ -4,9 +4,9 @@ exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledEslintVersion = getInstalledEslintVersion;
 exports.getTypeScriptEslintVersionToInstall = getTypeScriptEslintVersionToInstall;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const semver_2 = require("semver");
+const semver_1 = require("semver");
 const versions_1 = require("./versions");
 function getInstalledPackageVersion(pkgName, tree) {
     try {
@@ -31,8 +31,8 @@ function getInstalledPackageVersion(pkgName, tree) {
     try {
         // try to parse and return the version
         return tree
-            ? (0, semver_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
-            : (0, semver_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
+            ? (0, internal_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
+            : (0, internal_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
     }
     catch { }
     // we could not resolve the version
@@ -43,7 +43,7 @@ function getInstalledEslintVersion(tree) {
 }
 function getTypeScriptEslintVersionToInstall(tree) {
     const eslintVersion = getInstalledEslintVersion(tree);
-    return eslintVersion && (0, semver_2.lt)(eslintVersion, '9.0.0')
+    return eslintVersion && (0, semver_1.lt)(eslintVersion, '9.0.0')
         ? versions_1.typescriptESLintVersion
         : versions_1.eslint9__typescriptESLintVersion;
 }