@nx/eslint-plugin 23.0.0-beta.11 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "23.0.0-beta.11",
+  "version": "23.0.0-beta.13",
   "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": {
@@ -35,8 +35,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.11",
-    "@nx/js": "23.0.0-beta.11",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
@@ -48,7 +48,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.11"
+    "nx": "23.0.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/src/resolve-workspace-rules.js

@@ -4,7 +4,7 @@ exports.workspaceRules = void 0;
 exports.loadWorkspaceRules = loadWorkspaceRules;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const internal_2 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/internal");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const constants_1 = require("./constants");

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

@@ -1 +1 @@
-{"version":3,"file":"dependency-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/dependency-checks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAmBvD,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,6BAA6B,CAAC,EAAE,OAAO,CAAC;QACxC,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,uBAAuB,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;KACrD;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;;;AAE7C,wBAkgBG"}
+{"version":3,"file":"dependency-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/dependency-checks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAmBvD,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,wBAAwB,CAAC,EAAE,OAAO,CAAC;QACnC,yBAAyB,CAAC,EAAE,OAAO,CAAC;QACpC,sBAAsB,CAAC,EAAE,OAAO,CAAC;QACjC,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;QAC/B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,6BAA6B,CAAC,EAAE,OAAO,CAAC;QACxC,qCAAqC,CAAC,EAAE,OAAO,CAAC;QAChD,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;QAC1B,uBAAuB,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;KACrD;CACF,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB,mBAAmB,GACnB,oBAAoB,GACpB,iBAAiB,GACjB,0BAA0B,GAC1B,yBAAyB,CAAC;AAE9B,eAAO,MAAM,SAAS,sBAAsB,CAAC;;;;AAE7C,wBAghBG"}

package/src/rules/dependency-checks.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULE_NAME = void 0;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const find_npm_dependencies_1 = require("@nx/js/src/utils/find-npm-dependencies");
+const internal_2 = require("@nx/js/internal");
 const utils_1 = require("@typescript-eslint/utils");
 const path_1 = require("path");
 const semver_1 = require("semver");
@@ -89,7 +89,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             return {};
         }
         const rootPackageJson = (0, package_json_utils_1.getPackageJson)((0, path_1.join)(devkit_1.workspaceRoot, 'package.json'));
-        const npmDependencies = (0, find_npm_dependencies_1.findNpmDependencies)(devkit_1.workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, // TODO: What if child library has a build target different from the parent?
+        const npmDependencies = (0, internal_2.findNpmDependencies)(devkit_1.workspaceRoot, sourceProject, projectGraph, projectFileMap, buildTarget, // TODO: What if child library has a build target different from the parent?
         {
             includeTransitiveDependencies,
             ignoredFiles,
@@ -97,6 +97,17 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             runtimeHelpers,
         });
         const expectedDependencyNames = Object.keys(npmDependencies);
+        // Packages eligible for `workspace:*` rewrites under
+        // `peerDepsVersionStrategy: 'workspace'`. Must be both a workspace project
+        // and registered in the package manager's workspaces — otherwise
+        // `workspace:*` won't resolve at install time.
+        const workspacePackageNames = new Set();
+        for (const node of Object.values(projectGraph.nodes)) {
+            const js = node.data?.metadata?.js;
+            if (js?.packageName && js.isInPackageManagerWorkspaces) {
+                workspacePackageNames.add(js.packageName);
+            }
+        }
         const packageJson = JSON.parse(context.sourceCode.getText());
         const projPackageJsonDeps = (0, package_json_utils_1.getProductionDependencies)(packageJson);
         const rootPackageJsonDeps = (0, package_json_utils_1.getAllDependencies)(rootPackageJson);
@@ -189,7 +200,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                     fix(fixer) {
                         missingDeps.forEach((d) => {
                             if (dependencySection === 'peerDependencies' &&
-                                peerDepsVersionStrategy === 'workspace') {
+                                peerDepsVersionStrategy === 'workspace' &&
+                                workspacePackageNames.has(d)) {
                                 projPackageJsonDeps[d] = WORKSPACE_VERSION_WILDCARD;
                             }
                             else {
@@ -237,7 +249,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             const dependencySection = getDependencySection(node);
             if (dependencySection === 'peerDependencies' &&
                 peerDepsVersionStrategy === 'workspace' &&
-                !packageRange.startsWith('workspace:')) {
+                !packageRange.startsWith('workspace:') &&
+                workspacePackageNames.has(packageName)) {
                 context.report({
                     node: node,
                     messageId: 'versionMismatch',

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RULE_NAME = void 0;
 const devkit_1 = require("@nx/devkit");
 const utils_1 = require("@typescript-eslint/utils");
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const fileutils_1 = require("nx/src/utils/fileutils");
 const path_1 = require("path");
 const ast_utils_1 = require("../utils/ast-utils");

package/src/rules/nx-plugin-checks.d.ts

@@ -14,7 +14,7 @@ type NormalizedOptions = Options[0] & {
     rootDir?: string;
     outDir?: string;
 };
-export type MessageIds = 'missingRequiredSchema' | 'invalidSchemaPath' | 'missingImplementation' | 'invalidImplementationPath' | 'invalidImplementationModule' | 'unableToReadImplementationExports' | 'invalidVersion' | 'missingVersion' | 'noGeneratorsOrSchematicsFound' | 'noExecutorsOrBuildersFound' | 'valueShouldBeObject';
+export type MessageIds = 'missingRequiredSchema' | 'invalidSchemaPath' | 'missingImplementation' | 'invalidImplementationPath' | 'invalidImplementationModule' | 'unableToReadImplementationExports' | 'invalidPromptPath' | 'invalidVersion' | 'missingVersion' | 'noGeneratorsOrSchematicsFound' | 'noExecutorsOrBuildersFound' | 'valueShouldBeObject';
 export declare const RULE_NAME = "nx-plugin-checks";
 declare const _default: TSESLint.RuleModule<MessageIds, Options, unknown, TSESLint.RuleListener> & {
     name: string;
@@ -24,6 +24,7 @@ export declare function checkCollectionFileNode(baseNode: AST.JSONObjectExpressi
 export declare function checkCollectionNode(baseNode: AST.JSONObjectExpression, mode: 'migration' | 'generator' | 'executor', context: TSESLint.RuleContext<MessageIds, Options>, options: NormalizedOptions): void;
 export declare function validateEntry(baseNode: AST.JSONObjectExpression, key: string, mode: 'migration' | 'generator' | 'executor', context: TSESLint.RuleContext<MessageIds, Options>, options: NormalizedOptions): void;
 export declare function validateImplementationNode(implementationNode: AST.JSONProperty, key: string, context: TSESLint.RuleContext<MessageIds, Options>, options: NormalizedOptions): void;
+export declare function validatePromptNode(promptNode: AST.JSONProperty, key: string, context: TSESLint.RuleContext<MessageIds, Options>, options: NormalizedOptions): void;
 export declare function validatePackageGroup(baseNode: AST.JSONObjectExpression, context: TSESLint.RuleContext<MessageIds, Options>): void;
 export declare function validateVersionJsonExpression(node: AST.JSONExpression, context: TSESLint.RuleContext<MessageIds, Options>): string | boolean;
 export declare function checkIfIdentifierIsFunction(filePath: string, identifier: string): boolean;

package/src/rules/nx-plugin-checks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-plugin-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/nx-plugin-checks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAoB/C,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,qBAAqB,EAAE,MAAM,EAAE,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,MAAM,MAAM,UAAU,GAClB,uBAAuB,GACvB,mBAAmB,GACnB,uBAAuB,GACvB,2BAA2B,GAC3B,6BAA6B,GAC7B,mCAAmC,GACnC,gBAAgB,GAChB,gBAAgB,GAChB,+BAA+B,GAC/B,4BAA4B,GAC5B,qBAAqB,CAAC;AAE1B,eAAO,MAAM,SAAS,qBAAqB,CAAC;;;;AAE5C,wBA2HG;AAqDH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAkD3B;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAqB3B;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,GACzB,IAAI,CAsGN;AAED,wBAAgB,0BAA0B,CACxC,kBAAkB,EAAE,GAAG,CAAC,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAqE3B;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,QAsEnD;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,oBASnD;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAgCT"}
+{"version":3,"file":"nx-plugin-checks.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/nx-plugin-checks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAoB/C,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,qBAAqB,EAAE,MAAM,EAAE,CAAC;QAChC,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB;CACF,CAAC;AAEF,KAAK,iBAAiB,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAWF,MAAM,MAAM,UAAU,GAClB,uBAAuB,GACvB,mBAAmB,GACnB,uBAAuB,GACvB,2BAA2B,GAC3B,6BAA6B,GAC7B,mCAAmC,GACnC,mBAAmB,GACnB,gBAAgB,GAChB,gBAAgB,GAChB,+BAA+B,GAC/B,4BAA4B,GAC5B,qBAAqB,CAAC;AAE1B,eAAO,MAAM,SAAS,qBAAqB,CAAC;;;;AAE5C,wBA4HG;AAqDH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAkD3B;AAED,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAqB3B;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,UAAU,EAC5C,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,GACzB,IAAI,CA4GN;AAED,wBAAgB,0BAA0B,CACxC,kBAAkB,EAAE,GAAG,CAAC,YAAY,EACpC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAqE3B;AAED,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,GAAG,CAAC,YAAY,EAC5B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAClD,OAAO,EAAE,iBAAiB,QAuC3B;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,GAAG,CAAC,oBAAoB,EAClC,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,QAsEnD;AAED,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,GAAG,CAAC,cAAc,EACxB,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,oBASnD;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,OAAO,CAgCT"}

package/src/rules/nx-plugin-checks.js

@@ -5,6 +5,7 @@ exports.checkCollectionFileNode = checkCollectionFileNode;
 exports.checkCollectionNode = checkCollectionNode;
 exports.validateEntry = validateEntry;
 exports.validateImplementationNode = validateImplementationNode;
+exports.validatePromptNode = validatePromptNode;
 exports.validatePackageGroup = validatePackageGroup;
 exports.validateVersionJsonExpression = validateVersionJsonExpression;
 exports.checkIfIdentifierIsFunction = checkIfIdentifierIsFunction;
@@ -14,7 +15,7 @@ const fs_1 = require("fs");
 const tsquery_1 = require("@phenomnomnominal/tsquery");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const path = tslib_1.__importStar(require("path"));
 const semver_1 = require("semver");
 const project_graph_utils_1 = require("../utils/project-graph-utils");
@@ -79,6 +80,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => ``)({
             valueShouldBeObject: '{{ key }} should be an object',
             missingRequiredSchema: '{{ key }}: Missing required property - `schema`',
             missingImplementation: '{{ key }}: Missing required property - `implementation`',
+            invalidPromptPath: '{{ key }}: Prompt path should point to a valid file',
             missingVersion: '{{ key }}: Missing required property - `version`',
         },
     },
@@ -265,7 +267,8 @@ function validateEntry(baseNode, key, mode, context, options) {
     }
     const implementationNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' &&
         (x.key.value === 'implementation' || x.key.value === 'factory'));
-    if (!implementationNode) {
+    const promptNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'prompt');
+    if (!implementationNode && !(mode === 'migration' && promptNode)) {
         context.report({
             messageId: 'missingImplementation',
             data: {
@@ -274,9 +277,12 @@ function validateEntry(baseNode, key, mode, context, options) {
             node: baseNode,
         });
     }
-    else {
+    else if (implementationNode) {
         validateImplementationNode(implementationNode, key, context, options);
     }
+    if (mode === 'migration' && promptNode) {
+        validatePromptNode(promptNode, key, context, options);
+    }
     if (mode === 'migration') {
         const versionNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' && x.key.value === 'version');
         if (!versionNode) {
@@ -373,6 +379,40 @@ function validateImplementationNode(implementationNode, key, context, options) {
         }
     }
 }
+function validatePromptNode(promptNode, key, context, options) {
+    if (promptNode.value.type !== 'JSONLiteral' ||
+        typeof promptNode.value.value !== 'string') {
+        context.report({
+            messageId: 'invalidPromptPath',
+            data: {
+                key,
+            },
+            node: promptNode.value,
+        });
+    }
+    else {
+        const promptPath = path.join(path.dirname(context.filename ?? context.getFilename()), promptNode.value.value);
+        let resolvedPath;
+        if ((0, fs_1.existsSync)(promptPath)) {
+            resolvedPath = promptPath;
+        }
+        else if (options.outDir && options.rootDir) {
+            const mapped = promptPath.replace(options.outDir, options.rootDir);
+            if ((0, fs_1.existsSync)(mapped)) {
+                resolvedPath = mapped;
+            }
+        }
+        if (!resolvedPath) {
+            context.report({
+                messageId: 'invalidPromptPath',
+                data: {
+                    key,
+                },
+                node: promptNode.value,
+            });
+        }
+    }
+}
 function validatePackageGroup(baseNode, context) {
     const migrationsNode = baseNode.properties.find((x) => x.key.type === 'JSONLiteral' &&
         x.value.type === 'JSONObjectExpression' &&

package/src/utils/ast-utils.js

@@ -5,7 +5,7 @@ exports.getBarrelEntryPointProjectNode = getBarrelEntryPointProjectNode;
 exports.getRelativeImportPath = getRelativeImportPath;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const type_utils_1 = require("@typescript-eslint/type-utils");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -61,7 +61,7 @@ function getBarrelEntryPointProjectNode(projectNode) {
             const sourceFolderPaths = tsConfigBase.compilerOptions.paths[entry];
             return sourceFolderPaths.some((sourceFolderPath) => {
                 const normalizedPath = sourceFolderPath.replace(/^\.\//, '');
-                const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(projectNode.data);
+                const sourceRoot = (0, internal_1.getProjectSourceRoot)(projectNode.data);
                 return (normalizedPath === sourceRoot ||
                     normalizedPath.indexOf(`${sourceRoot}/`) === 0);
             });

package/src/utils/project-graph-utils.d.ts

@@ -1,6 +1,6 @@
 import { ProjectFileMap, ProjectGraph } from '@nx/devkit';
 import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
-import { TargetProjectLocator } from '@nx/js/src/internal';
+import { TargetProjectLocator } from '@nx/js/internal';
 export declare function ensureGlobalProjectGraph(ruleName: string): void;
 export declare function readProjectGraph(ruleName: string): {
     projectGraph: ProjectGraph;

package/src/utils/project-graph-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"project-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/utils/project-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EAEb,MAAM,YAAY,CAAC;AAGpB,OAAO,EAEL,mBAAmB,EACpB,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAG3D,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,QAsCxD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG;IAClD,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C,CAQA"}
+{"version":3,"file":"project-graph-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/utils/project-graph-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EAEb,MAAM,YAAY,CAAC;AAGpB,OAAO,EAEL,mBAAmB,EACpB,MAAM,kDAAkD,CAAC;AAE1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAGvD,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,QAsCxD;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG;IAClD,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,oBAAoB,EAAE,oBAAoB,CAAC;CAC5C,CAQA"}

package/src/utils/project-graph-utils.js

@@ -7,7 +7,7 @@ const runtime_lint_utils_1 = require("./runtime-lint-utils");
 const chalk = require("chalk");
 const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 const configuration_1 = require("nx/src/config/configuration");
-const internal_1 = require("@nx/js/src/internal");
+const internal_1 = require("@nx/js/internal");
 const nx_deps_cache_1 = require("nx/src/project-graph/nx-deps-cache");
 function ensureGlobalProjectGraph(ruleName) {
     /**

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

@@ -1,5 +1,5 @@
 import { ProjectGraph, ProjectGraphDependency, ProjectGraphExternalNode, ProjectGraphProjectNode } from '@nx/devkit';
-import { TargetProjectLocator } from '@nx/js/src/internal';
+import { TargetProjectLocator } from '@nx/js/internal';
 import { TSESLint, TSESTree } from '@typescript-eslint/utils';
 import { ProjectRootMappings } from 'nx/src/project-graph/utils/find-project-for-path';
 export type Deps = {

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

@@ -1 +1 @@
-{"version":3,"file":"runtime-lint-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runtime-lint-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/utils/runtime-lint-utils.ts"],"names":[],"mappings":"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"}

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

@@ -28,7 +28,6 @@ exports.getParserServices = getParserServices;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/js/src/internal");
 const utils_1 = require("@typescript-eslint/utils");
 const path = tslib_1.__importStar(require("node:path"));
 const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
@@ -335,7 +334,7 @@ function belongsToDifferentEntryPoint(importExpr, filePath, projectRoot) {
     return importEntryPoint !== srcEntryPoint;
 }
 function getSecondaryEntryPointPath(importExpr, filePath, projectRoot) {
-    const resolvedImportFile = (0, internal_1.resolveModuleByImport)(importExpr, filePath, // not strictly necessary, but speeds up resolution
+    const resolvedImportFile = (0, js_1.resolveModuleByImport)(importExpr, filePath, // not strictly necessary, but speeds up resolution
     path.join(devkit_1.workspaceRoot, (0, js_1.getRootTsConfigFileName)()));
     if (!resolvedImportFile) {
         return undefined;