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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "20.2.0-beta.1",
+  "version": "20.2.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": {
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0-beta.1",
-    "@nx/js": "20.2.0-beta.1",
+    "@nx/devkit": "20.2.0-beta.2",
+    "@nx/js": "20.2.0-beta.2",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
     "chalk": "^4.1.0",

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

@@ -196,7 +196,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                                 const importsToRemap = [];
                                 for (const entryPointPath of indexTsPaths) {
                                     for (const importMember of imports) {
-                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, entryPointPath.path), sourceProject.data.sourceRoot);
+                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, entryPointPath.path));
                                         // we cannot remap, so leave it as is
                                         if (importPath) {
                                             importsToRemap.push({
@@ -273,7 +273,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                                 const importsToRemap = [];
                                 for (const entryPointPath of indexTsPaths) {
                                     for (const importMember of imports) {
-                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, entryPointPath), sourceProject.data.sourceRoot);
+                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, entryPointPath));
                                         if (importPath) {
                                             // resolve the import path
                                             const relativePath = (0, path_1.relative)((0, path_1.dirname)(fileName), (0, path_1.dirname)(importPath));

package/src/utils/ast-utils.d.ts

@@ -9,4 +9,4 @@ export declare function getBarrelEntryPointProjectNode(projectNode: ProjectGraph
     path: string;
     importScope: string;
 }[] | null;
-export declare function getRelativeImportPath(exportedMember: any, filePath: any, basePath: any): any;
+export declare function getRelativeImportPath(exportedMember: any, filePath: any): any;

package/src/utils/ast-utils.js

@@ -78,7 +78,7 @@ function hasMemberExport(exportedMember, filePath) {
     // search whether there is already an export with our node
     return ((0, js_1.findNodes)(sourceFile, ts.SyntaxKind.Identifier).filter((identifier) => identifier.text === exportedMember).length > 0);
 }
-function getRelativeImportPath(exportedMember, filePath, basePath) {
+function getRelativeImportPath(exportedMember, filePath) {
     const status = (0, fs_1.lstatSync)(filePath, {
         throwIfNoEntry: false,
     });
@@ -208,7 +208,7 @@ function getRelativeImportPath(exportedMember, filePath, basePath) {
                 moduleFilePath = (0, path_1.join)((0, path_1.dirname)(filePath), `${modulePath}/index.ts`);
             }
             if (hasMemberExport(exportedMember, moduleFilePath)) {
-                const foundFilePath = getRelativeImportPath(exportedMember, moduleFilePath, basePath);
+                const foundFilePath = getRelativeImportPath(exportedMember, moduleFilePath);
                 if (foundFilePath) {
                     return foundFilePath;
                 }