@nx/devkit 24.0.0-pr.37405.acdaf31 → 24.0.0-rc.1

package/dist/src/utils/test-file-directives.js

@@ -6,54 +6,37 @@ const node_path_1 = require("node:path");
 const devkit_internals_1 = require("nx/src/devkit-internals");
 const nx_directives_1 = require("./nx-directives");
 const test_file_depends_on_1 = require("./test-file-depends-on");
-const ultracache_directive_1 = require("./ultracache-directive");
 const without_server_inputs_1 = require("./without-server-inputs");
-const TEST_FILE_DIRECTIVES = ['depends-on', 'ultracache'];
 /**
- * `target` with the `@nx-*` directives of a workspace-relative test file
- * applied, for the directives in `supported`. A directive that is not
- * supported, has an unsupported value or lists no projects is skipped with a
- * warning.
+ * `target` with the `@nx-depends-on` and `@nx-ignore-server-inputs`
+ * directives of a workspace-relative test file applied. A directive that lists
+ * no projects, has a value it does not take, or is not supported
+ * (`ignoreServerInputs: false`) is skipped with a warning.
  */
-function applyTestFileDirectives(target, workspaceRoot, file, supported) {
+function applyTestFileDirectives(target, workspaceRoot, file, options) {
     const directives = (0, nx_directives_1.parseNxDirectives)((0, node_fs_1.readFileSync)((0, node_path_1.join)(workspaceRoot, file), 'utf-8'));
     let result = target;
-    for (const directive of TEST_FILE_DIRECTIVES) {
-        const values = directives.get(directive);
-        if (values === undefined) {
-            continue;
+    const dependsOn = directives.get('depends-on');
+    if (dependsOn !== undefined) {
+        const projects = (0, test_file_depends_on_1.dependsOnProjects)(dependsOn);
+        if (projects.length === 0) {
+            (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-depends-on:" lists no projects, so Nx ignores it. List the projects the test depends on, separated by commas.`);
         }
-        if (!supported.includes(directive)) {
-            (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-${directive}" is not supported in this test file, so Nx ignores it.`);
-            continue;
+        else {
+            result = (0, test_file_depends_on_1.scopeTestTargetToProjects)(result, projects);
         }
-        result = applyDirective(result, directive, values, file);
     }
-    return result;
-}
-function applyDirective(target, directive, values, file) {
-    switch (directive) {
-        case 'depends-on': {
-            const projects = (0, test_file_depends_on_1.dependsOnProjects)(values);
-            if (projects.length === 0) {
-                (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-depends-on:" lists no projects, so Nx ignores it. List the projects the test depends on, separated by commas.`);
-                return target;
-            }
-            return (0, test_file_depends_on_1.scopeTestTargetToProjects)(target, projects);
+    const ignoreServerInputs = directives.get('ignore-server-inputs');
+    if (ignoreServerInputs !== undefined) {
+        if (!options.ignoreServerInputs) {
+            (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-ignore-server-inputs" is not supported in this test file, so Nx ignores it.`);
         }
-        case 'ultracache': {
-            const unsupported = (0, ultracache_directive_1.findUnsupportedUltracacheValue)(values);
-            if (unsupported !== undefined) {
-                (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-ultracache:${unsupported && ` ${unsupported}`}" is not supported, so Nx ignores "@nx-ultracache" in this file. Use "@nx-ultracache: imports".`);
-                return target;
-            }
-            return target.dependsOn
-                ? { ...target, dependsOn: (0, without_server_inputs_1.withoutServerInputs)(target.dependsOn) }
-                : target;
+        else if (ignoreServerInputs.some((value) => value !== '')) {
+            (0, devkit_internals_1.emitPluginWorkerLog)('warn', `${file}: "@nx-ignore-server-inputs" takes no value, so Nx ignores it. Write "// @nx-ignore-server-inputs" alone.`);
         }
-        default: {
-            const unhandled = directive;
-            throw new Error(`Unhandled test file directive: ${unhandled}`);
+        else if (result.dependsOn) {
+            result = { ...result, dependsOn: (0, without_server_inputs_1.withoutServerInputs)(result.dependsOn) };
         }
     }
+    return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/devkit",
-  "version": "24.0.0-pr.37405.acdaf31",
+  "version": "24.0.0-rc.1",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -67,7 +67,7 @@
   },
   "devDependencies": {
     "jest": "30.3.0",
-    "nx": "24.0.0-pr.37405.acdaf31"
+    "nx": "24.0.0-rc.1"
   },
   "peerDependencies": {
     "nx": ">= 23 <= 25 || ^24.0.0-0"

package/dist/src/utils/ultracache-directive.d.ts

@@ -1,8 +0,0 @@
-/**
- * Whether the comment block that opens `content` has an
- * `@nx-ultracache: imports` directive. False when any `@nx-ultracache` value
- * there is unsupported.
- */
-export declare function hasUltracacheImportsDirective(content: string): boolean;
-/** The first of the `@nx-ultracache` values that is not supported. */
-export declare function findUnsupportedUltracacheValue(values: string[]): string | undefined;

package/dist/src/utils/ultracache-directive.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasUltracacheImportsDirective = hasUltracacheImportsDirective;
-exports.findUnsupportedUltracacheValue = findUnsupportedUltracacheValue;
-const nx_directives_1 = require("./nx-directives");
-const IMPORTS = 'imports';
-/**
- * Whether the comment block that opens `content` has an
- * `@nx-ultracache: imports` directive. False when any `@nx-ultracache` value
- * there is unsupported.
- */
-function hasUltracacheImportsDirective(content) {
-    const values = (0, nx_directives_1.parseNxDirectives)(content).get('ultracache');
-    return (values !== undefined && findUnsupportedUltracacheValue(values) === undefined);
-}
-/** The first of the `@nx-ultracache` values that is not supported. */
-function findUnsupportedUltracacheValue(values) {
-    return values.find((value) => value !== IMPORTS);
-}