fix(linter): fix dependencies from projects on themselves when anothe…

…r circular dependency exists (#3163)
nrwl · Jun 12, 2020 · fc61fcb · fc61fcb
1 parent 0d9b8bb
commit fc61fcb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts b/packages/eslint-plugin-nx/src/rules/enforce-module-boundaries.ts
@@ -162,6 +162,11 @@ export default createESLintRule<Options, MessageIds>({
           return;
         }
 
+        // same project => allow
+        if (sourceProject === targetProject) {
+          return;
+        }
+
         // check constraints between libs and apps
         // check for circular dependency
         if (isCircular(projectGraph, sourceProject, targetProject)) {
@@ -176,11 +181,6 @@ export default createESLintRule<Options, MessageIds>({
           return;
         }
 
-        // same project => allow
-        if (sourceProject === targetProject) {
-          return;
-        }
-
         // cannot import apps
         if (targetProject.type !== ProjectType.lib) {
           context.report({

diff --git a/packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts b/packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts
@@ -154,19 +154,19 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
       return;
     }
 
+    // same project => allow
+    if (sourceProject === targetProject) {
+      super.visitImportDeclaration(node);
+      return;
+    }
+
     // check for circular dependency
     if (isCircular(this.projectGraph, sourceProject, targetProject)) {
       const error = `Circular dependency between "${sourceProject.name}" and "${targetProject.name}" detected`;
       this.addFailureAt(node.getStart(), node.getWidth(), error);
       return;
     }
 
-    // same project => allow
-    if (sourceProject === targetProject) {
-      super.visitImportDeclaration(node);
-      return;
-    }
-
     // cannot import apps
     if (targetProject.type !== ProjectType.lib) {
       this.addFailureAt(