nx 21.3.0-beta.3 → 21.3.0-beta.5

package/src/core/graph/styles.js

@@ -1 +1 @@
-"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{5873:()=>{}},s=>{var e;e=5873,s(s.s=e)}]);
+"use strict";(self.webpackChunk=self.webpackChunk||[]).push([[869],{7910:()=>{}},s=>{var e;e=7910,s(s.s=e)}]);

package/src/tasks-runner/is-tui-enabled.js

@@ -4,6 +4,7 @@ exports.isTuiEnabled = isTuiEnabled;
 exports.shouldUseTui = shouldUseTui;
 const native_1 = require("../native");
 const is_ci_1 = require("../utils/is-ci");
+const logger_1 = require("../utils/logger");
 let tuiEnabled = undefined;
 /**
  * @returns If tui is enabled
@@ -25,6 +26,13 @@ function shouldUseTui(nxJson, nxArgs, skipCapabilityCheck = process.env.NX_TUI_S
     // If the current terminal/environment is not capable of displaying the TUI, we don't run it
     const isWindows = process.platform === 'win32';
     const isCapable = skipCapabilityCheck || (process.stderr.isTTY && isUnicodeSupported());
+    if (typeof nxArgs.tui === 'boolean') {
+        if (nxArgs.tui && !isCapable) {
+            logger_1.logger.warn('Nx Terminal UI was not enabled as it is not supported in this environment.');
+            return false;
+        }
+        return nxArgs.tui;
+    }
     if (!isCapable) {
         return false;
     }

package/src/utils/command-line-utils.d.ts

@@ -29,6 +29,7 @@ export interface NxArgs {
     skipNxCache?: boolean;
     skipRemoteCache?: boolean;
     outputStyle?: string;
+    tui?: boolean;
     nxBail?: boolean;
     nxIgnoreCycles?: boolean;
     type?: string;

package/src/utils/project-graph-utils.d.ts

@@ -1,7 +1,11 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
+import type { ProjectConfiguration } from '../config/workspace-json-project-json';
 export declare function projectHasTarget(project: ProjectGraphProjectNode, target: string): boolean;
 export declare function projectHasTargetAndConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string): any;
-export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [projectDirs: string[], warnings: string[]];
+export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [
+    projectDirs: string[],
+    warnings: string[]
+];
 /**
  * Find all internal project dependencies.
  * All the external (npm) dependencies will be filtered out unless includeExternalDependencies is set to true
@@ -11,3 +15,4 @@ export declare function getSourceDirOfDependentProjects(projectName: string, pro
  * @returns {string[]}
  */
 export declare function findAllProjectNodeDependencies(parentNodeName: string, projectGraph?: ProjectGraph, includeExternalDependencies?: boolean): string[];
+export declare function getProjectSourceRoot(project: ProjectConfiguration): string | undefined;

package/src/utils/project-graph-utils.js

@@ -4,6 +4,9 @@ exports.projectHasTarget = projectHasTarget;
 exports.projectHasTargetAndConfiguration = projectHasTargetAndConfiguration;
 exports.getSourceDirOfDependentProjects = getSourceDirOfDependentProjects;
 exports.findAllProjectNodeDependencies = findAllProjectNodeDependencies;
+exports.getProjectSourceRoot = getProjectSourceRoot;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
 const project_graph_1 = require("../project-graph/project-graph");
 function projectHasTarget(project, target) {
     return !!(project.data &&
@@ -21,12 +24,8 @@ function getSourceDirOfDependentProjects(projectName, projectGraph = (0, project
     }
     const nodeNames = findAllProjectNodeDependencies(projectName, projectGraph);
     return nodeNames.reduce((result, nodeName) => {
-        if (projectGraph.nodes[nodeName].data.sourceRoot) {
-            result[0].push(projectGraph.nodes[nodeName].data.sourceRoot);
-        }
-        else {
-            result[1].push(nodeName);
-        }
+        const sourceRoot = getProjectSourceRoot(projectGraph.nodes[nodeName].data);
+        result[0].push(sourceRoot);
         return result;
     }, [[], []]);
 }
@@ -71,3 +70,9 @@ function collectDependentProjectNodesNames(nxDeps, dependencyNodeNames, parentNo
         collectDependentProjectNodesNames(nxDeps, dependencyNodeNames, dependencyName, includeExternalDependencies);
     }
 }
+function getProjectSourceRoot(project) {
+    return (project.sourceRoot ??
+        ((0, node_fs_1.existsSync)(node_path_1.posix.join(project.root, 'src'))
+            ? node_path_1.posix.join(project.root, 'src')
+            : project.root));
+}

package/src/command-line/login/login.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loginHandler = loginHandler;
-const update_manager_1 = require("../../nx-cloud/update-manager");
-const get_cloud_options_1 = require("../../nx-cloud/utilities/get-cloud-options");
-const handle_errors_1 = require("../../utils/handle-errors");
-const resolution_helpers_1 = require("../../nx-cloud/resolution-helpers");
-function loginHandler(args) {
-    if (args.nxCloudUrl) {
-        process.env.NX_CLOUD_API = args.nxCloudUrl;
-    }
-    return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-        const nxCloudClient = (await (0, update_manager_1.verifyOrUpdateNxCloudClient)((0, get_cloud_options_1.getCloudOptions)()))
-            .nxCloudClient;
-        const paths = (0, resolution_helpers_1.findAncestorNodeModules)(__dirname, []);
-        nxCloudClient.configureLightClientRequire()(paths);
-        await nxCloudClient.commands.login();
-    });
-}