nx 19.6.3 → 19.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.3",
+  "version": "19.6.4",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.3"
+    "@nrwl/tao": "19.6.4"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.3",
-    "@nx/nx-darwin-arm64": "19.6.3",
-    "@nx/nx-linux-x64-gnu": "19.6.3",
-    "@nx/nx-linux-x64-musl": "19.6.3",
-    "@nx/nx-win32-x64-msvc": "19.6.3",
-    "@nx/nx-linux-arm64-gnu": "19.6.3",
-    "@nx/nx-linux-arm64-musl": "19.6.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.3",
-    "@nx/nx-win32-arm64-msvc": "19.6.3",
-    "@nx/nx-freebsd-x64": "19.6.3"
+    "@nx/nx-darwin-x64": "19.6.4",
+    "@nx/nx-darwin-arm64": "19.6.4",
+    "@nx/nx-linux-x64-gnu": "19.6.4",
+    "@nx/nx-linux-x64-musl": "19.6.4",
+    "@nx/nx-win32-x64-msvc": "19.6.4",
+    "@nx/nx-linux-arm64-gnu": "19.6.4",
+    "@nx/nx-linux-arm64-musl": "19.6.4",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.4",
+    "@nx/nx-win32-arm64-msvc": "19.6.4",
+    "@nx/nx-freebsd-x64": "19.6.4"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

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

@@ -675,8 +675,10 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
     const externalInputs = [];
     const otherInputs = [];
     inputs.forEach((input) => {
-        if (input.startsWith('{workspaceRoot}')) {
-            workspaceRootInputs.push(input);
+        // grouped workspace inputs look like workspace:[pattern,otherPattern]
+        if (input.startsWith('workspace:[')) {
+            const inputs = input.substring(11, input.length - 1).split(',');
+            workspaceRootInputs.push(...inputs);
             return;
         }
         const maybeProjectName = input.split(':')[0];
@@ -696,22 +698,7 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
             return;
         }
     });
-    const workspaceRootsExpanded = workspaceRootInputs.flatMap((input) => {
-        const matches = [];
-        const withoutWorkspaceRoot = input.substring(16);
-        const matchingFile = allWorkspaceFiles.find((t) => t.file === withoutWorkspaceRoot);
-        if (matchingFile) {
-            matches.push(matchingFile.file);
-        }
-        else {
-            allWorkspaceFiles
-                .filter((f) => (0, minimatch_1.minimatch)(f.file, withoutWorkspaceRoot))
-                .forEach((f) => {
-                matches.push(f.file);
-            });
-        }
-        return matches;
-    });
+    const workspaceRootsExpanded = getExpandedWorkspaceRoots(workspaceRootInputs, allWorkspaceFiles);
     const otherInputsExpanded = otherInputs.map((input) => {
         if (input === 'TsConfig') {
             return (0, path_1.relative)(workspace_root_1.workspaceRoot, (0, typescript_1.getRootTsConfigPath)());
@@ -744,6 +731,36 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
         external: externalInputs,
     };
 }
+function getExpandedWorkspaceRoots(workspaceRootInputs, allWorkspaceFiles) {
+    const workspaceRootsExpanded = [];
+    const negativeWRPatterns = [];
+    const positiveWRPatterns = [];
+    for (const fileset of workspaceRootInputs) {
+        if (fileset.startsWith('!')) {
+            negativeWRPatterns.push(fileset.substring(17));
+        }
+        else {
+            positiveWRPatterns.push(fileset.substring(16));
+        }
+    }
+    for (const pattern of positiveWRPatterns) {
+        const matchingFile = allWorkspaceFiles.find((t) => t.file === pattern);
+        if (matchingFile &&
+            !negativeWRPatterns.some((p) => (0, minimatch_1.minimatch)(matchingFile.file, p))) {
+            workspaceRootsExpanded.push(matchingFile.file);
+        }
+        else {
+            allWorkspaceFiles
+                .filter((f) => (0, minimatch_1.minimatch)(f.file, pattern) &&
+                !negativeWRPatterns.some((p) => (0, minimatch_1.minimatch)(f.file, p)))
+                .forEach((f) => {
+                workspaceRootsExpanded.push(f.file);
+            });
+        }
+    }
+    workspaceRootsExpanded.sort();
+    return workspaceRootsExpanded;
+}
 async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
     const response = {
         graph: prunedGraph,

package/src/command-line/release/index.d.ts

@@ -10,19 +10,21 @@ export declare class ReleaseClient {
     release: (args: import("./command-object").ReleaseOptions) => Promise<import("./version").NxReleaseVersionResult | number>;
     constructor(overrideReleaseConfig: NxReleaseConfiguration);
 }
+declare const defaultClient: ReleaseClient;
 /**
  * @public
  */
-export declare const releaseChangelog: any;
+export declare const releaseChangelog: typeof defaultClient.releaseChangelog;
 /**
  * @public
  */
-export declare const releasePublish: any;
+export declare const releasePublish: typeof defaultClient.releasePublish;
 /**
  * @public
  */
-export declare const releaseVersion: any;
+export declare const releaseVersion: typeof defaultClient.releaseVersion;
 /**
  * @public
  */
-export declare const release: any;
+export declare const release: typeof defaultClient.release;
+export {};

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

@@ -16,7 +16,7 @@ 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);
+    const result = (0, task_env_1.loadAndExpandDotEnvFile)(path, env, true);
     if (result.error) {
         throw result.error;
     }
@@ -293,14 +293,19 @@ function calculateCwd(cwd, context) {
 }
 function processEnv(color, cwd, env, envFile) {
     const localEnv = (0, npm_run_path_1.env)({ cwd: cwd ?? process.cwd() });
-    const res = {
+    let res = {
         ...process.env,
         ...localEnv,
-        ...env,
     };
+    // env file from envFile option takes priority over process env
     if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false') {
         loadEnvVars(envFile, res);
     }
+    // env variables from env option takes priority over everything else
+    res = {
+        ...res,
+        ...env,
+    };
     // need to override PATH to make sure we are using the local node_modules
     if (localEnv.PATH)
         res.PATH = localEnv.PATH; // UNIX-like

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/plugins/js/project-graph/build-dependencies/target-project-locator.js

@@ -18,6 +18,13 @@ const defaultNpmResolutionCache = new Map();
 const builtInModuleSet = new Set([
     ...node_module_1.builtinModules,
     ...node_module_1.builtinModules.map((x) => `node:${x}`),
+    // These are missing in the builtinModules list
+    // See: https://github.com/nodejs/node/issues/42785
+    // TODO(v20): We should be safe to use `isBuiltin` function instead of keep the set here (https://nodejs.org/api/module.html#moduleisbuiltinmodulename)
+    'test',
+    'node:test',
+    'node:sea',
+    'node:sqlite',
 ]);
 function isBuiltinModuleImport(importExpr) {
     const packageName = (0, get_package_name_from_import_path_1.getPackageNameFromImportPath)(importExpr);
@@ -265,7 +272,7 @@ class TargetProjectLocator {
             // Resolve the main entry point of the package
             const pathOfFileInPackage = packageJsonPath ?? (0, resolve_relative_to_dir_1.resolveRelativeToDir)(packageName, relativeToDir);
             let dir = (0, node_path_1.dirname)(pathOfFileInPackage);
-            while (dir !== (0, node_path_1.parse)(dir).root) {
+            while (dir !== (0, node_path_1.dirname)(dir)) {
                 const packageJsonPath = (0, node_path_1.join)(dir, 'package.json');
                 try {
                     const parsedPackageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);

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

@@ -23,7 +23,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/task-env.d.ts

@@ -7,9 +7,9 @@ export declare function getEnvVariablesForTask(task: Task, taskSpecificEnv: Node
 };
 /**
  * This function loads a .env file and expands the variables in it.
- * It is going to override existing environmentVariables.
- * @param filename
- * @param environmentVariables
+ * @param filename the .env file to load
+ * @param environmentVariables the object to load environment variables into
+ * @param override whether to override existing environment variables
  */
 export declare function loadAndExpandDotEnvFile(filename: string, environmentVariables: NodeJS.ProcessEnv, override?: boolean): import("dotenv-expand").DotenvExpandOutput;
 /**

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

@@ -79,9 +79,9 @@ function getNxEnvVariablesForTask(task, forceColor, skipNxCache, captureStderr,
 }
 /**
  * This function loads a .env file and expands the variables in it.
- * It is going to override existing environmentVariables.
- * @param filename
- * @param environmentVariables
+ * @param filename the .env file to load
+ * @param environmentVariables the object to load environment variables into
+ * @param override whether to override existing environment variables
  */
 function loadAndExpandDotEnvFile(filename, environmentVariables, override = false) {
     const myEnv = (0, dotenv_1.config)({

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

@@ -17,7 +17,7 @@ const output_1 = require("../utils/output");
 const params_1 = require("../utils/params");
 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;
@@ -25,6 +25,7 @@ class TaskOrchestrator {
         this.options = options;
         this.bail = bail;
         this.daemon = daemon;
+        this.outputStyle = outputStyle;
         this.cache = new cache_1.Cache(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);
@@ -200,7 +201,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'