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

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

@@ -146,23 +146,23 @@ 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
+        let ignoreServerInputsSpec;
+        // Atomized e2e specs (`<target>--<spec path>`) with
+        // `// @nx-ignore-server-inputs` import app code with bare imports
         // (`import 'app/feature'`) to hash from it.
-        function isUltracacheImport(node, sourceProject, sourceFilePath) {
+        function isIgnoreServerInputsImport(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) {
+            if (ignoreServerInputsSpec === undefined) {
                 const specPath = (0, devkit_1.normalizePath)((0, path_1.relative)(sourceProject.data.root, sourceFilePath));
-                ultracacheImportsSpec =
-                    (0, internal_2.hasUltracacheImportsDirective)(context.sourceCode.text) &&
+                ignoreServerInputsSpec =
+                    (0, internal_2.hasIgnoreServerInputsDirective)(context.sourceCode.text) &&
                         Object.keys(sourceProject.data.targets ?? {}).some((targetName) => targetName.endsWith(`--${specPath}`));
             }
-            return ultracacheImportsSpec;
+            return ignoreServerInputsSpec;
         }
         function run(imp, node) {
             // whitelisted import
@@ -186,7 +186,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             }
             if (((targetProject && sourceProject !== targetProject) ||
                 isAbsoluteImportIntoAnotherProj) &&
-                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
+                !isIgnoreServerInputsImport(node, sourceProject, sourceFilePath)) {
                 context.report({
                     node,
                     messageId: 'noRelativeOrAbsoluteImportsAcrossLibraries',
@@ -395,7 +395,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             // cannot import apps
             if (targetProject.type === 'app' &&
                 !(0, runtime_lint_utils_1.appIsMFERemote)(targetProject) &&
-                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
+                !isIgnoreServerInputsImport(node, sourceProject, sourceFilePath)) {
                 context.report({
                     node,
                     messageId: 'noImportsOfApps',
@@ -428,7 +428,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             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) &&
-                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
+                !isIgnoreServerInputsImport(node, sourceProject, sourceFilePath)) {
                 const filesWithLazyImports = (0, graph_utils_1.findFilesWithDynamicImports)(projectFileMap, sourceProject.name, targetProject.name);
                 context.report({
                     data: {
@@ -444,7 +444,7 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
             }
             // check that dependency constraints are satisfied
             if (depConstraints.length > 0 &&
-                !isUltracacheImport(node, sourceProject, sourceFilePath)) {
+                !isIgnoreServerInputsImport(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.2",
+  "version": "24.0.0-beta.3",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -100,8 +100,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.2",
-    "@nx/js": "24.0.0-beta.2",
+    "@nx/devkit": "24.0.0-beta.3",
+    "@nx/js": "24.0.0-beta.3",
     "@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.2"
+    "nx": "24.0.0-beta.3"
   },
   "publishConfig": {
     "access": "public"