nx 19.2.0-canary.20240525-af463c4 → 19.2.0-canary.20240530-316dcb9

package/src/plugins/js/project-graph/affected/lock-file-changes.js

@@ -7,6 +7,7 @@ const getTouchedProjectsFromLockFile = (fileChanges, projectGraphNodes) => {
         'yarn.lock',
         'pnpm-lock.yaml',
         'pnpm-lock.yml',
+        'bun.lockb',
     ];
     if (fileChanges.some((f) => lockFiles.includes(f.file))) {
         return Object.values(projectGraphNodes).map((p) => p.name);

package/src/plugins/package-json-workspaces/create-nodes.js

@@ -70,6 +70,7 @@ function buildProjectConfigurationFromPackageJson(packageJson, path, nxJson) {
         projectType,
         ...packageJson.nx,
         targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson),
+        metadata: (0, package_json_1.getMetadataFromPackageJson)(packageJson),
     };
 }
 exports.buildProjectConfigurationFromPackageJson = buildProjectConfigurationFromPackageJson;

package/src/plugins/project-json/build-nodes/package-json-next-to-project-json.js

@@ -39,6 +39,7 @@ function createProjectFromPackageJsonNextToProjectJson(projectJsonPath, workspac
             name,
             root,
             targets: (0, package_json_1.readTargetsFromPackageJson)(packageJson),
+            metadata: (0, package_json_1.getMetadataFromPackageJson)(packageJson),
         };
     }
     catch (e) {

package/src/tasks-runner/create-task-graph.d.ts

@@ -2,7 +2,7 @@ import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { Task, TaskGraph } from '../config/task-graph';
 import { TargetDefaults, TargetDependencies } from '../config/nx-json';
 export declare class ProcessTasks {
-    private readonly defaultDependencyConfigs;
+    private readonly extraTargetDependencies;
     private readonly projectGraph;
     private readonly seen;
     readonly tasks: {
@@ -11,7 +11,7 @@ export declare class ProcessTasks {
     readonly dependencies: {
         [k: string]: string[];
     };
-    constructor(defaultDependencyConfigs: TargetDependencies, projectGraph: ProjectGraph);
+    constructor(extraTargetDependencies: TargetDependencies, projectGraph: ProjectGraph);
     processTasks(projectNames: string[], targets: string[], configuration: string, overrides: Object, excludeTaskDependencies: boolean): string[];
     processTask(task: Task, projectUsedToDeriveDependencies: string, configuration: string, overrides: Object): void;
     private processTasksForMatchingProjects;
@@ -21,5 +21,5 @@ export declare class ProcessTasks {
     resolveConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string | undefined): string;
     getId(project: string, target: string, configuration: string | undefined): string;
 }
-export declare function createTaskGraph(projectGraph: ProjectGraph, defaultDependencyConfigs: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;
+export declare function createTaskGraph(projectGraph: ProjectGraph, extraTargetDependencies: TargetDependencies, projectNames: string[], targets: string[], configuration: string | undefined, overrides: Object, excludeTaskDependencies?: boolean): TaskGraph;
 export declare function mapTargetDefaultsToDependencies(defaults: TargetDefaults | undefined): TargetDependencies;

package/src/tasks-runner/create-task-graph.js

@@ -6,8 +6,8 @@ const project_graph_utils_1 = require("../utils/project-graph-utils");
 const find_matching_projects_1 = require("../utils/find-matching-projects");
 const output_1 = require("../utils/output");
 class ProcessTasks {
-    constructor(defaultDependencyConfigs, projectGraph) {
-        this.defaultDependencyConfigs = defaultDependencyConfigs;
+    constructor(extraTargetDependencies, projectGraph) {
+        this.extraTargetDependencies = extraTargetDependencies;
         this.projectGraph = projectGraph;
         this.seen = new Set();
         this.tasks = {};
@@ -58,7 +58,7 @@ class ProcessTasks {
             return;
         }
         this.seen.add(seenKey);
-        const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: task.target.project, target: task.target.target }, this.defaultDependencyConfigs, this.projectGraph);
+        const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: task.target.project, target: task.target.target }, this.extraTargetDependencies, this.projectGraph);
         for (const dependencyConfig of dependencyConfigs) {
             const taskOverrides = dependencyConfig.params === 'forward'
                 ? overrides
@@ -189,8 +189,8 @@ class ProcessTasks {
     }
 }
 exports.ProcessTasks = ProcessTasks;
-function createTaskGraph(projectGraph, defaultDependencyConfigs, projectNames, targets, configuration, overrides, excludeTaskDependencies = false) {
-    const p = new ProcessTasks(defaultDependencyConfigs, projectGraph);
+function createTaskGraph(projectGraph, extraTargetDependencies, projectNames, targets, configuration, overrides, excludeTaskDependencies = false) {
+    const p = new ProcessTasks(extraTargetDependencies, projectGraph);
     const roots = p.processTasks(projectNames, targets, configuration, overrides, excludeTaskDependencies);
     return {
         roots,

package/src/tasks-runner/run-command.js

@@ -58,8 +58,8 @@ async function getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks
         }
     }
 }
-function createTaskGraphAndValidateCycles(projectGraph, defaultDependencyConfigs, projectNames, nxArgs, overrides, extraOptions) {
-    const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, projectNames, nxArgs.targets, nxArgs.configuration, overrides, extraOptions.excludeTaskDependencies);
+function createTaskGraphAndValidateCycles(projectGraph, extraTargetDependencies, projectNames, nxArgs, overrides, extraOptions) {
+    const taskGraph = (0, create_task_graph_1.createTaskGraph)(projectGraph, extraTargetDependencies, projectNames, nxArgs.targets, nxArgs.configuration, overrides, extraOptions.excludeTaskDependencies);
     const cycle = (0, task_graph_utils_1.findCycle)(taskGraph);
     if (cycle) {
         if (process.env.NX_IGNORE_CYCLES === 'true' || nxArgs.nxIgnoreCycles) {
@@ -81,9 +81,8 @@ function createTaskGraphAndValidateCycles(projectGraph, defaultDependencyConfigs
 }
 async function runCommand(projectsToRun, projectGraph, { nxJson }, nxArgs, overrides, initiatingProject, extraTargetDependencies, extraOptions) {
     const status = await (0, params_1.handleErrors)(process.env.NX_VERBOSE_LOGGING === 'true', async () => {
-        const defaultDependencyConfigs = mergeTargetDependencies(nxJson.targetDefaults, extraTargetDependencies);
         const projectNames = projectsToRun.map((t) => t.name);
-        const taskGraph = createTaskGraphAndValidateCycles(projectGraph, defaultDependencyConfigs, projectNames, nxArgs, overrides, extraOptions);
+        const taskGraph = createTaskGraphAndValidateCycles(projectGraph, extraTargetDependencies ?? {}, projectNames, nxArgs, overrides, extraOptions);
         const tasks = Object.values(taskGraph.tasks);
         const { lifeCycle, renderIsDone } = await getTerminalOutputLifeCycle(initiatingProject, projectNames, tasks, nxArgs, nxJson, overrides);
         const status = await invokeTasksRunner({

package/src/tasks-runner/utils.d.ts

@@ -2,11 +2,10 @@ import { Task, TaskGraph } from '../config/task-graph';
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import { TargetConfiguration, TargetDependencyConfig } from '../config/workspace-json-project-json';
 import { CustomHasher, ExecutorConfig } from '../config/misc-interfaces';
-export declare function getCommandAsString(execCommand: string, task: Task): string;
 export declare function getDependencyConfigs({ project, target }: {
     project: string;
     target: string;
-}, defaultDependencyConfigs: Record<string, (TargetDependencyConfig | string)[]>, projectGraph: ProjectGraph): TargetDependencyConfig[] | undefined;
+}, extraTargetDependencies: Record<string, (TargetDependencyConfig | string)[]>, projectGraph: ProjectGraph): TargetDependencyConfig[] | undefined;
 export declare function expandDependencyConfigSyntaxSugar(dependencyConfigString: string, graph: ProjectGraph): TargetDependencyConfig;
 export declare function getOutputs(p: Record<string, ProjectGraphProjectNode>, target: Task['target'], overrides: Task['overrides']): string[];
 declare class InvalidOutputsError extends Error {

package/src/tasks-runner/utils.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unparse = exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeIdsFromGraph = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.getTargetConfigurationForTask = exports.interpolate = exports.getOutputsForTargetAndConfiguration = exports.transformLegacyOutputs = exports.validateOutputs = exports.getOutputs = exports.expandDependencyConfigSyntaxSugar = exports.getDependencyConfigs = exports.getCommandAsString = void 0;
+exports.unparse = exports.isCacheableTask = exports.shouldStreamOutput = exports.getSerializedArgsForTask = exports.getPrintableCommandArgsForTask = exports.getCliPath = exports.calculateReverseDeps = exports.removeIdsFromGraph = exports.removeTasksFromTaskGraph = exports.getCustomHasher = exports.getExecutorForTask = exports.getExecutorNameForTask = exports.getTargetConfigurationForTask = exports.interpolate = exports.getOutputsForTargetAndConfiguration = exports.transformLegacyOutputs = exports.validateOutputs = exports.getOutputs = exports.expandDependencyConfigSyntaxSugar = exports.getDependencyConfigs = void 0;
 const output_1 = require("../utils/output");
 const path_1 = require("path");
+const posix_1 = require("path/posix");
 const workspace_root_1 = require("../utils/workspace-root");
 const path_2 = require("../utils/path");
 const fileutils_1 = require("../utils/fileutils");
@@ -10,14 +11,10 @@ const serialize_overrides_into_command_line_1 = require("../utils/serialize-over
 const split_target_1 = require("../utils/split-target");
 const executor_utils_1 = require("../command-line/run/executor-utils");
 const project_graph_1 = require("../project-graph/project-graph");
-function getCommandAsString(execCommand, task) {
-    const args = getPrintableCommandArgsForTask(task);
-    return [execCommand, 'nx', ...args].join(' ').trim();
-}
-exports.getCommandAsString = getCommandAsString;
-function getDependencyConfigs({ project, target }, defaultDependencyConfigs, projectGraph) {
+function getDependencyConfigs({ project, target }, extraTargetDependencies, projectGraph) {
     const dependencyConfigs = (projectGraph.nodes[project].data?.targets[target]?.dependsOn ??
-        defaultDependencyConfigs[target] ??
+        // This is passed into `run-command` from programmatic invocations
+        extraTargetDependencies[target] ??
         []).map((config) => typeof config === 'string'
         ? expandDependencyConfigSyntaxSugar(config, projectGraph)
         : config);
@@ -170,18 +167,32 @@ function getOutputsForTargetAndConfiguration(taskTargetOrTask, overridesOrNode,
     }
 }
 exports.getOutputsForTargetAndConfiguration = getOutputsForTargetAndConfiguration;
+/**
+ * Matches portions of a string which need to be interpolated.
+ * Matches anything within curly braces, excluding the braces.
+ */
+const replacementRegex = /{([\s\S]+?)}/g;
 function interpolate(template, data) {
+    // Path is absolute or doesn't need interpolation
+    if (template.startsWith('/') || !replacementRegex.test(template)) {
+        return template;
+    }
     if (template.includes('{workspaceRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. {workspaceRoot} can only be used at the beginning of the expression.`);
     }
     if (data.projectRoot == '.' && template.includes('{projectRoot}', 1)) {
         throw new Error(`Output '${template}' is invalid. When {projectRoot} is '.', it can only be used at the beginning of the expression.`);
     }
-    let res = template.replace('{workspaceRoot}/', '');
+    const parts = template.split('/').map((s) => _interpolate(s, data));
+    return (0, posix_1.join)(...parts).replace('{workspaceRoot}/', '');
+}
+exports.interpolate = interpolate;
+function _interpolate(template, data) {
+    let res = template;
     if (data.projectRoot == '.') {
-        res = res.replace('{projectRoot}/', '');
+        res = res.replace('{projectRoot}', '');
     }
-    return res.replace(/{([\s\S]+?)}/g, (match) => {
+    return res.replace(replacementRegex, (match) => {
         let value = data;
         let path = match.slice(1, -1).trim().split('.');
         for (let idx = 0; idx < path.length; idx++) {
@@ -193,7 +204,6 @@ function interpolate(template, data) {
         return value;
     });
 }
-exports.interpolate = interpolate;
 function getTargetConfigurationForTask(task, projectGraph) {
     const project = projectGraph.nodes[task.target.project].data;
     return project.targets[task.target.target];

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

@@ -1,4 +1,4 @@
-import { InputDefinition, TargetConfiguration } from '../config/workspace-json-project-json';
+import { InputDefinition, ProjectMetadata, TargetConfiguration } from '../config/workspace-json-project-json';
 import { PackageManagerCommands } from './package-manager';
 export interface NxProjectPackageJsonConfiguration {
     implicitDependencies?: string[];
@@ -67,6 +67,7 @@ export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigra
     packageGroup?: ArrayPackageGroup;
 };
 export declare function buildTargetFromScript(script: string, scripts: Record<string, string>, packageManagerCommand: PackageManagerCommands): TargetConfiguration;
+export declare function getMetadataFromPackageJson(packageJson: PackageJson): ProjectMetadata;
 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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
+exports.readModulePackageJson = exports.readModulePackageJsonWithoutFallbacks = exports.readTargetsFromPackageJson = exports.getMetadataFromPackageJson = exports.buildTargetFromScript = exports.readNxMigrateConfig = exports.normalizePackageGroup = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
 const project_configuration_utils_1 = require("../project-graph/utils/project-configuration-utils");
@@ -53,6 +53,16 @@ function buildTargetFromScript(script, scripts = {}, packageManagerCommand) {
 }
 exports.buildTargetFromScript = buildTargetFromScript;
 let packageManagerCommand;
+function getMetadataFromPackageJson(packageJson) {
+    const { scripts, nx } = packageJson ?? {};
+    const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
+    return {
+        targetGroups: {
+            'NPM Scripts': includedScripts,
+        },
+    };
+}
+exports.getMetadataFromPackageJson = getMetadataFromPackageJson;
 function readTargetsFromPackageJson(packageJson) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};

package/src/utils/params.d.ts

@@ -1,5 +1,5 @@
 import type { NxJsonConfiguration } from '../config/nx-json';
-import type { TargetConfiguration, ProjectsConfigurations } from '../config/workspace-json-project-json';
+import type { ProjectsConfigurations, TargetConfiguration } from '../config/workspace-json-project-json';
 type PropertyDescription = {
     type?: string | string[];
     required?: string[];

package/src/utils/params.js

@@ -4,7 +4,6 @@ exports.getPromptsForSchema = exports.convertSmartDefaultsIntoNamedParams = expo
 const logger_1 = require("./logger");
 const output_1 = require("./output");
 const client_1 = require("../daemon/client/client");
-const LIST_CHOICE_DISPLAY_LIMIT = 10;
 async function handleErrors(isVerbose, fn) {
     try {
         return await fn();
@@ -602,10 +601,12 @@ function getPromptsForSchema(opts, schema, projectsConfigurations) {
                     return e.message;
                 }
             };
+            // Limit the number of choices displayed so that the prompt fits on the screen
+            const limitForChoicesDisplayed = process.stdout.rows - question.message.split('\n').length;
             if (v.type === 'string' && v.enum && Array.isArray(v.enum)) {
                 question.type = 'autocomplete';
                 question.choices = [...v.enum];
-                question.limit = LIST_CHOICE_DISPLAY_LIMIT;
+                question.limit = limitForChoicesDisplayed;
             }
             else if (v.type === 'string' &&
                 (v.$default?.$source === 'projectName' ||
@@ -615,7 +616,7 @@ function getPromptsForSchema(opts, schema, projectsConfigurations) {
                 projectsConfigurations) {
                 question.type = 'autocomplete';
                 question.choices = Object.keys(projectsConfigurations.projects);
-                question.limit = LIST_CHOICE_DISPLAY_LIMIT;
+                question.limit = limitForChoicesDisplayed;
             }
             else if (v.type === 'number' || v['x-prompt'].type == 'number') {
                 question.type = 'numeral';
@@ -642,7 +643,7 @@ function getPromptsForSchema(opts, schema, projectsConfigurations) {
                                 };
                             }
                         });
-                question.limit = LIST_CHOICE_DISPLAY_LIMIT;
+                question.limit = limitForChoicesDisplayed;
             }
             else if (v.type === 'boolean') {
                 question.type = 'confirm';

package/src/utils/print-help.js

@@ -226,7 +226,7 @@ function generateLinkOutput({ pluginName, name, type, }) {
         !pluginName.startsWith(nrwlPackagePrefix)) {
         return '';
     }
-    const link = `https://nx.dev/packages/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
+    const link = `https://nx.dev/nx-api/${pluginName.substring(pluginName.startsWith(nxPackagePrefix)
         ? nxPackagePrefix.length
         : nrwlPackagePrefix.length)}/${type}/${name}`;
     return `\n\n${chalk.dim('Find more information and examples at:')} ${chalk.bold(link)}`;