nx 21.0.0-beta.7 → 21.0.0-beta.8

package/src/tasks-runner/life-cycles/tui-summary-life-cycle.js

@@ -7,6 +7,7 @@ const formatting_utils_1 = require("./formatting-utils");
 const pretty_time_1 = require("./pretty-time");
 const view_logs_utils_1 = require("./view-logs-utils");
 const figures = require("figures");
+const task_history_life_cycle_1 = require("./task-history-life-cycle");
 const LEFT_PAD = `   `;
 const SPACER = `  `;
 const EXTENDED_LEFT_PAD = `      `;
@@ -78,6 +79,7 @@ function getTuiTerminalSummaryLifeCycle({ projectNames, tasks, args, overrides,
         else {
             printRunManySummary();
         }
+        (0, task_history_life_cycle_1.getTasksHistoryLifeCycle)()?.printFlakyTasksMessage();
     };
     const printRunOneSummary = () => {
         let lines = [];

package/src/tasks-runner/run-command.d.ts

@@ -17,6 +17,7 @@ export declare function runCommandForTasks(projectsToRun: ProjectGraphProjectNod
     excludeTaskDependencies: boolean;
     loadDotEnvFiles: boolean;
 }): Promise<TaskResults>;
+export declare function setEnvVarsBasedOnArgs(nxArgs: NxArgs, loadDotEnvFiles: boolean): void;
 export declare function invokeTasksRunner({ tasks, projectGraph, taskGraph, lifeCycle, nxJson, nxArgs, loadDotEnvFiles, initiatingProject, initiatingTasks, }: {
     tasks: Task[];
     projectGraph: ProjectGraph;

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCommand = runCommand;
 exports.runCommandForTasks = runCommandForTasks;
+exports.setEnvVarsBasedOnArgs = setEnvVarsBasedOnArgs;
 exports.invokeTasksRunner = invokeTasksRunner;
 exports.constructLifeCycles = constructLifeCycles;
 exports.getRunner = getRunner;
@@ -14,7 +15,6 @@ const nx_json_1 = require("../config/nx-json");
 const client_1 = require("../daemon/client/client");
 const create_task_hasher_1 = require("../hasher/create-task-hasher");
 const hash_task_1 = require("../hasher/hash-task");
-const native_1 = require("../native");
 const tasks_execution_hooks_1 = require("../project-graph/plugins/tasks-execution-hooks");
 const project_graph_1 = require("../project-graph/project-graph");
 const fileutils_1 = require("../utils/fileutils");
@@ -34,7 +34,6 @@ const static_run_many_terminal_output_life_cycle_1 = require("./life-cycles/stat
 const static_run_one_terminal_output_life_cycle_1 = require("./life-cycles/static-run-one-terminal-output-life-cycle");
 const store_run_information_life_cycle_1 = require("./life-cycles/store-run-information-life-cycle");
 const task_history_life_cycle_1 = require("./life-cycles/task-history-life-cycle");
-const task_history_life_cycle_old_1 = require("./life-cycles/task-history-life-cycle-old");
 const task_profiling_life_cycle_1 = require("./life-cycles/task-profiling-life-cycle");
 const task_results_life_cycle_1 = require("./life-cycles/task-results-life-cycle");
 const task_timings_life_cycle_1 = require("./life-cycles/task-timings-life-cycle");
@@ -633,10 +632,9 @@ function constructLifeCycles(lifeCycle) {
     if (process.env.NX_PROFILE) {
         lifeCycles.push(new task_profiling_life_cycle_1.TaskProfilingLifeCycle(process.env.NX_PROFILE));
     }
-    if (!(0, nx_cloud_utils_1.isNxCloudUsed)((0, nx_json_1.readNxJson)())) {
-        lifeCycles.push(process.env.NX_DISABLE_DB !== 'true' && !native_1.IS_WASM
-            ? new task_history_life_cycle_1.TaskHistoryLifeCycle()
-            : new task_history_life_cycle_old_1.LegacyTaskHistoryLifeCycle());
+    const historyLifeCycle = (0, task_history_life_cycle_1.getTasksHistoryLifeCycle)();
+    if (historyLifeCycle) {
+        lifeCycles.push(historyLifeCycle);
     }
     return lifeCycles;
 }

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

@@ -42,7 +42,8 @@ export declare class TaskOrchestrator {
         [id: string]: TaskStatus;
     }>;
     private executeNextBatchOfTasksUsingTaskSchedule;
-    processTask(taskId: string): Promise<NodeJS.ProcessEnv>;
+    processTasks(taskIds: string[]): void;
+    private processTask;
     private processScheduledBatch;
     private processAllScheduledTasks;
     private applyCachedResults;

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

@@ -124,6 +124,14 @@ class TaskOrchestrator {
         // block until some other task completes, then try again
         return new Promise((res) => this.waitingForTasks.push(res)).then(() => this.executeNextBatchOfTasksUsingTaskSchedule());
     }
+    processTasks(taskIds) {
+        for (const taskId of taskIds) {
+            // Task is already handled or being handled
+            if (!this.processedTasks.has(taskId)) {
+                this.processedTasks.set(taskId, this.processTask(taskId));
+            }
+        }
+    }
     // region Processing Scheduled Tasks
     async processTask(taskId) {
         const task = this.taskGraph.tasks[taskId];
@@ -147,12 +155,7 @@ class TaskOrchestrator {
         for (const batch of scheduledBatches) {
             this.processedBatches.set(batch, this.processScheduledBatch(batch));
         }
-        for (const taskId of scheduledTasks) {
-            // Task is already handled or being handled
-            if (!this.processedTasks.has(taskId)) {
-                this.processedTasks.set(taskId, this.processTask(taskId));
-            }
-        }
+        this.processTasks(scheduledTasks);
     }
     // endregion Processing Scheduled Tasks
     // region Applying Cache

package/src/tasks-runner/utils.js

@@ -294,7 +294,7 @@ function getExecutorNameForTask(task, projectGraph) {
 }
 function getExecutorForTask(task, projectGraph) {
     const executor = getExecutorNameForTask(task, projectGraph);
-    const [nodeModule, executorName] = executor.split(':');
+    const [nodeModule, executorName] = (0, executor_utils_1.parseExecutor)(executor);
     return (0, executor_utils_1.getExecutorInformation)(nodeModule, executorName, workspace_root_1.workspaceRoot, (0, project_graph_1.readProjectsConfigurationFromProjectGraph)(projectGraph).projects);
 }
 function getCustomHasher(task, projectGraph) {

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

@@ -74,7 +74,7 @@ export declare function readNxMigrateConfig(json: Partial<PackageJson>): NxMigra
 export declare function buildTargetFromScript(script: string, scripts: Record<string, string>, packageManagerCommand: PackageManagerCommands): TargetConfiguration;
 export declare function getMetadataFromPackageJson(packageJson: PackageJson, isInPackageManagerWorkspaces: boolean): ProjectMetadata;
 export declare function getTagsFromPackageJson(packageJson: PackageJson): string[];
-export declare function readTargetsFromPackageJson(packageJson: PackageJson, nxJson: NxJsonConfiguration): Record<string, TargetConfiguration<any>>;
+export declare function readTargetsFromPackageJson(packageJson: PackageJson, nxJson: NxJsonConfiguration, projectRoot: string, workspaceRoot: string): Record<string, TargetConfiguration<any>>;
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *

package/src/utils/package-json.js

@@ -83,7 +83,7 @@ function getTagsFromPackageJson(packageJson) {
     }
     return tags;
 }
-function readTargetsFromPackageJson(packageJson, nxJson) {
+function readTargetsFromPackageJson(packageJson, nxJson, projectRoot, workspaceRoot) {
     const { scripts, nx, private: isPrivate } = packageJson ?? {};
     const res = {};
     const includedScripts = nx?.includedScripts || Object.keys(scripts ?? {});
@@ -102,7 +102,9 @@ function readTargetsFromPackageJson(packageJson, nxJson) {
      * Any targetDefaults for the nx-release-publish target set by the user should
      * be merged with the implicit target.
      */
-    if (!isPrivate && !res['nx-release-publish']) {
+    if (!isPrivate &&
+        !res['nx-release-publish'] &&
+        hasNxJsPlugin(projectRoot, workspaceRoot)) {
         const nxReleasePublishTargetDefaults = nxJson?.targetDefaults?.['nx-release-publish'] ?? {};
         res['nx-release-publish'] = {
             executor: '@nx/js:release-publish',
@@ -119,6 +121,18 @@ function readTargetsFromPackageJson(packageJson, nxJson) {
     }
     return res;
 }
+function hasNxJsPlugin(projectRoot, workspaceRoot) {
+    try {
+        // nx-ignore-next-line
+        require.resolve('@nx/js', {
+            paths: [projectRoot, ...(0, installation_directory_1.getNxRequirePaths)(workspaceRoot), __dirname],
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Uses `require.resolve` to read the package.json for a module.
  *