nx 19.8.2 → 19.8.3

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

@@ -16,22 +16,11 @@ let pseudoTerminal;
 const childProcesses = new Set();
 function loadEnvVarsFile(path, env = {}) {
     (0, task_env_1.unloadDotEnvFile)(path, env);
-    const result = (0, task_env_1.loadAndExpandDotEnvFile)(path, env, true);
+    const result = (0, task_env_1.loadAndExpandDotEnvFile)(path, env);
     if (result.error) {
         throw result.error;
     }
 }
-function loadEnvVars(path, env = {}) {
-    if (path) {
-        loadEnvVarsFile(path, env);
-    }
-    else {
-        try {
-            loadEnvVarsFile('.env', env);
-        }
-        catch { }
-    }
-}
 const propKeys = [
     'command',
     'commands',
@@ -292,20 +281,24 @@ function calculateCwd(cwd, context) {
         return cwd;
     return path.join(context.root, cwd);
 }
-function processEnv(color, cwd, env, envFile) {
-    const localEnv = (0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() });
-    let res = {
+/**
+ * Env variables are processed in the following order:
+ * - env option from executor options
+ * - env file from envFile option if provided
+ * - local env variables
+ */
+function processEnv(color, cwd, envOptionFromExecutor, envFile) {
+    let localEnv = (0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() });
+    localEnv = {
         ...process.env,
         ...localEnv,
     };
-    // env file from envFile option takes priority over process env
-    if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false') {
-        loadEnvVars(envFile, res);
+    if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false' && envFile) {
+        loadEnvVarsFile(envFile, localEnv);
     }
-    // env variables from env option takes priority over everything else
-    res = {
-        ...res,
-        ...env,
+    let res = {
+        ...localEnv,
+        ...envOptionFromExecutor,
     };
     // need to override PATH to make sure we are using the local node_modules
     if (localEnv.PATH)

package/src/hasher/hash-task.d.ts

@@ -2,5 +2,7 @@ import { Task, TaskGraph } from '../config/task-graph';
 import { TaskHasher } from './task-hasher';
 import { ProjectGraph } from '../config/project-graph';
 import { NxJsonConfiguration } from '../config/nx-json';
-export declare function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, nxJson: NxJsonConfiguration): Promise<void>;
-export declare function hashTask(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, task: Task, env: NodeJS.ProcessEnv): Promise<void>;
+import { TaskDetails } from '../native';
+export declare function getTaskDetails(): TaskDetails | null;
+export declare function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, nxJson: NxJsonConfiguration, tasksDetails: TaskDetails | null): Promise<void>;
+export declare function hashTask(hasher: TaskHasher, projectGraph: ProjectGraph, taskGraph: TaskGraph, task: Task, env: NodeJS.ProcessEnv, taskDetails: TaskDetails | null): Promise<void>;

package/src/hasher/hash-task.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTaskDetails = getTaskDetails;
 exports.hashTasksThatDoNotDependOnOutputsOfOtherTasks = hashTasksThatDoNotDependOnOutputsOfOtherTasks;
 exports.hashTask = hashTask;
 const utils_1 = require("../tasks-runner/utils");
@@ -19,9 +20,8 @@ function getTaskDetails() {
     }
     return taskDetails;
 }
-async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGraph, taskGraph, nxJson) {
+async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGraph, taskGraph, nxJson, tasksDetails) {
     performance.mark('hashMultipleTasks:start');
-    const taskDetails = getTaskDetails();
     const tasks = Object.values(taskGraph.tasks);
     const tasksWithHashers = await Promise.all(tasks.map(async (task) => {
         const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
@@ -42,9 +42,8 @@ async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGrap
         tasksToHash[i].hash = hashes[i].value;
         tasksToHash[i].hashDetails = hashes[i].details;
     }
-    // TODO: Remove if when sqlite is always on
-    if (taskDetails) {
-        taskDetails.recordTaskDetails(tasksToHash.map((task) => ({
+    if (tasksDetails?.recordTaskDetails) {
+        tasksDetails.recordTaskDetails(tasksToHash.map((task) => ({
             hash: task.hash,
             project: task.target.project,
             target: task.target.target,
@@ -54,9 +53,8 @@ async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(hasher, projectGrap
     performance.mark('hashMultipleTasks:end');
     performance.measure('hashMultipleTasks', 'hashMultipleTasks:start', 'hashMultipleTasks:end');
 }
-async function hashTask(hasher, projectGraph, taskGraph, task, env) {
+async function hashTask(hasher, projectGraph, taskGraph, task, env, taskDetails) {
     performance.mark('hashSingleTask:start');
-    const taskDetails = getTaskDetails();
     const customHasher = (0, utils_1.getCustomHasher)(task, projectGraph);
     const projectsConfigurations = (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph);
     const { value, details } = await (customHasher
@@ -72,8 +70,7 @@ async function hashTask(hasher, projectGraph, taskGraph, task, env) {
         : hasher.hashTask(task, taskGraph, env));
     task.hash = value;
     task.hashDetails = details;
-    // TODO: Remove if when wasm supports sqlite
-    if (taskDetails) {
+    if (taskDetails?.recordTaskDetails) {
         taskDetails.recordTaskDetails([
             {
                 hash: task.hash,

package/src/tasks-runner/life-cycles/dynamic-run-many-terminal-output-life-cycle.js

@@ -224,6 +224,11 @@ async function createRunManyDynamicOutputRenderer({ projectNames, tasks, args, o
         clearRenderInterval();
         const timeTakenText = (0, pretty_time_1.prettyTime)(process.hrtime(start));
         moveCursorToStartOfPinnedFooter();
+        if (totalTasks === 0) {
+            renderPinnedFooter([output_1.output.applyNxPrefix('gray', 'No tasks were run')]);
+            resolveRenderIsDonePromise();
+            return;
+        }
         if (totalSuccessfulTasks === totalTasks) {
             const text = `Successfully ran ${(0, formatting_utils_1.formatTargetsAndProjects)(projectNames, targets, tasks)}`;
             const taskOverridesRows = [];

package/src/tasks-runner/life-cycles/static-run-many-terminal-output-life-cycle.js

@@ -23,6 +23,9 @@ class StaticRunManyTerminalOutputLifeCycle {
         this.allCompletedTasks = new Map();
     }
     startCommand() {
+        if (this.tasks.length === 0) {
+            return;
+        }
         if (this.projectNames.length <= 0) {
             output_1.output.logSingleLine(`No projects with ${(0, formatting_utils_1.formatTargetsAndProjects)(this.projectNames, this.args.targets, this.tasks)} were run`);
             return;
@@ -45,6 +48,10 @@ class StaticRunManyTerminalOutputLifeCycle {
     }
     endCommand() {
         output_1.output.addNewline();
+        if (this.tasks.length === 0) {
+            output_1.output.logSingleLine(`No tasks were run`);
+            return;
+        }
         if (this.failedTasks.length === 0) {
             output_1.output.addVerticalSeparatorWithoutNewLines('green');
             const bodyLines = this.cachedTasks.length > 0

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

@@ -363,12 +363,14 @@ function setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles) {
 }
 async function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nxJson, nxArgs, loadDotEnvFiles, initiatingProject, }) {
     setEnvVarsBasedOnArgs(nxArgs, loadDotEnvFiles);
+    // this needs to be done before we start to run the tasks
+    const taskDetails = (0, hash_task_1.getTaskDetails)();
     const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
     let hasher = (0, create_task_hasher_1.createTaskHasher)(projectGraph, nxJson, runnerOptions);
     // this is used for two reasons: to fetch all remote cache hits AND
     // to submit everything that is known in advance to Nx Cloud to run in
     // a distributed fashion
-    await (0, hash_task_1.hashTasksThatDoNotDependOnOutputsOfOtherTasks)(hasher, projectGraph, taskGraph, nxJson);
+    await (0, hash_task_1.hashTasksThatDoNotDependOnOutputsOfOtherTasks)(hasher, projectGraph, taskGraph, nxJson, taskDetails);
     const taskResultsLifecycle = new task_results_life_cycle_1.TaskResultsLifeCycle();
     const compositedLifeCycle = new life_cycle_1.CompositeLifeCycle([
         ...constructLifeCycles(lifeCycle),

package/src/tasks-runner/task-orchestrator.d.ts

@@ -15,6 +15,7 @@ export declare class TaskOrchestrator {
     private readonly bail;
     private readonly daemon;
     private readonly outputStyle;
+    private taskDetails;
     private cache;
     private forkedProcessTaskRunner;
     private tasksSchedule;

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

@@ -27,6 +27,7 @@ class TaskOrchestrator {
         this.bail = bail;
         this.daemon = daemon;
         this.outputStyle = outputStyle;
+        this.taskDetails = (0, hash_task_1.getTaskDetails)();
         this.cache = (0, cache_1.getCache)(this.nxJson, this.options);
         this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
         this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.projectGraph, this.taskGraph, this.options);
@@ -93,7 +94,7 @@ class TaskOrchestrator {
         const task = this.taskGraph.tasks[taskId];
         const taskSpecificEnv = (0, task_env_1.getTaskSpecificEnv)(task);
         if (!task.hash) {
-            await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, taskSpecificEnv);
+            await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, taskSpecificEnv, this.taskDetails);
         }
         await this.options.lifeCycle.scheduleTask(task);
         return taskSpecificEnv;
@@ -101,7 +102,7 @@ class TaskOrchestrator {
     async processScheduledBatch(batch) {
         await Promise.all(Object.values(batch.taskGraph.tasks).map(async (task) => {
             if (!task.hash) {
-                await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, this.batchEnv);
+                await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraph, task, this.batchEnv, this.taskDetails);
             }
             await this.options.lifeCycle.scheduleTask(task);
         }));
@@ -321,6 +322,9 @@ class TaskOrchestrator {
             };
         }
         catch (e) {
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                console.error(e);
+            }
             return {
                 code: 1,
             };

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

@@ -19,6 +19,7 @@ export declare class TasksSchedule {
     private completedTasks;
     private scheduleRequestsExecutionChain;
     private estimatedTaskTimings;
+    private projectDependencies;
     constructor(projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions);
     init(): Promise<void>;
     scheduleNextTasks(): Promise<void>;

package/src/tasks-runner/tasks-schedule.js

@@ -20,12 +20,16 @@ class TasksSchedule {
         this.completedTasks = new Set();
         this.scheduleRequestsExecutionChain = Promise.resolve();
         this.estimatedTaskTimings = {};
+        this.projectDependencies = {};
     }
     async init() {
         if (this.taskHistory) {
             this.estimatedTaskTimings =
                 await this.taskHistory.getEstimatedTaskTimings(Object.values(this.taskGraph.tasks).map((t) => t.target));
         }
+        for (const project of Object.values(this.taskGraph.tasks).map((t) => t.target.project)) {
+            this.projectDependencies[project] ??= (0, project_graph_utils_1.findAllProjectNodeDependencies)(project, this.reverseProjectGraph).length;
+        }
     }
     async scheduleNextTasks() {
         this.scheduleRequestsExecutionChain =
@@ -90,8 +94,8 @@ class TasksSchedule {
             // Most likely tasks with no dependencies such as test
             const project1 = this.taskGraph.tasks[taskId1].target.project;
             const project2 = this.taskGraph.tasks[taskId2].target.project;
-            const project1NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project1, this.reverseProjectGraph).length;
-            const project2NodeDependencies = (0, project_graph_utils_1.findAllProjectNodeDependencies)(project2, this.reverseProjectGraph).length;
+            const project1NodeDependencies = this.projectDependencies[project1];
+            const project2NodeDependencies = this.projectDependencies[project2];
             const dependenciesDiff = project2NodeDependencies - project1NodeDependencies;
             if (dependenciesDiff !== 0) {
                 return dependenciesDiff;

package/src/utils/plugins/output.js

@@ -47,7 +47,7 @@ function listAlsoAvailableCorePlugins(installedPlugins) {
     }
 }
 function listPowerpackPlugins() {
-    const powerpackLink = 'https://nx.dev/plugin-registry';
+    const powerpackLink = 'https://nx.dev/plugin-registry#powerpack';
     output_1.output.log({
         title: `Available Powerpack Plugins: ${powerpackLink}`,
     });