nx 18.0.0 → 18.0.2

package/src/plugins/target-defaults/target-defaults-plugin.d.ts

@@ -1,4 +1,6 @@
+import { ProjectConfiguration } from '../../config/workspace-json-project-json';
 import { NxPluginV2 } from '../../utils/nx-plugin';
+import { PackageJson } from '../../utils/package-json';
 /**
  * This symbol marks that a target provides information which should modify a target already registered
  * on the project via other plugins. If the target has not already been registered, and this symbol is true,
@@ -6,3 +8,49 @@ import { NxPluginV2 } from '../../utils/nx-plugin';
  */
 export declare const ONLY_MODIFIES_EXISTING_TARGET: unique symbol;
 export declare const TargetDefaultsPlugin: NxPluginV2;
+/**
+ * This fn gets target info that would make a target uniquely compatible
+ * with what is described by project.json or package.json. As the merge process
+ * for config happens, without this, the target defaults may be compatible
+ * with a config from a plugin and then that combined target be incompatible
+ * with the project json configuration resulting in the target default values
+ * being scrapped. By adding enough information from the project.json / package.json,
+ * we can make sure that the target after merging is compatible with the defined target.
+ */
+export declare function getTargetInfo(target: string, projectJson: Pick<ProjectConfiguration, 'targets'>, packageJson: Pick<PackageJson, 'scripts' | 'nx'>): {
+    command: string;
+    executor?: undefined;
+    options?: undefined;
+} | {
+    executor: string;
+    options: {
+        command: any;
+        commands?: undefined;
+        script?: undefined;
+    };
+    command?: undefined;
+} | {
+    executor: string;
+    options: {
+        commands: any;
+        command?: undefined;
+        script?: undefined;
+    };
+    command?: undefined;
+} | {
+    executor: string;
+    command?: undefined;
+    options?: undefined;
+} | {
+    executor: string;
+    options: {
+        script: any;
+        command?: undefined;
+        commands?: undefined;
+    };
+    command?: undefined;
+} | {
+    command?: undefined;
+    executor?: undefined;
+    options?: undefined;
+};

package/src/plugins/target-defaults/target-defaults-plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TargetDefaultsPlugin = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
+exports.getTargetInfo = exports.TargetDefaultsPlugin = exports.ONLY_MODIFIES_EXISTING_TARGET = void 0;
 const minimatch_1 = require("minimatch");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
@@ -57,7 +57,11 @@ exports.TargetDefaultsPlugin = {
                     // Prevents `build` from overwriting `@nx/js:tsc` if both are present
                     // and build is specified later in the ordering.
                     if (!modifiedTargets[targetName] || targetName !== defaultSpecifier) {
-                        modifiedTargets[targetName] = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
+                        const defaults = JSON.parse(JSON.stringify(targetDefaults[defaultSpecifier]));
+                        modifiedTargets[targetName] = {
+                            ...getTargetInfo(targetName, projectJson, packageJson),
+                            ...defaults,
+                        };
                     }
                     // TODO: Remove this after we figure out a way to define new targets
                     // in target defaults
@@ -101,3 +105,74 @@ function readJsonOrNull(path) {
         return null;
     }
 }
+/**
+ * This fn gets target info that would make a target uniquely compatible
+ * with what is described by project.json or package.json. As the merge process
+ * for config happens, without this, the target defaults may be compatible
+ * with a config from a plugin and then that combined target be incompatible
+ * with the project json configuration resulting in the target default values
+ * being scrapped. By adding enough information from the project.json / package.json,
+ * we can make sure that the target after merging is compatible with the defined target.
+ */
+function getTargetInfo(target, projectJson, packageJson) {
+    const projectJsonTarget = projectJson?.targets?.[target];
+    const packageJsonTarget = packageJson?.nx?.targets?.[target];
+    const executor = getTargetExecutor(target, projectJson, packageJson);
+    const targetOptions = {
+        ...packageJsonTarget?.options,
+        ...projectJsonTarget?.options,
+    };
+    if (projectJsonTarget?.command) {
+        return {
+            command: projectJsonTarget?.command,
+        };
+    }
+    if (executor === 'nx:run-commands') {
+        if (targetOptions?.command) {
+            return {
+                executor: 'nx:run-commands',
+                options: {
+                    command: projectJsonTarget.options?.command,
+                },
+            };
+        }
+        else if (targetOptions?.commands) {
+            return {
+                executor: 'nx:run-commands',
+                options: {
+                    commands: targetOptions.commands,
+                },
+            };
+        }
+        return {
+            executor: 'nx:run-commands',
+        };
+    }
+    if (executor === 'nx:run-script') {
+        return {
+            executor: 'nx:run-script',
+            options: {
+                script: targetOptions?.script ?? target,
+            },
+        };
+    }
+    if (executor) {
+        return { executor };
+    }
+    return {};
+}
+exports.getTargetInfo = getTargetInfo;
+function getTargetExecutor(target, projectJson, packageJson) {
+    const projectJsonTarget = projectJson?.targets?.[target];
+    const packageJsonTarget = packageJson?.nx?.targets?.[target];
+    const packageJsonScript = packageJson?.scripts?.[target];
+    if (projectJsonTarget?.command) {
+        return 'nx:run-commands';
+    }
+    if (!projectJsonTarget?.executor &&
+        !packageJsonTarget?.executor &&
+        packageJsonScript) {
+        return 'nx:run-script';
+    }
+    return projectJsonTarget?.executor ?? packageJsonTarget?.executor;
+}