@nx/eslint-plugin 23.2.0-beta.4 → 23.2.0-beta.5

package/dist/src/rules/enforce-module-boundaries.js

@@ -4,13 +4,12 @@ exports.RULE_NAME = void 0;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("@typescript-eslint/utils");
 const internal_1 = require("@nx/js/internal");
-const fileutils_1 = require("nx/src/utils/fileutils");
 const path_1 = require("path");
 const ast_utils_1 = require("../utils/ast-utils");
 const graph_utils_1 = require("../utils/graph-utils");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
 const runtime_lint_utils_1 = require("../utils/runtime-lint-utils");
-const project_graph_1 = require("nx/src/config/project-graph");
+const internal_2 = require("@nx/devkit/internal");
 exports.RULE_NAME = 'enforce-module-boundaries';
 exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl/nx/blob/${devkit_1.NX_VERSION}/docs/generated/packages/eslint-plugin/documents/enforce-module-boundaries.md`)({
     name: exports.RULE_NAME,
@@ -236,7 +235,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                     (0, runtime_lint_utils_1.findProjectUsingImport)(projectGraph, targetProjectLocator, sourceFilePath, imp);
             if (!targetProject) {
                 // non-project imports cannot use relative or absolute paths
-                if ((0, fileutils_1.isRelativePath)(imp) || imp.startsWith('/')) {
+                if ((0, internal_2.isRelativePath)(imp) || imp.startsWith('/')) {
                     context.report({
                         node,
                         messageId: 'noRelativeOrAbsoluteExternals',
@@ -264,7 +263,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             if (sourceProject === targetProject &&
                 !(0, graph_utils_1.circularPathHasPair)([sourceProject, targetProject], expandedIgnoreCircularDependencies)) {
                 if (!allowCircularSelfDependency &&
-                    !(0, fileutils_1.isRelativePath)(imp) &&
+                    !(0, internal_2.isRelativePath)(imp) &&
                     !(0, runtime_lint_utils_1.belongsToDifferentEntryPoint)(imp, sourceFilePath, sourceProject.data.root)) {
                     context.report({
                         node,
@@ -343,7 +342,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 }
                 return;
             }
-            if (!(0, project_graph_1.isProjectGraphProjectNode)(targetProject)) {
+            if (!(0, internal_2.isProjectGraphProjectNode)(targetProject)) {
                 return;
             }
             targetProject = targetProject;

package/dist/src/utils/graph-utils.js

@@ -7,8 +7,8 @@ exports.circularPathHasPair = circularPathHasPair;
 exports.findFilesInCircularPath = findFilesInCircularPath;
 exports.findFilesWithDynamicImports = findFilesWithDynamicImports;
 exports.expandIgnoredCircularDependencies = expandIgnoredCircularDependencies;
-const project_graph_1 = require("nx/src/config/project-graph");
-const find_matching_projects_1 = require("nx/src/utils/find-matching-projects");
+const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const reach = {
     graph: null,
     matrix: null,
@@ -125,7 +125,7 @@ function findFilesInCircularPath(projectFileMap, circularPath) {
         const next = circularPath[i + 1].name;
         const files = projectFileMap[circularPath[i].name] || [];
         filePathChain.push(files
-            .filter((file) => file.deps && file.deps.find((d) => (0, project_graph_1.fileDataDepTarget)(d) === next))
+            .filter((file) => file.deps && file.deps.find((d) => (0, internal_1.fileDataDepTarget)(d) === next))
             .map((file) => file.file));
     }
     return filePathChain;
@@ -135,8 +135,8 @@ function findFilesWithDynamicImports(projectFileMap, sourceProjectName, targetPr
     projectFileMap[sourceProjectName].forEach((file) => {
         if (!file.deps)
             return;
-        if (file.deps.some((d) => (0, project_graph_1.fileDataDepTarget)(d) === targetProjectName &&
-            (0, project_graph_1.fileDataDepType)(d) === project_graph_1.DependencyType.dynamic)) {
+        if (file.deps.some((d) => (0, internal_1.fileDataDepTarget)(d) === targetProjectName &&
+            (0, internal_1.fileDataDepType)(d) === devkit_1.DependencyType.dynamic)) {
             files.push(file);
         }
     });
@@ -145,8 +145,8 @@ function findFilesWithDynamicImports(projectFileMap, sourceProjectName, targetPr
 function expandIgnoredCircularDependencies(ignoredCircularDependencies, projectGraph) {
     const allowed = new Map();
     for (const [a, b] of ignoredCircularDependencies) {
-        const setA = new Set((0, find_matching_projects_1.findMatchingProjects)([a], projectGraph.nodes));
-        const setB = new Set((0, find_matching_projects_1.findMatchingProjects)([b], projectGraph.nodes));
+        const setA = new Set((0, internal_1.findMatchingProjects)([a], projectGraph.nodes));
+        const setB = new Set((0, internal_1.findMatchingProjects)([b], projectGraph.nodes));
         for (const projectA of setA) {
             if (!allowed.has(projectA)) {
                 allowed.set(projectA, new Set());

package/dist/src/utils/package-json-utils.d.ts

@@ -1,4 +1,4 @@
-import type { PackageJson } from 'nx/src/utils/package-json';
+import { type PackageJson } from '@nx/devkit/internal';
 export declare function getAllDependencies(packageJson: PackageJson): Record<string, string>;
 export declare function getProductionDependencies(packageJson: PackageJson): Record<string, string>;
 export declare function getPackageJson(path: string): PackageJson;

package/dist/src/utils/project-graph-utils.d.ts

@@ -1,6 +1,6 @@
 import { ProjectFileMap, ProjectGraph } from '@nx/devkit';
-import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
 import { TargetProjectLocator } from '@nx/js/internal';
+import { ProjectRootMappings } from '@nx/devkit/internal';
 export declare function ensureGlobalProjectGraph(ruleName: string): void;
 export declare function readProjectGraph(ruleName: string): {
     projectGraph: ProjectGraph;

package/dist/src/utils/project-graph-utils.js

@@ -6,10 +6,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const runtime_lint_utils_1 = require("./runtime-lint-utils");
 const picocolors_1 = tslib_1.__importDefault(require("picocolors"));
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-const configuration_1 = require("nx/src/config/configuration");
 const internal_1 = require("@nx/js/internal");
-const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
+const internal_2 = require("@nx/devkit/internal");
 function ensureGlobalProjectGraph(ruleName) {
     /**
      * Only reuse graph when running from terminal
@@ -19,7 +17,7 @@ function ensureGlobalProjectGraph(ruleName) {
         !globalThis.projectRootMappings ||
         !globalThis.projectFileMap ||
         !(0, runtime_lint_utils_1.isTerminalRun)()) {
-        const nxJson = (0, configuration_1.readNxJson)();
+        const nxJson = (0, internal_2.readNxJsonFromDisk)();
         globalThis.workspaceLayout = nxJson.workspaceLayout;
         /**
          * Because there are a number of ways in which the rule can be invoked (executor vs ESLint CLI vs IDE Plugin),
@@ -28,8 +26,8 @@ function ensureGlobalProjectGraph(ruleName) {
         try {
             const projectGraph = (0, devkit_1.readCachedProjectGraph)();
             globalThis.projectGraph = projectGraph;
-            globalThis.projectRootMappings = (0, find_project_for_path_1.createProjectRootMappings)(projectGraph.nodes);
-            globalThis.projectFileMap = (0, nx_deps_cache_1.readFileMapCache)().fileMap.projectFileMap;
+            globalThis.projectRootMappings = (0, internal_2.createProjectRootMappings)(projectGraph.nodes);
+            globalThis.projectFileMap = (0, internal_2.readFileMapCache)().fileMap.projectFileMap;
             globalThis.targetProjectLocator = new internal_1.TargetProjectLocator(projectGraph.nodes, projectGraph.externalNodes);
         }
         catch {

package/dist/src/utils/runtime-lint-utils.d.ts

@@ -1,7 +1,7 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphExternalNode, ProjectGraphProjectNode } from '@nx/devkit';
 import { TargetProjectLocator } from '@nx/js/internal';
 import { TSESLint, TSESTree } from '@typescript-eslint/utils';
-import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
+import { ProjectRootMappings } from '@nx/devkit/internal';
 export type Deps = {
     [projectName: string]: ProjectGraphDependency[];
 };

package/dist/src/utils/runtime-lint-utils.js

@@ -30,9 +30,8 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const utils_1 = require("@typescript-eslint/utils");
 const path = tslib_1.__importStar(require("node:path"));
-const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
-const fileutils_1 = require("nx/src/utils/fileutils");
 const graph_utils_1 = require("./graph-utils");
+const internal_1 = require("@nx/devkit/internal");
 function stringifyTags(tags) {
     return tags.map((t) => `"${t}"`).join(', ');
 }
@@ -114,7 +113,7 @@ function getTargetProjectBasedOnRelativeImport(imp, projectPath, projectGraph, p
     return findProject(projectGraph, projectRootMappings, targetFile);
 }
 function findProject(projectGraph, projectRootMappings, sourceFilePath) {
-    return projectGraph.nodes[(0, find_project_for_path_1.findProjectForPath)(sourceFilePath, projectRootMappings)];
+    return projectGraph.nodes[(0, internal_1.findProjectForPath)(sourceFilePath, projectRootMappings)];
 }
 function isAbsoluteImportIntoAnotherProject(imp, workspaceLayout = { libsDir: 'libs', appsDir: 'apps' }) {
     return (imp.startsWith(`${workspaceLayout.libsDir}/`) ||
@@ -252,7 +251,7 @@ function isDirectDependency(source, target) {
         packageExistsInPackageJson(target.data.packageName, source.data.root));
 }
 function packageExistsInPackageJson(packageName, projectRoot) {
-    const content = (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, projectRoot, 'package.json'));
+    const content = (0, internal_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, projectRoot, 'package.json'));
     if (content) {
         const { dependencies, devDependencies, peerDependencies } = (0, devkit_1.parseJson)(content);
         if (dependencies && dependencies[packageName]) {
@@ -356,7 +355,7 @@ function getEntryPoint(file, projectRoot) {
         }
         // for Angular we need to find closest existing ng-package.json
         // in order to determine if the file matches the secondary entry point
-        const ngPackageContent = (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, parent, 'ng-package.json'));
+        const ngPackageContent = (0, internal_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, parent, 'ng-package.json'));
         if (ngPackageContent) {
             // https://github.com/ng-packagr/ng-packagr/blob/23c718d04eea85e015b4c261310b7bd0c39e5311/src/ng-package.schema.json#L54
             const entryFile = (0, devkit_1.parseJson)(ngPackageContent)?.lib?.entryFile ?? 'src/public_api.ts';
@@ -367,7 +366,7 @@ function getEntryPoint(file, projectRoot) {
     return undefined;
 }
 function getPackageEntryPoints(projectRoot) {
-    const packageContent = (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, projectRoot, 'package.json'));
+    const packageContent = (0, internal_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, projectRoot, 'package.json'));
     if (!packageContent) {
         return [];
     }
@@ -409,8 +408,8 @@ function parseExports(exports, projectRoot, entryPaths, basePath = '.') {
  * Returns true if the given project contains MFE config with "exposes:" section
  */
 function appIsMFERemote(project) {
-    const mfeConfig = (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, project.data.root, 'module-federation.config.js')) ||
-        (0, fileutils_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, project.data.root, 'module-federation.config.ts'));
+    const mfeConfig = (0, internal_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, project.data.root, 'module-federation.config.js')) ||
+        (0, internal_1.readFileIfExisting)(path.join(devkit_1.workspaceRoot, project.data.root, 'module-federation.config.ts'));
     if (mfeConfig) {
         return !!mfeConfig.match(/('|")?exposes('|")?:/);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.0-beta.5",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -101,11 +101,11 @@
     "picocolors": "^1.1.0",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.2.0-beta.4",
-    "@nx/js": "23.2.0-beta.4"
+    "@nx/js": "23.2.0-beta.5",
+    "@nx/devkit": "23.2.0-beta.5"
   },
   "devDependencies": {
-    "nx": "23.2.0-beta.4"
+    "nx": "23.2.0-beta.5"
   },
   "publishConfig": {
     "access": "public"