@nx/eslint-plugin 18.1.0-beta.2 → 18.1.0-beta.4

package/migrations.json

@@ -8,7 +8,7 @@
     },
     "update-17-2-6-rename-workspace-rules": {
       "cli": "nx",
-      "version": "17-2-6-beta.1",
+      "version": "17.2.6-beta.1",
       "description": "Rename workspace rules from @nx/workspace/name to @nx/workspace-name",
       "implementation": "./src/migrations/update-17-2-6-rename-workspace-rules/rename-workspace-rules"
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "18.1.0-beta.2",
+  "version": "18.1.0-beta.4",
   "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": {
@@ -24,7 +24,7 @@
   },
   "homepage": "https://nx.dev",
   "peerDependencies": {
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/parser": "^6.13.2 || ^7.0.0",
     "eslint-config-prettier": "^9.0.0"
   },
   "peerDependenciesMeta": {
@@ -33,8 +33,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "18.1.0-beta.2",
-    "@nx/js": "18.1.0-beta.2",
+    "@nx/devkit": "18.1.0-beta.4",
+    "@nx/js": "18.1.0-beta.4",
     "@typescript-eslint/type-utils": "^6.13.2",
     "@typescript-eslint/utils": "^6.13.2",
     "chalk": "^4.1.0",
@@ -42,7 +42,7 @@
     "jsonc-eslint-parser": "^2.1.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "@nrwl/eslint-plugin-nx": "18.1.0-beta.2"
+    "@nrwl/eslint-plugin-nx": "18.1.0-beta.4"
   },
   "publishConfig": {
     "access": "public"

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

@@ -359,10 +359,8 @@ exports.default = utils_2.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 }
             }
             // if we import a library using loadChildren, we should not import it using es6imports
-            if (node.type === utils_1.AST_NODE_TYPES.ImportDeclaration &&
-                node.importKind !== 'type' &&
-                !checkDynamicDependenciesExceptions.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp)) &&
-                (0, runtime_lint_utils_1.onlyLoadChildren)(projectGraph, sourceProject.name, targetProject.name, [])) {
+            if (!checkDynamicDependenciesExceptions.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp)) &&
+                (0, runtime_lint_utils_1.hasStaticImportOfDynamicResource)(node, projectGraph, sourceProject.name, targetProject.name)) {
                 const filesWithLazyImports = (0, graph_utils_1.findFilesWithDynamicImports)(projectFileMap, sourceProject.name, targetProject.name);
                 context.report({
                     data: {

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

@@ -1,6 +1,7 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphExternalNode, ProjectGraphProjectNode } from '@nx/devkit';
 import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
 import { TargetProjectLocator } from '@nx/js/src/internal';
+import { TSESTree } from '@typescript-eslint/utils';
 export type Deps = {
     [projectName: string]: ProjectGraphDependency[];
 };
@@ -39,7 +40,7 @@ export declare function isAbsoluteImportIntoAnotherProject(imp: string, workspac
 }): boolean;
 export declare function findProjectUsingImport(projectGraph: ProjectGraph, targetProjectLocator: TargetProjectLocator, filePath: string, imp: string): ProjectGraphProjectNode | ProjectGraphExternalNode;
 export declare function findConstraintsFor(depConstraints: DepConstraint[], sourceProject: ProjectGraphProjectNode): DepConstraint[];
-export declare function onlyLoadChildren(graph: ProjectGraph, sourceProjectName: string, targetProjectName: string, visited: string[]): any;
+export declare function hasStaticImportOfDynamicResource(node: TSESTree.ImportDeclaration | TSESTree.ImportExpression | TSESTree.ExportAllDeclaration | TSESTree.ExportNamedDeclaration, graph: ProjectGraph, sourceProjectName: string, targetProjectName: string): boolean;
 export declare function getSourceFilePath(sourceFileName: string, projectPath: string): string;
 export declare function hasBannedImport(source: ProjectGraphProjectNode, target: ProjectGraphExternalNode, depConstraints: DepConstraint[], imp: string): DepConstraint | undefined;
 /**

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.appIsMFERemote = exports.belongsToDifferentNgEntryPoint = exports.groupImports = exports.isTerminalRun = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.onlyLoadChildren = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findProject = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.isComboDepConstraint = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
+exports.appIsMFERemote = exports.belongsToDifferentNgEntryPoint = exports.groupImports = exports.isTerminalRun = exports.hasBuildExecutor = exports.isDirectDependency = exports.hasBannedDependencies = exports.findTransitiveExternalDependencies = exports.hasBannedImport = exports.getSourceFilePath = exports.hasStaticImportOfDynamicResource = exports.findConstraintsFor = exports.findProjectUsingImport = exports.isAbsoluteImportIntoAnotherProject = exports.findProject = exports.getTargetProjectBasedOnRelativeImport = exports.isRelative = exports.matchImportWithWildcard = exports.findDependenciesWithTags = exports.isComboDepConstraint = exports.hasNoneOfTheseTags = exports.stringifyTags = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const path_1 = require("path");
@@ -10,6 +10,7 @@ const fileutils_1 = require("nx/src/utils/fileutils");
 const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/src/internal");
+const utils_1 = require("@typescript-eslint/utils");
 function stringifyTags(tags) {
     return tags.map((t) => `"${t}"`).join(', ');
 }
@@ -124,21 +125,31 @@ function findConstraintsFor(depConstraints, sourceProject) {
     });
 }
 exports.findConstraintsFor = findConstraintsFor;
+function hasStaticImportOfDynamicResource(node, graph, sourceProjectName, targetProjectName) {
+    if (node.type !== utils_1.AST_NODE_TYPES.ImportDeclaration ||
+        node.importKind === 'type') {
+        return false;
+    }
+    return onlyLoadChildren(graph, sourceProjectName, targetProjectName, []);
+}
+exports.hasStaticImportOfDynamicResource = hasStaticImportOfDynamicResource;
 function onlyLoadChildren(graph, sourceProjectName, targetProjectName, visited) {
-    if (visited.indexOf(sourceProjectName) > -1)
+    if (visited.indexOf(sourceProjectName) > -1) {
         return false;
+    }
     return ((graph.dependencies[sourceProjectName] || []).filter((d) => {
-        if (d.type !== devkit_1.DependencyType.dynamic)
+        if (d.type !== devkit_1.DependencyType.dynamic) {
             return false;
-        if (d.target === targetProjectName)
+        }
+        if (d.target === targetProjectName) {
             return true;
+        }
         return onlyLoadChildren(graph, d.target, targetProjectName, [
             ...visited,
             sourceProjectName,
         ]);
     }).length > 0);
 }
-exports.onlyLoadChildren = onlyLoadChildren;
 function getSourceFilePath(sourceFileName, projectPath) {
     const normalizedProjectPath = (0, devkit_1.normalizePath)(projectPath);
     const normalizedSourceFileName = (0, devkit_1.normalizePath)(sourceFileName);