nx 20.0.0-beta.3 → 20.0.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.0.0-beta.3",
+  "version": "20.0.0-beta.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -58,7 +58,6 @@
     "open": "^8.4.0",
     "semver": "^7.5.3",
     "string-width": "^4.2.3",
-    "strong-log-transformer": "^2.1.0",
     "tar-stream": "~2.2.0",
     "tmp": "~0.2.1",
     "tsconfig-paths": "^4.1.2",
@@ -67,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "20.0.0-beta.3"
+    "@nrwl/tao": "20.0.0-beta.4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -82,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.0.0-beta.3",
-    "@nx/nx-darwin-arm64": "20.0.0-beta.3",
-    "@nx/nx-linux-x64-gnu": "20.0.0-beta.3",
-    "@nx/nx-linux-x64-musl": "20.0.0-beta.3",
-    "@nx/nx-win32-x64-msvc": "20.0.0-beta.3",
-    "@nx/nx-linux-arm64-gnu": "20.0.0-beta.3",
-    "@nx/nx-linux-arm64-musl": "20.0.0-beta.3",
-    "@nx/nx-linux-arm-gnueabihf": "20.0.0-beta.3",
-    "@nx/nx-win32-arm64-msvc": "20.0.0-beta.3",
-    "@nx/nx-freebsd-x64": "20.0.0-beta.3"
+    "@nx/nx-darwin-x64": "20.0.0-beta.4",
+    "@nx/nx-darwin-arm64": "20.0.0-beta.4",
+    "@nx/nx-linux-x64-gnu": "20.0.0-beta.4",
+    "@nx/nx-linux-x64-musl": "20.0.0-beta.4",
+    "@nx/nx-win32-x64-msvc": "20.0.0-beta.4",
+    "@nx/nx-linux-arm64-gnu": "20.0.0-beta.4",
+    "@nx/nx-linux-arm64-musl": "20.0.0-beta.4",
+    "@nx/nx-linux-arm-gnueabihf": "20.0.0-beta.4",
+    "@nx/nx-win32-arm64-msvc": "20.0.0-beta.4",
+    "@nx/nx-freebsd-x64": "20.0.0-beta.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/import/utils/prepare-source-repo.js

@@ -6,15 +6,20 @@ const path_1 = require("path");
 async function prepareSourceRepo(gitClient, ref, source, relativeDestination, tempImportBranch, sourceRemoteUrl) {
     const spinner = createSpinner().start(`Fetching ${ref} from ${sourceRemoteUrl}`);
     const relativeSourceDir = (0, path_1.relative)(gitClient.root, (0, path_1.join)(gitClient.root, source));
+    const message = relativeSourceDir.trim()
+        ? `Filtering git history to only include files in ${relativeSourceDir}`
+        : `Filtering git history`;
     if (await gitClient.hasFilterRepoInstalled()) {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir}`);
+        spinner.start(message);
         await gitClient.filterRepo(relativeSourceDir, relativeDestination);
     }
     else {
-        spinner.start(`Filtering git history to only include files in ${relativeSourceDir} (this might take a few minutes -- install git-filter-repo for faster performance)`);
+        spinner.start(`${message} (this might take a few minutes -- install git-filter-repo for faster performance)`);
         await gitClient.filterBranch(relativeSourceDir, relativeDestination, tempImportBranch);
     }
-    spinner.succeed(`Filtered git history to only include files in ${relativeSourceDir}`);
+    spinner.succeed(relativeSourceDir.trim()
+        ? `Filtered git history to only include files in ${relativeSourceDir}`
+        : `Filtered git history`);
     spinner.succeed(`${sourceRemoteUrl} has been prepared to be imported into this workspace on a temporary branch: ${tempImportBranch} in ${gitClient.root}`);
 }
 function wait(ms) {

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

@@ -37,16 +37,16 @@ async function resetHandler(args) {
         try {
             await killDaemon();
         }
-        catch {
-            errors.push('Failed to stop the Nx Daemon.');
+        catch (e) {
+            errors.push('Failed to stop the Nx Daemon.', e.toString());
         }
     }
     if (all || args.onlyCache) {
         try {
             await cleanupCacheEntries();
         }
-        catch {
-            errors.push('Failed to clean up the cache directory.');
+        catch (e) {
+            errors.push('Failed to clean up the cache directory.', e.toString());
         }
     }
     if (all || args.onlyWorkspaceData) {
@@ -59,12 +59,17 @@ async function resetHandler(args) {
         try {
             await cleanupWorkspaceData();
         }
-        catch {
-            errors.push('Failed to clean up the workspace data directory.');
+        catch (e) {
+            errors.push('Failed to clean up the workspace data directory.', e.toString());
         }
     }
     if (all || args.onlyCloud) {
-        await resetCloudClient();
+        try {
+            await resetCloudClient();
+        }
+        catch (e) {
+            errors.push('Failed to reset the Nx Cloud client.', e.toString());
+        }
     }
     if (errors.length > 0) {
         output_1.output.error({
@@ -79,8 +84,10 @@ async function resetHandler(args) {
         });
     }
 }
-function killDaemon() {
-    return client_1.daemonClient.stop();
+async function killDaemon() {
+    if (client_1.daemonClient.enabled()) {
+        return client_1.daemonClient.stop();
+    }
 }
 async function resetCloudClient() {
     // Remove nx cloud marker files. This helps if the use happens to run `nx-cloud start-ci-run` or

package/src/generators/utils/project-configuration.js

@@ -69,7 +69,8 @@ function updateProjectConfiguration(tree, projectName, projectConfiguration) {
 function updateProjectConfigurationInPackageJson(tree, projectName, projectConfiguration) {
     const packageJsonFile = (0, path_2.joinPathFragments)(projectConfiguration.root, 'package.json');
     const packageJson = (0, json_1.readJson)(tree, packageJsonFile);
-    if (packageJson.name === projectConfiguration.name ?? projectName) {
+    projectConfiguration.name = projectName;
+    if (packageJson.name === projectConfiguration.name) {
         delete projectConfiguration.name;
     }
     if (projectConfiguration.targets &&

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/forked-process-task-runner.js

@@ -4,7 +4,6 @@ exports.ForkedProcessTaskRunner = void 0;
 const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const chalk = require("chalk");
-const logTransformer = require("strong-log-transformer");
 const output_1 = require("../utils/output");
 const utils_1 = require("./utils");
 const path_1 = require("path");
@@ -208,16 +207,16 @@ class ForkedProcessTaskRunner {
                         const prefixText = `${task.target.project}:`;
                         p.stdout
                             .pipe(logClearLineToPrefixTransformer(color.bold(prefixText) + ' '))
-                            .pipe(logTransformer({ tag: color.bold(prefixText) }))
+                            .pipe(addPrefixTransformer(color.bold(prefixText)))
                             .pipe(process.stdout);
                         p.stderr
                             .pipe(logClearLineToPrefixTransformer(color(prefixText) + ' '))
-                            .pipe(logTransformer({ tag: color(prefixText) }))
+                            .pipe(addPrefixTransformer(color(prefixText)))
                             .pipe(process.stderr);
                     }
                     else {
-                        p.stdout.pipe(logTransformer()).pipe(process.stdout);
-                        p.stderr.pipe(logTransformer()).pipe(process.stderr);
+                        p.stdout.pipe(addPrefixTransformer()).pipe(process.stdout);
+                        p.stderr.pipe(addPrefixTransformer()).pipe(process.stderr);
                     }
                 }
                 let outWithErr = [];
@@ -403,3 +402,15 @@ function logClearLineToPrefixTransformer(prefix) {
         },
     });
 }
+function addPrefixTransformer(prefix) {
+    const newLineSeparator = process.platform.startsWith('win') ? '\r\n' : '\n';
+    return new stream_1.Transform({
+        transform(chunk, _encoding, callback) {
+            const list = chunk.toString().split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/g);
+            list
+                .filter(Boolean)
+                .forEach((m) => this.push(prefix ? prefix + ' ' + m + newLineSeparator : m + newLineSeparator));
+            callback();
+        },
+    });
+}

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/package-json.d.ts

@@ -52,6 +52,7 @@ export interface PackageJson {
         packages: string[];
     };
     publishConfig?: Record<string, string>;
+    files?: string[];
     nx?: NxProjectPackageJsonConfiguration;
     generators?: string;
     schematics?: string;