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

package/dist/src/executors/lint/lint.impl.js

@@ -4,7 +4,6 @@ exports.default = run;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
 const fs_1 = require("fs");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const path_1 = require("path");
 const config_file_1 = require("../../utils/config-file");
 const deprecation_1 = require("../../utils/deprecation");
@@ -64,7 +63,7 @@ async function run(options, context) {
     }
     let lintResults = [];
     const normalizedLintFilePatterns = normalizedOptions.lintFilePatterns.map((pattern) => {
-        return (0, utils_1.interpolate)(pattern, {
+        return (0, internal_1.interpolate)(pattern, {
             workspaceRoot: '',
             projectRoot,
             projectName: context.projectName,

package/dist/src/generators/convert-to-flat-config/angular-eslint.js

@@ -83,8 +83,8 @@ function readAngularEslintVersion(tree) {
 // Pin the umbrella to the major already installed, falling back to the latest
 // major nx generates when none is present. @nx/eslint can't read the canonical
 // pin from @nx/angular without inverting the package dependency (@nx/angular
-// depends on @nx/eslint), so the fallback is hardcoded; keep it in sync with
-// `angularEslintVersion` in packages/angular/src/utils/versions.ts.
+// depends on @nx/eslint), so the fallback is hardcoded; keep its major in sync
+// with `angularEslintVersion` in packages/angular/src/utils/versions.ts.
 function resolveAngularEslintVersion(tree) {
     const version = readAngularEslintVersion(tree);
     const major = version ? (0, semver_1.coerce)(version)?.major : undefined;

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

@@ -4,7 +4,6 @@ exports.convertToInferred = convertToInferred;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_1 = require("../../plugins/plugin");
 const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const config_file_1 = require("../../utils/config-file");
@@ -115,7 +114,7 @@ function handlePropertiesInOptions(options, projectDetails, target) {
     }
     if ('lintFilePatterns' in options) {
         const normalizedLintFilePatterns = options.lintFilePatterns.map((pattern) => {
-            const interpolatedPattern = (0, utils_1.interpolate)(pattern, {
+            const interpolatedPattern = (0, internal_1.interpolate)(pattern, {
                 workspaceRoot: '',
                 projectRoot: projectDetails.root,
                 projectName: projectDetails.projectName,

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

@@ -8,7 +8,6 @@ const path_1 = require("path");
 const init_1 = require("../init/init");
 const deprecation_1 = require("../../utils/deprecation");
 const init_migration_1 = require("../init/init-migration");
-const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const config_file_1 = require("../../utils/config-file");
@@ -80,7 +79,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     // companion e2e app so we should check if migration to
     // monorepo style is needed
     if (!options.rootProject) {
-        const projectsFromTree = (0, project_configuration_1.getProjects)(tree);
+        const projectsFromTree = (0, devkit_1.getProjects)(tree);
         if (await isMigrationToMonorepoNeeded(tree, projectsFromTree)) {
             // we only migrate project configurations that have been created
             const filteredProjects = [];

package/dist/src/plugins/plugin.js

@@ -8,10 +8,6 @@ const internal_2 = require("@nx/js/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix_1 = require("node:path/posix");
-const file_hasher_1 = require("nx/src/hasher/file-hasher");
-const cache_directory_1 = require("nx/src/utils/cache-directory");
-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 DEFAULT_EXTENSIONS = [
@@ -27,7 +23,7 @@ const DEFAULT_EXTENSIONS = [
     'vue',
 ];
 const PROJECT_CONFIG_FILENAMES = ['project.json', 'package.json'];
-const ESLINT_CONFIG_GLOB_V2 = (0, globs_1.combineGlobPatterns)([
+const ESLINT_CONFIG_GLOB_V2 = (0, internal_1.combineGlobPatterns)([
     ...config_file_1.ESLINT_CONFIG_FILENAMES.map((f) => `**/${f}`),
     ...PROJECT_CONFIG_FILENAMES.map((f) => `**/${f}`),
 ]);
@@ -99,8 +95,8 @@ exports.createNodes = [
     async (configFiles, options, context) => {
         options = normalizeOptions(options);
         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 optionsHash = (0, internal_1.hashObject)(options);
+        const cachePath = (0, posix_1.join)(internal_1.workspaceDataDirectory, `eslint-${optionsHash}.hash`);
         const targetsCache = new internal_1.PluginCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
         const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
@@ -224,7 +220,7 @@ function collectTsconfigChainsByProjectRoot(projectRoots, workspaceRoot) {
 }
 async function collectLintableFilesByProjectRoot(projectRoots, options, context) {
     const lintableFilesPerProjectRoot = new Map();
-    const lintableFiles = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [
+    const lintableFiles = await (0, internal_1.globWithWorkspaceContext)(context.workspaceRoot, [
         `**/*.{${options.extensions.join(',')}}`,
     ]);
     for (const projectRoot of projectRoots) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.6",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -73,17 +73,17 @@
   "peerDependencies": {
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^9.0.0 || ^10.0.0",
-    "@nx/jest": "23.2.0-beta.4"
+    "@nx/jest": "23.2.0-beta.6"
   },
   "dependencies": {
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~6.0.3",
-    "@nx/devkit": "23.2.0-beta.4",
-    "@nx/js": "23.2.0-beta.4"
+    "@nx/devkit": "23.2.0-beta.6",
+    "@nx/js": "23.2.0-beta.6"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.6"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {