nx 17.0.3 → 17.0.5

package/src/daemon/socket-utils.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.serializeResult = exports.killSocketOrPath = exports.FULL_OS_SOCKET_PATH = exports.isWindows = void 0;
+exports.serializeResult = exports.killSocketOrPath = exports.FORKED_PROCESS_OS_SOCKET_PATH = exports.FULL_OS_SOCKET_PATH = exports.isWindows = void 0;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
 const tmp_dir_1 = require("./tmp-dir");
+const daemon_project_graph_error_1 = require("./daemon-project-graph-error");
 exports.isWindows = (0, os_1.platform)() === 'win32';
 /**
  * For IPC with the daemon server we use unix sockets or windows named pipes, depending on the user's operating system.
@@ -15,6 +16,11 @@ exports.isWindows = (0, os_1.platform)() === 'win32';
 exports.FULL_OS_SOCKET_PATH = exports.isWindows
     ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)(tmp_dir_1.DAEMON_SOCKET_PATH)
     : (0, path_1.resolve)(tmp_dir_1.DAEMON_SOCKET_PATH);
+const FORKED_PROCESS_OS_SOCKET_PATH = (id) => {
+    let path = (0, path_1.resolve)((0, path_1.join)(tmp_dir_1.socketDir, 'fp' + id + '.sock'));
+    return exports.isWindows ? '\\\\.\\pipe\\nx\\' + (0, path_1.resolve)(path) : (0, path_1.resolve)(path);
+};
+exports.FORKED_PROCESS_OS_SOCKET_PATH = FORKED_PROCESS_OS_SOCKET_PATH;
 function killSocketOrPath() {
     try {
         (0, fs_1.unlinkSync)(exports.FULL_OS_SOCKET_PATH);
@@ -27,11 +33,16 @@ function serializeError(error) {
     if (!error) {
         return null;
     }
-    return JSON.stringify(error, Object.getOwnPropertyNames(error));
+    if (error instanceof daemon_project_graph_error_1.DaemonProjectGraphError) {
+        error.errors = error.errors.map((e) => JSON.parse(serializeError(e)));
+    }
+    return `{${Object.getOwnPropertyNames(error)
+        .map((k) => `"${k}": ${JSON.stringify(error[k])}`)
+        .join(',')}}`;
 }
 // Prepare a serialized project graph result for sending over IPC from the server to the client
-function serializeResult(error, serializedProjectGraph) {
+function serializeResult(error, serializedProjectGraph, serializedSourceMaps) {
     // We do not want to repeat work `JSON.stringify`ing an object containing the potentially large project graph so merge as strings
-    return `{ "error": ${serializeError(error)}, "projectGraph": ${serializedProjectGraph} }`;
+    return `{ "error": ${serializeError(error)}, "projectGraph": ${serializedProjectGraph}, "sourceMaps": ${serializedSourceMaps} }`;
 }
 exports.serializeResult = serializeResult;

package/src/daemon/tmp-dir.d.ts

@@ -1,5 +1,6 @@
 export declare const DAEMON_DIR_FOR_CURRENT_WORKSPACE: string;
 export declare const DAEMON_OUTPUT_LOG_FILE: string;
+export declare const socketDir: string;
 export declare const DAEMON_SOCKET_PATH: string;
 export declare function writeDaemonLogs(error?: string): string;
 export declare function markDaemonAsDisabled(): void;

package/src/daemon/tmp-dir.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeSocketDir = exports.isDaemonDisabled = exports.markDaemonAsDisabled = exports.writeDaemonLogs = exports.DAEMON_SOCKET_PATH = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = void 0;
+exports.removeSocketDir = exports.isDaemonDisabled = exports.markDaemonAsDisabled = exports.writeDaemonLogs = exports.DAEMON_SOCKET_PATH = exports.socketDir = exports.DAEMON_OUTPUT_LOG_FILE = exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = void 0;
 /**
  * Per workspace (to avoid subtle differences and issues), we want to have a deterministic
  * location within the OS's tmp directory where we write log files for background processes
@@ -15,8 +15,8 @@ const tmp_1 = require("tmp");
 const workspace_root_1 = require("../utils/workspace-root");
 exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE = (0, path_1.join)(cache_directory_1.projectGraphCacheDirectory, 'd');
 exports.DAEMON_OUTPUT_LOG_FILE = (0, path_1.join)(exports.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'daemon.log');
-const socketDir = process.env.NX_DAEMON_SOCKET_DIR || createSocketDir();
-exports.DAEMON_SOCKET_PATH = (0, path_1.join)(socketDir, 
+exports.socketDir = process.env.NX_DAEMON_SOCKET_DIR || createSocketDir();
+exports.DAEMON_SOCKET_PATH = (0, path_1.join)(exports.socketDir, 
 // As per notes above on socket/named pipe length limitations, we keep this intentionally short
 'd.sock');
 function writeDaemonLogs(error) {
@@ -61,7 +61,7 @@ function createSocketDir() {
 }
 function removeSocketDir() {
     try {
-        (0, fs_extra_1.rmdirSync)(socketDir);
+        (0, fs_extra_1.rmSync)(exports.socketDir, { recursive: true, force: true });
     }
     catch (e) { }
 }

package/src/devkit-exports.d.ts

@@ -19,7 +19,7 @@ export type { Generator, GeneratorCallback, Executor, ExecutorContext, TaskGraph
  */
 export { Workspaces } from './config/workspaces';
 export { workspaceLayout } from './config/configuration';
-export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
+export type { NxPlugin, NxPluginV1, NxPluginV2, ProjectTargetConfigurator, CreateNodes, CreateNodesFunction, CreateNodesResult, CreateNodesContext, CreateDependencies, CreateDependenciesContext, } from './utils/nx-plugin';
 /**
  * @category Workspace
  */
@@ -43,7 +43,7 @@ export type { PackageManager } from './utils/package-manager';
 /**
  * @category Package Manager
  */
-export { getPackageManagerCommand, detectPackageManager, getPackageManagerVersion, } from './utils/package-manager';
+export { getPackageManagerCommand, detectPackageManager, getPackageManagerVersion, isWorkspacesEnabled, } from './utils/package-manager';
 /**
  * @category Commands
  */

package/src/devkit-exports.js

@@ -4,8 +4,8 @@
  * Try hard to not add to this API to reduce the surface area we need to maintain.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
-// TODO(v18): Remove this export
+exports.createProjectFileMapUsingProjectGraph = exports.cacheDir = exports.hashArray = exports.defaultTasksRunner = exports.getOutputsForTargetAndConfiguration = exports.readProjectsConfigurationFromProjectGraph = exports.readCachedProjectGraph = exports.createProjectGraphAsync = exports.reverse = exports.appRootPath = exports.workspaceRoot = exports.normalizePath = exports.joinPathFragments = exports.stripIndents = exports.writeJsonFile = exports.readJsonFile = exports.stripJsonComments = exports.serializeJson = exports.parseJson = exports.updateJson = exports.writeJson = exports.readJson = exports.validateDependency = exports.ProjectGraphBuilder = exports.DependencyType = exports.updateNxJson = exports.readNxJson = exports.glob = exports.getProjects = exports.updateProjectConfiguration = exports.removeProjectConfiguration = exports.readProjectConfiguration = exports.addProjectConfiguration = exports.runExecutor = exports.isWorkspacesEnabled = exports.getPackageManagerVersion = exports.detectPackageManager = exports.getPackageManagerCommand = exports.output = exports.logger = exports.workspaceLayout = exports.Workspaces = void 0;
+// TODO(v19): Remove this export
 /**
  * @category Workspace
  */
@@ -30,6 +30,7 @@ var package_manager_1 = require("./utils/package-manager");
 Object.defineProperty(exports, "getPackageManagerCommand", { enumerable: true, get: function () { return package_manager_1.getPackageManagerCommand; } });
 Object.defineProperty(exports, "detectPackageManager", { enumerable: true, get: function () { return package_manager_1.detectPackageManager; } });
 Object.defineProperty(exports, "getPackageManagerVersion", { enumerable: true, get: function () { return package_manager_1.getPackageManagerVersion; } });
+Object.defineProperty(exports, "isWorkspacesEnabled", { enumerable: true, get: function () { return package_manager_1.isWorkspacesEnabled; } });
 /**
  * @category Commands
  */

package/src/devkit-internals.d.ts

@@ -14,4 +14,7 @@ export { sortObjectByKeys } from './utils/object-sort';
 export { stripIndent } from './utils/logger';
 export { readModulePackageJson } from './utils/package-json';
 export { splitByColons } from './utils/split-target';
+export { hashObject } from './hasher/file-hasher';
+export { hashWithWorkspaceContext } from './utils/workspace-context';
 export { createProjectRootMappingsFromProjectConfigurations, findProjectForPath, } from './project-graph/utils/find-project-for-path';
+export { registerTsProject } from './plugins/js/utils/register';

package/src/devkit-internals.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
+exports.registerTsProject = exports.findProjectForPath = exports.createProjectRootMappingsFromProjectConfigurations = exports.hashWithWorkspaceContext = exports.hashObject = exports.splitByColons = exports.readModulePackageJson = exports.stripIndent = exports.sortObjectByKeys = exports.combineOptionsForExecutor = exports.splitTarget = exports.retrieveProjectConfigurationsWithAngularProjects = exports.calculateDefaultProjectName = exports.readNxJsonFromDisk = exports.getExecutorInformation = exports.createTempNpmDirectory = void 0;
 /**
  * Note to developers: STOP! These exports are available via requireNx in @nx/devkit.
  *
@@ -28,6 +28,12 @@ var package_json_1 = require("./utils/package-json");
 Object.defineProperty(exports, "readModulePackageJson", { enumerable: true, get: function () { return package_json_1.readModulePackageJson; } });
 var split_target_2 = require("./utils/split-target");
 Object.defineProperty(exports, "splitByColons", { enumerable: true, get: function () { return split_target_2.splitByColons; } });
+var file_hasher_1 = require("./hasher/file-hasher");
+Object.defineProperty(exports, "hashObject", { enumerable: true, get: function () { return file_hasher_1.hashObject; } });
+var workspace_context_1 = require("./utils/workspace-context");
+Object.defineProperty(exports, "hashWithWorkspaceContext", { enumerable: true, get: function () { return workspace_context_1.hashWithWorkspaceContext; } });
 var find_project_for_path_1 = require("./project-graph/utils/find-project-for-path");
 Object.defineProperty(exports, "createProjectRootMappingsFromProjectConfigurations", { enumerable: true, get: function () { return find_project_for_path_1.createProjectRootMappingsFromProjectConfigurations; } });
 Object.defineProperty(exports, "findProjectForPath", { enumerable: true, get: function () { return find_project_for_path_1.findProjectForPath; } });
+var register_1 = require("./plugins/js/utils/register");
+Object.defineProperty(exports, "registerTsProject", { enumerable: true, get: function () { return register_1.registerTsProject; } });

package/src/executors/noop/schema.json

@@ -6,5 +6,5 @@
   "cli": "nx",
   "outputCapture": "pipe",
   "properties": {},
-  "additionalProperties": false
+  "additionalProperties": true
 }

package/src/executors/run-commands/run-commands.impl.d.ts

@@ -21,20 +21,28 @@ export interface RunCommandsOptions extends Json {
     parallel?: boolean;
     readyWhen?: string;
     cwd?: string;
-    args?: string;
+    env?: Record<string, string>;
+    args?: string | string[];
     envFile?: string;
     __unparsed__: string[];
+    usePty?: boolean;
+    streamOutput?: boolean;
 }
 export interface NormalizedRunCommandsOptions extends RunCommandsOptions {
     commands: {
         command: string;
         forwardAllArgs?: boolean;
     }[];
+    unknownOptions?: {
+        [k: string]: any;
+    };
     parsedArgs: {
         [k: string]: any;
     };
+    args?: string;
 }
 export default function (options: RunCommandsOptions, context: ExecutorContext): Promise<{
     success: boolean;
+    terminalOutput: string;
 }>;
-export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'parsedArgs' | '__unparsed__'>, forwardAllArgs: boolean): string;
+export declare function interpolateArgsIntoCommand(command: string, opts: Pick<NormalizedRunCommandsOptions, 'args' | 'parsedArgs' | '__unparsed__' | 'unknownOptions'>, forwardAllArgs: boolean): string;

package/src/executors/run-commands/run-commands.impl.js

@@ -6,6 +6,7 @@ const path = require("path");
 const yargsParser = require("yargs-parser");
 const npm_run_path_1 = require("npm-run-path");
 const chalk = require("chalk");
+const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
 exports.LARGE_BUFFER = 1024 * 1000000;
 async function loadEnvVars(path) {
     if (path) {
@@ -30,6 +31,11 @@ const propKeys = [
     'cwd',
     'args',
     'envFile',
+    '__unparsed__',
+    'env',
+    'usePty',
+    'streamOutput',
+    'verbose',
 ];
 async function default_1(options, context) {
     await loadEnvVars(options.envFile);
@@ -42,10 +48,10 @@ async function default_1(options, context) {
         throw new Error('ERROR: Bad executor config for run-commands - "prefix", "color" and "bgColor" can only be set when "parallel=true".');
     }
     try {
-        const success = options.parallel
+        const result = options.parallel
             ? await runInParallel(normalized, context)
             : await runSerially(normalized, context);
-        return { success };
+        return result;
     }
     catch (e) {
         if (process.env.NX_VERBOSE_LOGGING === 'true') {
@@ -56,36 +62,52 @@ async function default_1(options, context) {
 }
 exports.default = default_1;
 async function runInParallel(options, context) {
-    const procs = options.commands.map((c) => createProcess(c, options.readyWhen, options.color, calculateCwd(options.cwd, context)).then((result) => ({
+    const procs = options.commands.map((c) => createProcess(null, c, options.readyWhen, options.color, calculateCwd(options.cwd, context), options.env ?? {}, true, options.usePty, options.streamOutput).then((result) => ({
         result,
         command: c.command,
     })));
+    let terminalOutput = '';
     if (options.readyWhen) {
         const r = await Promise.race(procs);
-        if (!r.result) {
-            process.stderr.write(`Warning: run-commands command "${r.command}" exited with non-zero status code`);
-            return false;
+        terminalOutput += r.result.terminalOutput;
+        if (!r.result.success) {
+            const output = `Warning: command "${r.command}" exited with non-zero status code`;
+            terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return { success: false, terminalOutput };
         }
         else {
-            return true;
+            return { success: true, terminalOutput };
         }
     }
     else {
         const r = await Promise.all(procs);
-        const failed = r.filter((v) => !v.result);
+        terminalOutput += r.map((f) => f.result.terminalOutput).join('');
+        const failed = r.filter((v) => !v.result.success);
         if (failed.length > 0) {
-            failed.forEach((f) => {
-                process.stderr.write(`Warning: run-commands command "${f.command}" exited with non-zero status code`);
-            });
-            return false;
+            const output = failed
+                .map((f) => `Warning: command "${f.command}" exited with non-zero status code`)
+                .join('\r\n');
+            terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return {
+                success: false,
+                terminalOutput,
+            };
         }
         else {
-            return true;
+            return {
+                success: true,
+                terminalOutput,
+            };
         }
     }
 }
 function normalizeOptions(options) {
-    options.parsedArgs = parseArgs(options);
     if (options.command) {
         options.commands = [{ command: options.command }];
         options.parallel = !!options.readyWhen;
@@ -93,55 +115,125 @@ function normalizeOptions(options) {
     else {
         options.commands = options.commands.map((c) => typeof c === 'string' ? { command: c } : c);
     }
+    if (options.args && Array.isArray(options.args)) {
+        options.args = options.args.join(' ');
+    }
+    const unparsedCommandArgs = yargsParser(options.__unparsed__, {
+        configuration: {
+            'parse-numbers': false,
+            'parse-positional-numbers': false,
+            'dot-notation': false,
+        },
+    });
+    options.unknownOptions = Object.keys(options)
+        .filter((p) => propKeys.indexOf(p) === -1 && unparsedCommandArgs[p] === undefined)
+        .reduce((m, c) => ((m[c] = options[c]), m), {});
+    options.parsedArgs = parseArgs(unparsedCommandArgs, options.unknownOptions, options.args);
     options.commands.forEach((c) => {
         c.command = interpolateArgsIntoCommand(c.command, options, c.forwardAllArgs ?? true);
     });
     return options;
 }
 async function runSerially(options, context) {
+    const pseudoTerminal = pseudo_terminal_1.PseudoTerminal.isSupported()
+        ? (0, pseudo_terminal_1.getPseudoTerminal)()
+        : null;
+    let terminalOutput = '';
     for (const c of options.commands) {
-        const success = await createProcess(c, undefined, options.color, calculateCwd(options.cwd, context));
-        if (!success) {
-            process.stderr.write(`Warning: run-commands command "${c.command}" exited with non-zero status code`);
-            return false;
+        const result = await createProcess(pseudoTerminal, c, undefined, options.color, calculateCwd(options.cwd, context), options.env ?? {}, false, options.usePty, options.streamOutput);
+        terminalOutput += result.terminalOutput;
+        if (!result.success) {
+            const output = `Warning: command "${c.command}" exited with non-zero status code`;
+            result.terminalOutput += output;
+            if (options.streamOutput) {
+                process.stderr.write(output);
+            }
+            return { success: false, terminalOutput };
         }
     }
-    return true;
+    return { success: true, terminalOutput };
+}
+async function createProcess(pseudoTerminal, commandConfig, readyWhen, color, cwd, env, isParallel, usePty = true, streamOutput = true) {
+    env = processEnv(color, cwd, env);
+    // The rust runCommand is always a tty, so it will not look nice in parallel and if we need prefixes
+    // currently does not work properly in windows
+    if (pseudoTerminal &&
+        process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
+        !commandConfig.prefix &&
+        !isParallel &&
+        usePty) {
+        const cp = pseudoTerminal.runCommand(commandConfig.command, {
+            cwd,
+            jsEnv: env,
+            quiet: !streamOutput,
+        });
+        let terminalOutput = '';
+        return new Promise((res) => {
+            cp.onOutput((output) => {
+                terminalOutput += output;
+                if (readyWhen && output.indexOf(readyWhen) > -1) {
+                    res({ success: true, terminalOutput });
+                }
+            });
+            cp.onExit((code) => {
+                if (code >= 128) {
+                    process.exit(code);
+                }
+                else {
+                    res({ success: code === 0, terminalOutput });
+                }
+            });
+        });
+    }
+    return nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput);
 }
-function createProcess(commandConfig, readyWhen, color, cwd) {
+function nodeProcess(commandConfig, cwd, env, readyWhen, streamOutput = true) {
+    let terminalOutput = '';
     return new Promise((res) => {
         const childProcess = (0, child_process_1.exec)(commandConfig.command, {
             maxBuffer: exports.LARGE_BUFFER,
-            env: processEnv(color, cwd),
+            env,
             cwd,
         });
         /**
          * Ensure the child process is killed when the parent exits
          */
-        const processExitListener = (signal) => () => childProcess.kill(signal);
+        const processExitListener = (signal) => childProcess.kill(signal);
         process.on('exit', processExitListener);
         process.on('SIGTERM', processExitListener);
         process.on('SIGINT', processExitListener);
         process.on('SIGQUIT', processExitListener);
         childProcess.stdout.on('data', (data) => {
-            process.stdout.write(addColorAndPrefix(data, commandConfig));
+            const output = addColorAndPrefix(data, commandConfig);
+            terminalOutput += output;
+            if (streamOutput) {
+                process.stdout.write(output);
+            }
             if (readyWhen && data.toString().indexOf(readyWhen) > -1) {
-                res(true);
+                res({ success: true, terminalOutput });
             }
         });
         childProcess.stderr.on('data', (err) => {
-            process.stderr.write(addColorAndPrefix(err, commandConfig));
+            const output = addColorAndPrefix(err, commandConfig);
+            terminalOutput += output;
+            if (streamOutput) {
+                process.stderr.write(output);
+            }
             if (readyWhen && err.toString().indexOf(readyWhen) > -1) {
-                res(true);
+                res({ success: true, terminalOutput });
             }
         });
         childProcess.on('error', (err) => {
-            process.stderr.write(addColorAndPrefix(err.toString(), commandConfig));
-            res(false);
+            const ouptput = addColorAndPrefix(err.toString(), commandConfig);
+            terminalOutput += ouptput;
+            if (streamOutput) {
+                process.stderr.write(ouptput);
+            }
+            res({ success: false, terminalOutput });
         });
         childProcess.on('exit', (code) => {
             if (!readyWhen) {
-                res(code === 0);
+                res({ success: code === 0, terminalOutput });
             }
         });
     });
@@ -168,15 +260,22 @@ function calculateCwd(cwd, context) {
         return cwd;
     return path.join(context.root, cwd);
 }
-function processEnv(color, cwd) {
-    const env = {
+function processEnv(color, cwd, env) {
+    const localEnv = (0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() });
+    const res = {
         ...process.env,
-        ...(0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() }),
+        ...localEnv,
+        ...env,
     };
+    // need to override PATH to make sure we are using the local node_modules
+    if (localEnv.PATH)
+        res.PATH = localEnv.PATH; // UNIX-like
+    if (localEnv.Path)
+        res.Path = localEnv.Path; // Windows
     if (color) {
-        env.FORCE_COLOR = `${color}`;
+        res.FORCE_COLOR = `${color}`;
     }
-    return env;
+    return res;
 }
 function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
     if (command.indexOf('{args.') > -1) {
@@ -184,27 +283,32 @@ function interpolateArgsIntoCommand(command, opts, forwardAllArgs) {
         return command.replace(regex, (_, group) => opts.parsedArgs[group] !== undefined ? opts.parsedArgs[group] : '');
     }
     else if (forwardAllArgs) {
-        return `${command}${opts.__unparsed__.length > 0 ? ' ' + opts.__unparsed__.join(' ') : ''}`;
+        let args = '';
+        if (Object.keys(opts.unknownOptions ?? {}).length > 0) {
+            args +=
+                ' ' +
+                    Object.keys(opts.unknownOptions)
+                        .filter((k) => typeof opts.unknownOptions[k] !== 'object' &&
+                        opts.parsedArgs[k] === opts.unknownOptions[k])
+                        .map((k) => `--${k} ${opts.unknownOptions[k]}`)
+                        .join(' ');
+        }
+        if (opts.args) {
+            args += ` ${opts.args}`;
+        }
+        if (opts.__unparsed__?.length > 0) {
+            args += ` ${opts.__unparsed__.join(' ')}`;
+        }
+        return `${command}${args}`;
     }
     else {
         return command;
     }
 }
 exports.interpolateArgsIntoCommand = interpolateArgsIntoCommand;
-function parseArgs(options) {
-    const args = options.args;
+function parseArgs(unparsedCommandArgs, unknownOptions, args) {
     if (!args) {
-        const unknownOptionsTreatedAsArgs = Object.keys(options)
-            .filter((p) => propKeys.indexOf(p) === -1)
-            .reduce((m, c) => ((m[c] = options[c]), m), {});
-        const unparsedCommandArgs = yargsParser(options.__unparsed__, {
-            configuration: {
-                'parse-numbers': false,
-                'parse-positional-numbers': false,
-                'dot-notation': false,
-            },
-        });
-        return { ...unknownOptionsTreatedAsArgs, ...unparsedCommandArgs };
+        return { ...unknownOptions, ...unparsedCommandArgs };
     }
     return yargsParser(args.replace(/(^"|"$)/g, ''), {
         configuration: { 'camel-case-expansion': false },

package/src/executors/run-commands/schema.json

@@ -99,7 +99,10 @@
       "description": "String to appear in `stdout` or `stderr` that indicates that the task is done. When running multiple commands, this option can only be used when `parallel` is set to `true`. If not specified, the task is done when all the child processes complete."
     },
     "args": {
-      "type": "string",
+      "oneOf": [
+        { "type": "array", "items": { "type": "string" } },
+        { "type": "string" }
+      ],
       "description": "Extra arguments. You can pass them as follows: nx run project:target --args='--wait=100'. You can then use {args.wait} syntax to interpolate them in the workspace config file. See example [above](#chaining-commands-interpolating-args-and-setting-the-cwd)"
     },
     "envFile": {
@@ -115,6 +118,13 @@
       "type": "string",
       "description": "Current working directory of the commands. If it's not specified the commands will run in the workspace root, if a relative path is specified the commands will run in that path relative to the workspace root and if it's an absolute path the commands will run in that path."
     },
+    "env": {
+      "type": "object",
+      "description": "Environment variables that will be made available to the commands. This property has priority over the `.env` files.",
+      "additionalProperties": {
+        "type": "string"
+      }
+    },
     "__unparsed__": {
       "hidden": true,
       "type": "array",

package/src/executors/run-script/run-script.impl.js

@@ -1,20 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const package_manager_1 = require("../../utils/package-manager");
 const path = require("path");
-const npm_run_path_1 = require("npm-run-path");
+const package_manager_1 = require("../../utils/package-manager");
+const child_process_1 = require("child_process");
+const pseudo_terminal_1 = require("../../tasks-runner/pseudo-terminal");
 async function default_1(options, context) {
     const pm = (0, package_manager_1.getPackageManagerCommand)();
     try {
-        (0, child_process_1.execSync)(pm.run(options.script, options.__unparsed__.join(' ')), {
-            stdio: ['inherit', 'inherit', 'inherit'],
-            cwd: path.join(context.root, context.projectsConfigurations.projects[context.projectName].root),
-            env: {
-                ...process.env,
-                ...(0, npm_run_path_1.env)(),
-            },
-        });
+        let command = pm.run(options.script, options.__unparsed__.join(' '));
+        let cwd = path.join(context.root, context.projectsConfigurations.projects[context.projectName].root);
+        let env = process.env;
+        // when running nx through npx with node_modules installed with npm, the path gets modified to include the full workspace path with the node_modules folder
+        // This causes issues when running in a pty process, so we filter out the node_modules paths from the PATH
+        // Since the command here will be run with the package manager script command, the path will be modified again within the PTY process itself.
+        let filteredPath = env.PATH?.split(path.delimiter)
+            .filter((p) => !p.startsWith(path.join(context.root, 'node_modules')))
+            .join(path.delimiter) ?? '';
+        env.PATH = filteredPath;
+        if (pseudo_terminal_1.PseudoTerminal.isSupported()) {
+            await ptyProcess(command, cwd, env);
+        }
+        else {
+            nodeProcess(command, cwd, env);
+        }
         return { success: true };
     }
     catch (e) {
@@ -22,3 +30,27 @@ async function default_1(options, context) {
     }
 }
 exports.default = default_1;
+function nodeProcess(command, cwd, env) {
+    (0, child_process_1.execSync)(command, {
+        stdio: ['inherit', 'inherit', 'inherit'],
+        cwd,
+        env,
+    });
+}
+async function ptyProcess(command, cwd, env) {
+    const terminal = (0, pseudo_terminal_1.getPseudoTerminal)();
+    return new Promise((res, rej) => {
+        const cp = terminal.runCommand(command, { cwd, jsEnv: env });
+        cp.onExit((code) => {
+            if (code === 0) {
+                res();
+            }
+            else if (code >= 128) {
+                process.exit(code);
+            }
+            else {
+                rej();
+            }
+        });
+    });
+}

package/src/executors/utils/convert-nx-executor.js

@@ -17,7 +17,7 @@ function convertNxExecutor(executor) {
             const nxJsonConfiguration = (0, nx_json_1.readNxJson)(builderContext.workspaceRoot);
             const projectsConfigurations = {
                 version: 2,
-                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(builderContext.workspaceRoot, nxJsonConfiguration)).projectNodes,
+                projects: (await (0, retrieve_workspace_files_1.retrieveProjectConfigurations)(builderContext.workspaceRoot, nxJsonConfiguration)).projects,
             };
             const context = {
                 root: builderContext.workspaceRoot,

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.d.ts

@@ -3,4 +3,6 @@ import type { Tree } from '../tree';
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
-export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree): Promise<void>;
+export declare function formatChangedFilesWithPrettierIfAvailable(tree: Tree, options?: {
+    silent?: boolean;
+}): Promise<void>;

package/src/generators/internal-utils/format-changed-files-with-prettier-if-available.js

@@ -6,7 +6,7 @@ const path = require("path");
  * Formats all the created or updated files using Prettier
  * @param tree - the file system tree
  */
-async function formatChangedFilesWithPrettierIfAvailable(tree) {
+async function formatChangedFilesWithPrettierIfAvailable(tree, options) {
     let prettier;
     try {
         prettier = await Promise.resolve().then(() => require('prettier'));
@@ -40,7 +40,9 @@ async function formatChangedFilesWithPrettierIfAvailable(tree) {
             await prettier.format(file.content.toString('utf-8'), options));
         }
         catch (e) {
-            console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
+            if (!options?.silent) {
+                console.warn(`Could not format ${file.path}. Error: "${e.message}"`);
+            }
         }
     }));
 }