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

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

@@ -146,6 +146,24 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
         }
         const workspaceLayout = global.workspaceLayout;
         const expandedIgnoreCircularDependencies = (0, graph_utils_1.expandIgnoredCircularDependencies)(ignoredCircularDependencies, projectGraph);
+        let ultracacheImportsSpec;
+        // Atomized e2e specs (`<target>--<spec path>`) with the
+        // `// @nx-ultracache: imports` directive import app code with bare imports
+        // (`import 'app/feature'`) to hash from it.
+        function isUltracacheImport(node, sourceProject, sourceFilePath) {
+            if (node.type !== utils_1.AST_NODE_TYPES.ImportDeclaration ||
+                context.sourceCode.getFirstToken(node, 1).range[0] !==
+                    node.source.range[0]) {
+                return false;
+            }
+            if (ultracacheImportsSpec === undefined) {
+                const specPath = (0, devkit_1.normalizePath)((0, path_1.relative)(sourceProject.data.root, sourceFilePath));
+                ultracacheImportsSpec =
+                    (0, internal_2.hasUltracacheImportsDirective)(context.sourceCode.text) &&
+                        Object.keys(sourceProject.data.targets ?? {}).some((targetName) => targetName.endsWith(`--${specPath}`));
+            }
+            return ultracacheImportsSpec;
+        }
         function run(imp, node) {
             // whitelisted import
             if (allow.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp))) {
@@ -166,8 +184,9 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             else {
                 targetProject = (0, runtime_lint_utils_1.getTargetProjectBasedOnRelativeImport)(imp, projectPath, projectGraph, projectRootMappings, sourceFilePath);
             }
-            if ((targetProject && sourceProject !== targetProject) ||
-                isAbsoluteImportIntoAnotherProj) {
+            if (((targetProject && sourceProject !== targetProject) ||
+                isAbsoluteImportIntoAnotherProj) &&
+                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
                 context.report({
                     node,
                     messageId: 'noRelativeOrAbsoluteImportsAcrossLibraries',
@@ -374,7 +393,9 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 return;
             }
             // cannot import apps
-            if (targetProject.type === 'app' && !(0, runtime_lint_utils_1.appIsMFERemote)(targetProject)) {
+            if (targetProject.type === 'app' &&
+                !(0, runtime_lint_utils_1.appIsMFERemote)(targetProject) &&
+                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
                 context.report({
                     node,
                     messageId: 'noImportsOfApps',
@@ -406,7 +427,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             // 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)) {
+                (0, runtime_lint_utils_1.hasStaticImportOfDynamicResource)(node, projectGraph, sourceProject.name, targetProject.name, imp, sourceFilePath) &&
+                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
                 const filesWithLazyImports = (0, graph_utils_1.findFilesWithDynamicImports)(projectFileMap, sourceProject.name, targetProject.name);
                 context.report({
                     data: {
@@ -421,7 +443,8 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                 return;
             }
             // check that dependency constraints are satisfied
-            if (depConstraints.length > 0) {
+            if (depConstraints.length > 0 &&
+                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
                 const constraints = (0, runtime_lint_utils_1.findConstraintsFor)(depConstraints, sourceProject);
                 // when no constrains found => error. Force the user to provision them.
                 if (constraints.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "24.0.0-beta.1",
+  "version": "24.0.0-beta.2",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -100,8 +100,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.1",
-    "@nx/js": "24.0.0-beta.1",
+    "@nx/devkit": "24.0.0-beta.2",
+    "@nx/js": "24.0.0-beta.2",
     "@phenomnomnominal/tsquery": "~6.2.0",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
@@ -113,7 +113,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "24.0.0-beta.1"
+    "nx": "24.0.0-beta.2"
   },
   "publishConfig": {
     "access": "public"