nx 18.1.1 → 18.2.0-beta.0

package/src/project-graph/utils/retrieve-workspace-files.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.configurationGlobs = exports.createProjectConfigurations = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
+exports.configurationGlobs = exports.retrieveProjectConfigurationsWithoutPluginInference = exports.retrieveProjectConfigurationPaths = exports.retrieveProjectConfigurationsWithAngularProjects = exports.retrieveProjectConfigurations = exports.retrieveWorkspaceFiles = void 0;
 const perf_hooks_1 = require("perf_hooks");
 const installation_directory_1 = require("../../utils/installation-directory");
 const angular_json_1 = require("../../adapter/angular-json");
@@ -58,7 +58,7 @@ exports.retrieveProjectConfigurationsWithAngularProjects = retrieveProjectConfig
 function _retrieveProjectConfigurations(workspaceRoot, nxJson, plugins) {
     const globPatterns = configurationGlobs(plugins);
     const workspaceFiles = (0, workspace_context_1.globWithWorkspaceContext)(workspaceRoot, globPatterns);
-    return createProjectConfigurations(workspaceRoot, nxJson, workspaceFiles, plugins);
+    return (0, project_configuration_utils_1.createProjectConfigurations)(workspaceRoot, nxJson, workspaceFiles, plugins);
 }
 function retrieveProjectConfigurationPaths(root, plugins) {
     const projectGlobPatterns = configurationGlobs(plugins);
@@ -76,7 +76,7 @@ async function retrieveProjectConfigurationsWithoutPluginInference(root) {
         return projectsWithoutPluginCache.get(cacheKey);
     }
     const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(root, projectGlobPatterns) ?? [];
-    const { projects } = await createProjectConfigurations(root, nxJson, projectFiles, [
+    const { projects } = await (0, project_configuration_utils_1.createProjectConfigurations)(root, nxJson, projectFiles, [
         { plugin: (0, package_json_workspaces_1.getNxPackageJsonWorkspacesPlugin)(root) },
         { plugin: project_json_1.ProjectJsonProjectsPlugin },
     ]);
@@ -84,19 +84,6 @@ async function retrieveProjectConfigurationsWithoutPluginInference(root) {
     return projects;
 }
 exports.retrieveProjectConfigurationsWithoutPluginInference = retrieveProjectConfigurationsWithoutPluginInference;
-async function createProjectConfigurations(workspaceRoot, nxJson, configFiles, plugins) {
-    perf_hooks_1.performance.mark('build-project-configs:start');
-    const { projects, externalNodes, rootMap, sourceMaps } = await (0, project_configuration_utils_1.buildProjectsConfigurationsFromProjectPathsAndPlugins)(nxJson, configFiles, plugins, workspaceRoot);
-    perf_hooks_1.performance.mark('build-project-configs:end');
-    perf_hooks_1.performance.measure('build-project-configs', 'build-project-configs:start', 'build-project-configs:end');
-    return {
-        projects,
-        externalNodes,
-        projectRootMap: rootMap,
-        sourceMaps,
-    };
-}
-exports.createProjectConfigurations = createProjectConfigurations;
 function configurationGlobs(plugins) {
     const globPatterns = [];
     for (const { plugin } of plugins) {

package/src/tasks-runner/forked-process-task-runner.d.ts

@@ -22,12 +22,13 @@ export declare class ForkedProcessTaskRunner {
         code: number;
         terminalOutput: string;
     }>;
-    forkProcess(task: Task, { temporaryOutputPath, streamOutput, pipeOutput, taskGraph, env, }: {
+    forkProcess(task: Task, { temporaryOutputPath, streamOutput, taskGraph, env, disablePseudoTerminal, }: {
         temporaryOutputPath: string;
         streamOutput: boolean;
         pipeOutput: boolean;
         taskGraph: TaskGraph;
         env: NodeJS.ProcessEnv;
+        disablePseudoTerminal: boolean;
     }): Promise<{
         code: number;
         terminalOutput: string;

package/src/tasks-runner/forked-process-task-runner.js

@@ -21,10 +21,14 @@ class ForkedProcessTaskRunner {
         this.cliPath = (0, utils_1.getCliPath)();
         this.verbose = process.env.NX_VERBOSE_LOGGING === 'true';
         this.processes = new Set();
-        this.pseudoTerminal = (0, pseudo_terminal_1.getPseudoTerminal)();
+        this.pseudoTerminal = pseudo_terminal_1.PseudoTerminal.isSupported()
+            ? (0, pseudo_terminal_1.getPseudoTerminal)()
+            : null;
     }
     async init() {
-        await this.pseudoTerminal.init();
+        if (this.pseudoTerminal) {
+            await this.pseudoTerminal.init();
+        }
         this.setupProcessEventListeners();
     }
     // TODO: vsavkin delegate terminal output printing
@@ -104,11 +108,14 @@ class ForkedProcessTaskRunner {
                 env,
             });
     }
-    async forkProcess(task, { temporaryOutputPath, streamOutput, pipeOutput, taskGraph, env, }) {
+    async forkProcess(task, { temporaryOutputPath, streamOutput, taskGraph, env, disablePseudoTerminal, }) {
         const shouldPrefix = streamOutput && process.env.NX_PREFIX_OUTPUT === 'true';
         // streamOutput would be false if we are running multiple targets
         // there's no point in running the commands in a pty if we are not streaming the output
-        if (!streamOutput || shouldPrefix || !process.stdout.isTTY) {
+        if (!this.pseudoTerminal ||
+            disablePseudoTerminal ||
+            !streamOutput ||
+            shouldPrefix) {
             return this.forkProcessWithPrefixAndNotTTY(task, {
                 temporaryOutputPath,
                 streamOutput,
@@ -303,13 +310,17 @@ class ForkedProcessTaskRunner {
         (0, fs_1.writeFileSync)(outputPath, content);
     }
     setupProcessEventListeners() {
-        this.pseudoTerminal.onMessageFromChildren((message) => {
-            process.send(message);
-        });
+        if (this.pseudoTerminal) {
+            this.pseudoTerminal.onMessageFromChildren((message) => {
+                process.send(message);
+            });
+        }
         // When the nx process gets a message, it will be sent into the task's process
         process.on('message', (message) => {
             // this.publisher.publish(message.toString());
-            this.pseudoTerminal.sendMessageToChildren(message);
+            if (this.pseudoTerminal) {
+                this.pseudoTerminal.sendMessageToChildren(message);
+            }
             this.processes.forEach((p) => {
                 if ('connected' in p && p.connected) {
                     p.send(message);

package/src/tasks-runner/pseudo-terminal.d.ts

@@ -2,12 +2,13 @@
 import { ChildProcess, RustPseudoTerminal } from '../native';
 import { PseudoIPCServer } from './pseudo-ipc';
 import { Serializable } from 'child_process';
-export declare function getPseudoTerminal(): PseudoTerminal;
+export declare function getPseudoTerminal(skipSupportCheck?: boolean): PseudoTerminal;
 export declare class PseudoTerminal {
     private rustPseudoTerminal;
     private pseudoIPCPath;
     private pseudoIPC;
     private initialized;
+    static isSupported(): boolean;
     constructor(rustPseudoTerminal: RustPseudoTerminal);
     init(): Promise<void>;
     runCommand(command: string, { cwd, jsEnv, quiet, }?: {

package/src/tasks-runner/pseudo-terminal.js

@@ -4,13 +4,20 @@ exports.PseudoTtyProcessWithSend = exports.PseudoTtyProcess = exports.PseudoTerm
 const native_1 = require("../native");
 const pseudo_ipc_1 = require("./pseudo-ipc");
 const socket_utils_1 = require("../daemon/socket-utils");
+const os = require("os");
 let pseudoTerminal;
-function getPseudoTerminal() {
+function getPseudoTerminal(skipSupportCheck = false) {
+    if (!skipSupportCheck && !PseudoTerminal.isSupported()) {
+        throw new Error('Pseudo terminal is not supported on this platform.');
+    }
     pseudoTerminal ??= new PseudoTerminal(new native_1.RustPseudoTerminal());
     return pseudoTerminal;
 }
 exports.getPseudoTerminal = getPseudoTerminal;
 class PseudoTerminal {
+    static isSupported() {
+        return process.stdout.isTTY && supportedPtyPlatform();
+    }
     constructor(rustPseudoTerminal) {
         this.rustPseudoTerminal = rustPseudoTerminal;
         this.pseudoIPCPath = (0, socket_utils_1.FORKED_PROCESS_OS_SOCKET_PATH)(process.pid.toString());
@@ -131,3 +138,22 @@ function messageToCode(message) {
         return 1;
     }
 }
+function supportedPtyPlatform() {
+    if (process.platform !== 'win32') {
+        return true;
+    }
+    let windowsVersion = os.release().split('.');
+    let windowsBuild = windowsVersion[2];
+    if (!windowsBuild) {
+        return false;
+    }
+    // Mininum supported Windows version:
+    // https://en.wikipedia.org/wiki/Windows_10,_version_1809
+    // https://learn.microsoft.com/en-us/windows/console/createpseudoconsole#requirements
+    if (+windowsBuild < 17763) {
+        return false;
+    }
+    else {
+        return true;
+    }
+}

package/src/tasks-runner/task-orchestrator.js

@@ -11,7 +11,6 @@ const utils_1 = require("./utils");
 const tasks_schedule_1 = require("./tasks-schedule");
 const hash_task_1 = require("../hasher/hash-task");
 const task_env_1 = require("./task-env");
-const os = require("os");
 const workspace_root_1 = require("../utils/workspace-root");
 const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
@@ -253,8 +252,9 @@ class TaskOrchestrator {
     }
     async runTaskInForkedProcess(task, env, pipeOutput, temporaryOutputPath, streamOutput) {
         try {
-            let usePtyFork = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false' &&
-                supportedPtyPlatform();
+            const usePtyFork = process.env.NX_NATIVE_COMMAND_RUNNER !== 'false';
+            // Disable the pseudo terminal if this is a run-many
+            const disablePseudoTerminal = !this.initiatingProject;
             // execution
             const { code, terminalOutput } = usePtyFork
                 ? await this.forkedProcessTaskRunner.forkProcess(task, {
@@ -263,6 +263,7 @@ class TaskOrchestrator {
                     pipeOutput,
                     taskGraph: this.taskGraph,
                     env,
+                    disablePseudoTerminal,
                 })
                 : await this.forkedProcessTaskRunner.forkProcessLegacy(task, {
                     temporaryOutputPath,
@@ -412,22 +413,3 @@ class TaskOrchestrator {
     }
 }
 exports.TaskOrchestrator = TaskOrchestrator;
-function supportedPtyPlatform() {
-    if (process.platform !== 'win32') {
-        return true;
-    }
-    let windowsVersion = os.release().split('.');
-    let windowsBuild = windowsVersion[2];
-    if (!windowsBuild) {
-        return false;
-    }
-    // Mininum supported Windows version:
-    // https://en.wikipedia.org/wiki/Windows_10,_version_1809
-    // https://learn.microsoft.com/en-us/windows/console/createpseudoconsole#requirements
-    if (+windowsBuild < 17763) {
-        return false;
-    }
-    else {
-        return true;
-    }
-}

package/src/utils/output.d.ts

@@ -1,5 +1,5 @@
 import * as chalk from 'chalk';
-import { TaskStatus } from '../tasks-runner/tasks-runner';
+import type { TaskStatus } from '../tasks-runner/tasks-runner';
 export interface CLIErrorMessageConfig {
     title: string;
     bodyLines?: string[];

package/src/utils/params.d.ts

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

package/src/utils/params.js

@@ -13,6 +13,20 @@ async function handleErrors(isVerbose, fn) {
         if (err.constructor.name === 'UnsuccessfulWorkflowExecution') {
             logger_1.logger.error('The generator workflow failed. See above.');
         }
+        else if (err.name === 'ProjectGraphError') {
+            const projectGraphError = err;
+            let title = projectGraphError.message;
+            if (isVerbose) {
+                title += ' See errors below.';
+            }
+            const bodyLines = isVerbose
+                ? [projectGraphError.stack]
+                : ['Pass --verbose to see the stacktraces.'];
+            output_1.output.error({
+                title,
+                bodyLines: bodyLines,
+            });
+        }
         else {
             const lines = (err.message ? err.message : err.toString()).split('\n');
             const bodyLines = lines.slice(1);