@nx/eslint-plugin 22.6.0 → 22.7.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "22.6.0",
+  "version": "22.7.0-beta.0",
   "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": {
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.6.0",
-    "@nx/js": "22.6.0",
+    "@nx/devkit": "22.7.0-beta.0",
+    "@nx/js": "22.7.0-beta.0",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
@@ -47,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.6.0"
+    "nx": "22.7.0-beta.0"
   },
   "publishConfig": {
     "access": "public"

package/src/rules/enforce-module-boundaries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforce-module-boundaries.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/enforce-module-boundaries.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAGL,aAAa,EAmBd,MAAM,6BAA6B,CAAC;AAGrC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,cAAc,EAAE,aAAa,EAAE,CAAC;QAChC,6BAA6B,EAAE,OAAO,CAAC;QACvC,2BAA2B,EAAE,OAAO,CAAC;QACrC,2BAA2B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACrD,kCAAkC,EAAE,MAAM,EAAE,CAAC;QAC7C,yBAAyB,EAAE,OAAO,CAAC;QACnC,0BAA0B,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,4CAA4C,GAC5C,+BAA+B,GAC/B,4BAA4B,GAC5B,wBAAwB,GACxB,iBAAiB,GACjB,gBAAgB,GAChB,iCAAiC,GACjC,gCAAgC,GAChC,0CAA0C,GAC1C,gCAAgC,GAChC,sCAAsC,GACtC,0BAA0B,GAC1B,6BAA6B,GAC7B,kCAAkC,GAClC,4BAA4B,CAAC;AACjC,eAAO,MAAM,SAAS,8BAA8B,CAAC;;AAErD,wBAstBG"}
+{"version":3,"file":"enforce-module-boundaries.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/enforce-module-boundaries.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAGL,aAAa,EAmBd,MAAM,6BAA6B,CAAC;AAGrC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,cAAc,EAAE,aAAa,EAAE,CAAC;QAChC,6BAA6B,EAAE,OAAO,CAAC;QACvC,2BAA2B,EAAE,OAAO,CAAC;QACrC,2BAA2B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACrD,kCAAkC,EAAE,MAAM,EAAE,CAAC;QAC7C,yBAAyB,EAAE,OAAO,CAAC;QACnC,0BAA0B,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,4CAA4C,GAC5C,+BAA+B,GAC/B,4BAA4B,GAC5B,wBAAwB,GACxB,iBAAiB,GACjB,gBAAgB,GAChB,iCAAiC,GACjC,gCAAgC,GAChC,0CAA0C,GAC1C,gCAAgC,GAChC,sCAAsC,GACtC,0BAA0B,GAC1B,6BAA6B,GAC7B,kCAAkC,GAClC,4BAA4B,CAAC;AACjC,eAAO,MAAM,SAAS,8BAA8B,CAAC;;AAErD,wBA0wBG"}

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

@@ -147,17 +147,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
         }
         const workspaceLayout = global.workspaceLayout;
         const expandedIgnoreCircularDependencies = (0, graph_utils_1.expandIgnoredCircularDependencies)(ignoredCircularDependencies, projectGraph);
-        function run(node) {
-            // Ignoring ExportNamedDeclarations like:
-            // export class Foo {}
-            if (!node.source) {
-                return;
-            }
-            // accept only literals because template literals have no value
-            if (node.source.type !== utils_1.AST_NODE_TYPES.Literal) {
-                return;
-            }
-            const imp = node.source.value;
+        function run(imp, node) {
             // whitelisted import
             if (allow.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp))) {
                 return;
@@ -414,7 +404,9 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 }
             }
             // if we import a library using loadChildren, we should not import it using es6imports
-            if (!checkDynamicDependenciesExceptions.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp)) &&
+            // this check only applies to ES import/export statements, not require() calls
+            if (node.type !== utils_1.AST_NODE_TYPES.CallExpression &&
+                !checkDynamicDependenciesExceptions.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp)) &&
                 (0, runtime_lint_utils_1.hasStaticImportOfDynamicResource)(node, projectGraph, sourceProject.name, targetProject.name, imp, sourceFilePath)) {
                 const filesWithLazyImports = (0, graph_utils_1.findFilesWithDynamicImports)(projectFileMap, sourceProject.name, targetProject.name);
                 context.report({
@@ -517,18 +509,63 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 }
             }
         }
+        function getImportFromSourceNode(node) {
+            if (!node.source) {
+                return undefined;
+            }
+            if (node.source.type !== utils_1.AST_NODE_TYPES.Literal) {
+                return undefined;
+            }
+            return node.source.value;
+        }
+        function getImportFromRequireCall(node) {
+            const callee = node.callee;
+            const isRequire = callee.type === utils_1.AST_NODE_TYPES.Identifier && callee.name === 'require';
+            const isRequireResolve = callee.type === utils_1.AST_NODE_TYPES.MemberExpression &&
+                callee.object.type === utils_1.AST_NODE_TYPES.Identifier &&
+                callee.object.name === 'require' &&
+                callee.property.type === utils_1.AST_NODE_TYPES.Identifier &&
+                callee.property.name === 'resolve';
+            if (!isRequire && !isRequireResolve) {
+                return undefined;
+            }
+            const arg = node.arguments[0];
+            if (arg?.type === utils_1.AST_NODE_TYPES.Literal &&
+                typeof arg.value === 'string') {
+                return arg.value;
+            }
+            return undefined;
+        }
         return {
             ImportDeclaration(node) {
-                run(node);
+                const imp = getImportFromSourceNode(node);
+                if (imp !== undefined) {
+                    run(imp, node);
+                }
             },
             ImportExpression(node) {
-                run(node);
+                const imp = getImportFromSourceNode(node);
+                if (imp !== undefined) {
+                    run(imp, node);
+                }
             },
             ExportAllDeclaration(node) {
-                run(node);
+                const imp = getImportFromSourceNode(node);
+                if (imp !== undefined) {
+                    run(imp, node);
+                }
             },
             ExportNamedDeclaration(node) {
-                run(node);
+                const imp = getImportFromSourceNode(node);
+                if (imp !== undefined) {
+                    run(imp, node);
+                }
+            },
+            CallExpression(node) {
+                const imp = getImportFromRequireCall(node);
+                if (imp !== undefined) {
+                    run(imp, node);
+                }
             },
         };
     },