nx 19.1.0-canary.20240521-1255603 → 19.1.0-canary.20240522-89fdd42

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

@@ -13,6 +13,11 @@ export default TargetDefaultsPlugin;
  */
 export declare function getTargetInfo(target: string, projectJsonTargets: Record<string, TargetConfiguration>, packageJsonTargets: Record<string, TargetConfiguration>): {
     command: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     executor?: undefined;
     options?: undefined;
 } | {
@@ -22,6 +27,11 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         commands?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
@@ -30,9 +40,19 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         script?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
 } | {
     executor: string;
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
     options?: undefined;
 } | {
@@ -42,9 +62,20 @@ export declare function getTargetInfo(target: string, projectJsonTargets: Record
         command?: undefined;
         commands?: undefined;
     };
+    metadata: {
+        [x: string]: any;
+        description?: string;
+        technologies?: string[];
+    };
     command?: undefined;
+} | {
+    executor: string;
+    command?: undefined;
+    metadata?: undefined;
+    options?: undefined;
 } | {
     command?: undefined;
+    metadata?: undefined;
     executor?: undefined;
     options?: undefined;
 };

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

@@ -111,9 +111,14 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
         ...packageJsonTarget?.options,
         ...projectJsonTarget?.options,
     };
+    const metadata = {
+        ...packageJsonTarget?.metadata,
+        ...projectJsonTarget?.metadata,
+    };
     if (projectJsonTarget?.command) {
         return {
             command: projectJsonTarget?.command,
+            metadata,
         };
     }
     if (executor === 'nx:run-commands') {
@@ -123,6 +128,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     command: targetOptions?.command,
                 },
+                metadata,
             };
         }
         else if (targetOptions?.commands) {
@@ -131,10 +137,12 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
                 options: {
                     commands: targetOptions.commands,
                 },
+                metadata,
             };
         }
         return {
             executor: 'nx:run-commands',
+            metadata,
         };
     }
     if (executor === 'nx:run-script') {
@@ -143,6 +151,7 @@ function getTargetInfo(target, projectJsonTargets, packageJsonTargets) {
             options: {
                 script: targetOptions?.script ?? target,
             },
+            metadata,
         };
     }
     if (executor) {

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.

package/src/utils/package-json.d.ts

@@ -65,7 +65,7 @@ export declare function normalizePackageGroup(packageGroup: PackageGroup): Array
 export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigrationsConfiguration & {
     packageGroup?: ArrayPackageGroup;
 };
-export declare function buildTargetFromScript(script: string): TargetConfiguration;
+export declare function buildTargetFromScript(script: string, scripts?: Record<string, string>): TargetConfiguration;
 export declare function readTargetsFromPackageJson(packageJson: PackageJson): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.

package/src/utils/package-json.js

@@ -6,6 +6,7 @@ const path_1 = require("path");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
 const fileutils_1 = require("./fileutils");
 const installation_directory_1 = require("./installation-directory");
+const package_manager_1 = require("./package-manager");
 function normalizePackageGroup(packageGroup) {
     return Array.isArray(packageGroup)
         ? packageGroup.map((x) => typeof x === 'string' ? { package: x, version: '*' } : x)
@@ -38,12 +39,17 @@ function readNxMigrateConfig(json) {
     };
 }
 exports.readNxMigrateConfig = readNxMigrateConfig;
-function buildTargetFromScript(script) {
+function buildTargetFromScript(script, scripts = {}) {
+    const packageManagerCommand = (0, package_manager_1.getPackageManagerCommand)();
     return {
         executor: 'nx:run-script',
         options: {
             script,
         },
+        metadata: {
+            scriptContent: scripts[script],
+            runCommand: packageManagerCommand.run(script),
+        },
     };
 }
 exports.buildTargetFromScript = buildTargetFromScript;
@@ -53,7 +59,7 @@ function readTargetsFromPackageJson(packageJson) {
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
     //
     for (const script of includedScripts) {
-        res[script] = buildTargetFromScript(script);
+        res[script] = buildTargetFromScript(script, scripts);
     }
     for (const targetName in nx?.targets) {
         res[targetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(nx?.targets[targetName], res[targetName]);

package/src/utils/package-manager.d.ts

@@ -10,7 +10,7 @@ export interface PackageManagerCommands {
     exec: string;
     dlx: string;
     list: string;
-    run: (script: string, args: string) => string;
+    run: (script: string, args?: string) => string;
     getRegistryUrl: string;
 }
 /**

package/src/utils/package-manager.js

@@ -74,7 +74,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'yarn remove',
                 exec: 'yarn',
                 dlx: useBerry ? 'yarn dlx' : 'yarn',
-                run: (script, args) => `yarn ${script} ${args}`,
+                run: (script, args) => `yarn ${script}${args ? ` ${args}` : ''}`,
                 list: useBerry ? 'yarn info --name-only' : 'yarn list',
                 getRegistryUrl: useBerry
                     ? 'yarn config get npmRegistryServer'
@@ -95,9 +95,11 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'pnpm rm',
                 exec: modernPnpm ? 'pnpm exec' : 'pnpx',
                 dlx: modernPnpm ? 'pnpm dlx' : 'pnpx',
-                run: (script, args) => includeDoubleDashBeforeArgs
-                    ? `pnpm run ${script} -- ${args}`
-                    : `pnpm run ${script} ${args}`,
+                run: (script, args) => `pnpm run ${script}${args
+                    ? includeDoubleDashBeforeArgs
+                        ? ' -- ' + args
+                        : ` ${args}`
+                    : ''}`,
                 list: 'pnpm ls --depth 100',
                 getRegistryUrl: 'pnpm config get registry',
             };
@@ -114,7 +116,7 @@ function getPackageManagerCommand(packageManager = detectPackageManager(), root
                 rm: 'npm rm',
                 exec: 'npx',
                 dlx: 'npx',
-                run: (script, args) => `npm run ${script} -- ${args}`,
+                run: (script, args) => `npm run ${script}${args ? ' -- ' + args : ''}`,
                 list: 'npm ls',
                 getRegistryUrl: 'npm config get registry',
             };