nx 19.7.0-canary.20240822-d6a0cfb → 19.7.0-canary.20240827-61ecd4b

package/src/core/graph/styles.js

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

package/src/daemon/client/client.js

@@ -72,9 +72,11 @@ class DaemonClient {
             // CI=true,env=undefined => no daemon
             // CI=true,env=false => no daemon
             // CI=true,env=true => daemon
+            // docker=true,env=undefined => no daemon
+            // docker=true,env=false => no daemon
+            // docker=true,env=true => daemon
             // WASM => no daemon because file watching does not work
-            if (((0, is_ci_1.isCI)() && env !== 'true') ||
-                isDocker() ||
+            if ((((0, is_ci_1.isCI)() || isDocker()) && env !== 'true') ||
                 (0, tmp_dir_1.isDaemonDisabled)() ||
                 nxJsonIsNotPresent() ||
                 (useDaemonProcessOption === undefined && env === 'false') ||

package/src/devkit-exports.d.ts

@@ -67,6 +67,7 @@ export { readNxJson, updateNxJson, } from './generators/utils/project-configurat
  * @category Project Graph
  */
 export type { ProjectFileMap, FileMap, FileData, ProjectGraph, ProjectGraphDependency, ProjectGraphNode, ProjectGraphProjectNode, ProjectGraphExternalNode, ProjectGraphProcessorContext, } from './config/project-graph';
+export type { GraphJson } from './command-line/graph/graph';
 /**
  * @category Project Graph
  */

package/src/hasher/node-task-hasher-impl.d.ts

@@ -38,7 +38,7 @@ export declare class NodeTaskHasherImpl implements TaskHasherImpl {
     private findExternalDependencyNodeName;
     private hashSingleProjectInputs;
     private hashProjectInputs;
-    private hashRootFileset;
+    private hashRootFilesets;
     private hashProjectConfig;
     private hashTsConfig;
     private hashProjectFileset;

package/src/hasher/node-task-hasher-impl.js

@@ -299,10 +299,10 @@ class NodeTaskHasherImpl {
             this.hashProjectFileset(projectName, projectFilesets),
             this.hashProjectConfig(projectName),
             this.hashTsConfig(projectName),
-            ...[
-                ...workspaceFilesets,
-                ...this.legacyFilesetInputs.map((r) => r.fileset),
-            ].map((fileset) => this.hashRootFileset(fileset)),
+            ...(workspaceFilesets.length
+                ? [this.hashRootFilesets(workspaceFilesets)]
+                : []),
+            this.hashRootFilesets(this.legacyFilesetInputs.map((r) => r.fileset)),
             ...[...notFilesets, ...this.legacyRuntimeInputs].map((r) => r['runtime']
                 ? this.hashRuntime(env, r['runtime'])
                 : this.hashEnv(env, r['env'])),
@@ -320,22 +320,40 @@ class NodeTaskHasherImpl {
         }
         return Promise.all(partialHashes).then((hashes) => hashes.flat());
     }
-    async hashRootFileset(fileset) {
-        const mapKey = fileset;
-        const withoutWorkspaceRoot = fileset.substring(16);
+    async hashRootFilesets(filesets) {
+        const mapKey = `workspace:[${filesets.join(',')}]`;
         if (!this.filesetHashes[mapKey]) {
             this.filesetHashes[mapKey] = new Promise(async (res) => {
                 const parts = [];
-                const matchingFile = this.allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
-                if (matchingFile) {
-                    parts.push(matchingFile.hash);
+                const negativePatterns = [];
+                const positivePatterns = [];
+                for (const fileset of filesets) {
+                    if (fileset.startsWith('!')) {
+                        negativePatterns.push(fileset.substring(17));
+                    }
+                    else {
+                        positivePatterns.push(fileset.substring(16));
+                    }
                 }
-                else {
-                    this.allWorkspaceFiles
-                        .filter((f) => (0, minimatch_1.minimatch)(f.file, withoutWorkspaceRoot))
-                        .forEach((f) => {
-                        parts.push(f.hash);
-                    });
+                for (const fileset of positivePatterns) {
+                    const withoutWorkspaceRoot = fileset;
+                    // Used to shortcut minimatch if not necessary
+                    const matchingFile = this.allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
+                    // shortcut because there is a direct match
+                    if (matchingFile) {
+                        if (!negativePatterns.some((p) => (0, minimatch_1.minimatch)(matchingFile.file, p))) {
+                            parts.push(matchingFile.hash);
+                        }
+                        // No direct match, check if pattern matched
+                    }
+                    else {
+                        this.allWorkspaceFiles
+                            .filter((f) => (0, minimatch_1.minimatch)(f.file, withoutWorkspaceRoot) &&
+                            !negativePatterns.some((p) => (0, minimatch_1.minimatch)(f.file, p)))
+                            .forEach((f) => {
+                            parts.push(f.hash);
+                        });
+                    }
                 }
                 const value = (0, file_hasher_1.hashArray)(parts);
                 res({

package/src/nx-cloud/utilities/axios.js

@@ -11,12 +11,7 @@ function createApiAxiosInstance(options) {
     const nxCloudId = options.nxCloudId;
     // TODO(lourw): Update message with NxCloudId once it is supported
     if (!accessToken && !nxCloudId) {
-        if (process.env.NX_ENABLE_LOGIN === 'true' && !nxCloudId) {
-            throw new Error(`Unable to authenticate. Please connect your workspace to Nx Cloud to define a valid Nx Cloud Id. If you are in a CI context, please set the NX_CLOUD_ACCESS_TOKEN environment variable or define an access token in your nx.json.`);
-        }
-        else {
-            throw new Error(`Unable to authenticate. Either define accessToken in nx.json or set the NX_CLOUD_ACCESS_TOKEN env variable. If you do not want to use Nx Cloud for this command, either set NX_NO_CLOUD=true, or pass the --no-cloud flag.`);
-        }
+        throw new Error(`Unable to authenticate. If you are connecting to Nx Cloud locally, set an Nx Cloud ID in your nx.json with "nx connect". If you are in a CI context, please set the NX_CLOUD_ACCESS_TOKEN environment variable or define an access token in your nx.json.`);
     }
     if (options.customProxyConfigPath) {
         const { nxCloudProxyConfig } = require((0, path_1.join)(process.cwd(), options.customProxyConfigPath));

package/src/plugins/js/package-json/create-package-json.d.ts

@@ -19,6 +19,7 @@ export declare function createPackageJson(projectName: string, graph: ProjectGra
     isProduction?: boolean;
     helperDependencies?: string[];
     skipPackageManager?: boolean;
+    skipOverrides?: boolean;
 }, fileMap?: ProjectFileMap): PackageJson;
 export declare function findProjectsNpmDependencies(projectNode: ProjectGraphProjectNode, graph: ProjectGraph, target: string, rootPackageJson: PackageJson, options: {
     helperDependencies?: string[];

package/src/plugins/js/package-json/create-package-json.js

@@ -121,6 +121,30 @@ function createPackageJson(projectName, graph, options = {}, fileMap = null) {
         }
         packageJson.packageManager = rootPackageJson.packageManager;
     }
+    // region Overrides/Resolutions
+    // npm
+    if (rootPackageJson.overrides && !options.skipOverrides) {
+        packageJson.overrides = {
+            ...rootPackageJson.overrides,
+            ...packageJson.overrides,
+        };
+    }
+    // pnpm
+    if (rootPackageJson.pnpm?.overrides && !options.skipOverrides) {
+        packageJson.pnpm ??= {};
+        packageJson.pnpm.overrides = {
+            ...rootPackageJson.pnpm.overrides,
+            ...packageJson.pnpm.overrides,
+        };
+    }
+    // yarn
+    if (rootPackageJson.resolutions && !options.skipOverrides) {
+        packageJson.resolutions = {
+            ...rootPackageJson.resolutions,
+            ...packageJson.resolutions,
+        };
+    }
+    // endregion Overrides/Resolutions
     return packageJson;
 }
 function findProjectsNpmDependencies(projectNode, graph, target, rootPackageJson, options, fileMap) {

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

@@ -56,7 +56,7 @@ const defaultTasksRunner = async (tasks, options, context) => {
 };
 exports.defaultTasksRunner = defaultTasksRunner;
 async function runAllTasks(tasks, options, context) {
-    const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, context.nxArgs?.nxBail, context.daemon);
+    const orchestrator = new task_orchestrator_1.TaskOrchestrator(context.hasher, context.initiatingProject, context.projectGraph, context.taskGraph, options, context.nxArgs?.nxBail, context.daemon, context.nxArgs?.outputStyle);
     return orchestrator.run();
 }
 exports.default = exports.defaultTasksRunner;

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

@@ -1,5 +1,6 @@
 import { NxArgs } from '../utils/command-line-utils';
 import { Task, TaskGraph } from '../config/task-graph';
+import { TaskResult } from './life-cycle';
 export declare function initTasksRunner(nxArgs: NxArgs): Promise<{
     invoke: (opts: {
         tasks: Task[];
@@ -7,5 +8,6 @@ export declare function initTasksRunner(nxArgs: NxArgs): Promise<{
     }) => Promise<{
         status: number;
         taskGraph: TaskGraph;
+        taskResults: Record<string, TaskResult>;
     }>;
 }>;

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

@@ -52,6 +52,7 @@ async function initTasksRunner(nxArgs) {
             return {
                 status,
                 taskGraph,
+                taskResults: lifeCycle.getTaskResults(),
             };
         },
     };

package/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.d.ts

@@ -1,17 +1,15 @@
 import { TaskStatus } from '../tasks-runner';
-import type { LifeCycle } from '../life-cycle';
+import type { LifeCycle, TaskResult } from '../life-cycle';
 import { Task } from '../../config/task-graph';
 export declare class InvokeRunnerTerminalOutputLifeCycle implements LifeCycle {
     private readonly tasks;
     failedTasks: Task[];
     cachedTasks: Task[];
+    private taskResults;
     constructor(tasks: Task[]);
     startCommand(): void;
     endCommand(): void;
-    endTasks(taskResults: {
-        task: Task;
-        status: TaskStatus;
-        code: number;
-    }[]): void;
+    endTasks(taskResults: TaskResult[]): void;
     printTaskTerminalOutput(task: Task, cacheStatus: TaskStatus, terminalOutput: string): void;
+    getTaskResults(): Record<string, TaskResult>;
 }

package/src/tasks-runner/life-cycles/invoke-runner-terminal-output-life-cycle.js

@@ -8,6 +8,7 @@ class InvokeRunnerTerminalOutputLifeCycle {
         this.tasks = tasks;
         this.failedTasks = [];
         this.cachedTasks = [];
+        this.taskResults = {};
     }
     startCommand() {
         output_1.output.log({
@@ -45,6 +46,7 @@ class InvokeRunnerTerminalOutputLifeCycle {
     }
     endTasks(taskResults) {
         for (let t of taskResults) {
+            this.taskResults[t.task.id] = t;
             if (t.status === 'failure') {
                 this.failedTasks.push(t.task);
             }
@@ -63,5 +65,8 @@ class InvokeRunnerTerminalOutputLifeCycle {
         const args = (0, utils_1.getPrintableCommandArgsForTask)(task);
         output_1.output.logCommandOutput(args.join(' '), cacheStatus, terminalOutput);
     }
+    getTaskResults() {
+        return this.taskResults;
+    }
 }
 exports.InvokeRunnerTerminalOutputLifeCycle = InvokeRunnerTerminalOutputLifeCycle;

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

@@ -441,7 +441,7 @@ function getTasksRunnerPath(runner, nxJson) {
         nxJson.tasksRunnerOptions?.[runner]?.options?.accessToken ||
         // Cloud access token specified in env var.
         process.env.NX_CLOUD_ACCESS_TOKEN ||
-        // Nx Cloud Id specified in nxJson
+        // Nx Cloud ID specified in nxJson
         nxJson.nxCloudId;
     return isCloudRunner ? 'nx-cloud' : require.resolve('./default-tasks-runner');
 }

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

@@ -12,6 +12,7 @@ export declare class TaskOrchestrator {
     private readonly options;
     private readonly bail;
     private readonly daemon;
+    private readonly outputStyle;
     private cache;
     private forkedProcessTaskRunner;
     private tasksSchedule;
@@ -23,7 +24,7 @@ export declare class TaskOrchestrator {
     private waitingForTasks;
     private groups;
     private bailed;
-    constructor(hasher: TaskHasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean, daemon: DaemonClient);
+    constructor(hasher: TaskHasher, initiatingProject: string | undefined, projectGraph: ProjectGraph, taskGraph: TaskGraph, options: DefaultTasksRunnerOptions, bail: boolean, daemon: DaemonClient, outputStyle: string);
     run(): Promise<{
         [id: string]: TaskStatus;
     }>;

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

@@ -19,7 +19,7 @@ const nx_cloud_utils_1 = require("../utils/nx-cloud-utils");
 const nx_json_1 = require("../config/nx-json");
 class TaskOrchestrator {
     // endregion internal state
-    constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon) {
+    constructor(hasher, initiatingProject, projectGraph, taskGraph, options, bail, daemon, outputStyle) {
         this.hasher = hasher;
         this.initiatingProject = initiatingProject;
         this.projectGraph = projectGraph;
@@ -27,6 +27,7 @@ class TaskOrchestrator {
         this.options = options;
         this.bail = bail;
         this.daemon = daemon;
+        this.outputStyle = outputStyle;
         this.cache = process.env.NX_DB_CACHE === 'true'
             ? new cache_1.DbCache({
                 // Remove this in Nx 21
@@ -209,7 +210,9 @@ class TaskOrchestrator {
         const pipeOutput = await this.pipeOutputCapture(task);
         // obtain metadata
         const temporaryOutputPath = this.cache.temporaryOutputPath(task);
-        const streamOutput = (0, utils_1.shouldStreamOutput)(task, this.initiatingProject);
+        const streamOutput = this.outputStyle === 'static'
+            ? false
+            : (0, utils_1.shouldStreamOutput)(task, this.initiatingProject);
         let env = pipeOutput
             ? (0, task_env_1.getEnvVariablesForTask)(task, taskSpecificEnv, process.env.FORCE_COLOR === undefined
                 ? 'true'

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

@@ -42,6 +42,9 @@ export interface PackageJson {
         optional: boolean;
     }>;
     resolutions?: Record<string, string>;
+    pnpm?: {
+        overrides?: PackageOverride;
+    };
     overrides?: PackageOverride;
     bin?: Record<string, string> | string;
     workspaces?: string[] | {