@nx/eslint-plugin 21.0.0-beta.1 → 21.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.2",
   "private": false,
   "description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
   "repository": {
@@ -26,7 +26,7 @@
   "homepage": "https://nx.dev",
   "peerDependencies": {
     "@typescript-eslint/parser": "^6.13.2 || ^7.0.0 || ^8.0.0",
-    "eslint-config-prettier": "^9.0.0"
+    "eslint-config-prettier": "^10.0.0"
   },
   "peerDependenciesMeta": {
     "eslint-config-prettier": {
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.1",
-    "@nx/js": "21.0.0-beta.1",
+    "@nx/devkit": "21.0.0-beta.2",
+    "@nx/js": "21.0.0-beta.2",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
     "chalk": "^4.1.0",

package/src/rules/dependency-checks.d.ts

@@ -9,6 +9,7 @@ export type Options = [
         ignoredFiles?: string[];
         includeTransitiveDependencies?: boolean;
         useLocalPathsForWorkspaceDependencies?: boolean;
+        runtimeHelpers?: string[];
     }
 ];
 export type MessageIds = 'missingDependency' | 'obsoleteDependency' | 'versionMismatch' | 'missingDependencySection';

package/src/rules/dependency-checks.js

@@ -30,6 +30,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                     checkVersionMismatches: { type: 'boolean' },
                     includeTransitiveDependencies: { type: 'boolean' },
                     useLocalPathsForWorkspaceDependencies: { type: 'boolean' },
+                    runtimeHelpers: { type: 'array', items: { type: 'string' } },
                 },
                 additionalProperties: false,
             },
@@ -51,9 +52,10 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             ignoredFiles: [],
             includeTransitiveDependencies: false,
             useLocalPathsForWorkspaceDependencies: false,
+            runtimeHelpers: [],
         },
     ],
-    create(context, [{ buildTargets, ignoredDependencies, ignoredFiles, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, includeTransitiveDependencies, useLocalPathsForWorkspaceDependencies, },]) {
+    create(context, [{ buildTargets, ignoredDependencies, ignoredFiles, checkMissingDependencies, checkObsoleteDependencies, checkVersionMismatches, includeTransitiveDependencies, useLocalPathsForWorkspaceDependencies, runtimeHelpers, },]) {
         if (!(0, runtime_lint_utils_1.getParserServices)(context).isJSON) {
             return {};
         }
@@ -83,6 +85,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             includeTransitiveDependencies,
             ignoredFiles,
             useLocalPathsForWorkspaceDependencies,
+            runtimeHelpers,
         });
         const expectedDependencyNames = Object.keys(npmDependencies);
         const packageJson = JSON.parse(context.sourceCode.getText());
@@ -129,7 +132,13 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 packageRange.startsWith('file:') ||
                 npmDependencies[packageName] === '*' ||
                 packageRange === '*' ||
-                packageRange === 'workspace:*' ||
+                packageRange.startsWith('workspace:') ||
+                /**
+                 * Catalogs can be named, or left unnamed
+                 * So just checking up until the : will catch both cases
+                 * e.g. catalog:some-catalog or catalog:
+                 */
+                packageRange.startsWith('catalog:') ||
                 (0, semver_1.satisfies)(npmDependencies[packageName], packageRange, {
                     includePrerelease: true,
                 })) {

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

@@ -10,6 +10,7 @@ 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");
 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,
@@ -328,6 +329,10 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 }
                 return;
             }
+            if (!(0, project_graph_1.isProjectGraphProjectNode)(targetProject)) {
+                return;
+            }
+            targetProject = targetProject;
             // check constraints between libs and apps
             // check for circular dependency
             const circularPath = (0, graph_utils_1.checkCircularPath)(projectGraph, sourceProject, targetProject);