nx 22.1.0-rc.4 → 22.1.0-rc.5

package/src/tasks-runner/task-env-paths.d.ts

@@ -0,0 +1,2 @@
+export declare function getEnvPathsForTask(projectRoot: string, target: string, configuration?: string, nonAtomizedTarget?: string): string[];
+//# sourceMappingURL=task-env-paths.d.ts.map

package/src/tasks-runner/task-env-paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"task-env-paths.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-env-paths.ts"],"names":[],"mappings":"AAAA,wBAAgB,kBAAkB,CAChC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,aAAa,CAAC,EAAE,MAAM,EACtB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,EAAE,CA6BV"}

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

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvPathsForTask = getEnvPathsForTask;
+function getEnvPathsForTask(projectRoot, target, configuration, nonAtomizedTarget) {
+    const identifiers = [];
+    // Configuration-specific identifier (like build.development, build.production)
+    if (configuration) {
+        identifiers.push(`${target}.${configuration}`);
+        if (nonAtomizedTarget) {
+            identifiers.push(`${nonAtomizedTarget}.${configuration}`);
+        }
+        identifiers.push(configuration);
+    }
+    // Non-configuration-specific identifier (like build, test, serve)
+    identifiers.push(target);
+    if (nonAtomizedTarget) {
+        identifiers.push(nonAtomizedTarget);
+    }
+    // Non-deterministic identifier (for files like .env.local, .local.env, .env)
+    identifiers.push('');
+    const envPaths = [];
+    // Add DotEnv Files in the project root folder
+    for (const identifier of identifiers) {
+        envPaths.push(...getEnvFileVariants(identifier, projectRoot));
+    }
+    // Add DotEnv Files in the workspace root folder
+    for (const identifier of identifiers) {
+        envPaths.push(...getEnvFileVariants(identifier));
+    }
+    return envPaths;
+}
+function getEnvFileVariants(identifier, root) {
+    const path = root ? root + '/' : '';
+    if (identifier) {
+        return [
+            `${path}.env.${identifier}.local`,
+            `${path}.env.${identifier}`,
+            `${path}.${identifier}.local.env`,
+            `${path}.${identifier}.env`,
+        ];
+    }
+    else {
+        return [`${path}.env.local`, `${path}.local.env`, `${path}.env`];
+    }
+}

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

@@ -1,6 +1,7 @@
 import { Task } from '../config/task-graph';
+import { ProjectGraph } from '../config/project-graph';
 export declare function getEnvVariablesForBatchProcess(skipNxCache: boolean, captureStderr: boolean): NodeJS.ProcessEnv;
-export declare function getTaskSpecificEnv(task: Task): NodeJS.ProcessEnv;
+export declare function getTaskSpecificEnv(task: Task, graph: ProjectGraph): NodeJS.ProcessEnv;
 export declare function getEnvVariablesForTask(task: Task, taskSpecificEnv: NodeJS.ProcessEnv, forceColor: string, skipNxCache: boolean, captureStderr: boolean, outputPath: string, streamOutput: boolean): NodeJS.ProcessEnv;
 /**
  * This function loads a .env file and expands the variables in it.
@@ -15,4 +16,5 @@ export declare function loadAndExpandDotEnvFile(filename: string, environmentVar
  * @param environmentVariables
  */
 export declare function unloadDotEnvFile(filename: string, environmentVariables: NodeJS.ProcessEnv, override?: boolean): void;
+export declare function getEnvFilesForTask(task: Task, graph: ProjectGraph): string[];
 //# sourceMappingURL=task-env.d.ts.map

package/src/tasks-runner/task-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task-env.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAM5C,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,GACrB,MAAM,CAAC,UAAU,CAWnB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,qBAO5C;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,CAAC,UAAU,EAClC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,GACpB,MAAM,CAAC,UAAU,CAwBnB;AA+DD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,CAAC,UAAU,EACvC,QAAQ,UAAQ,8CAWjB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,CAAC,UAAU,EACvC,QAAQ,UAAQ,QASjB"}
+{"version":3,"file":"task-env.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/tasks-runner/task-env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAK5C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAGvD,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,GACrB,MAAM,CAAC,UAAU,CAWnB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,qBAOjE;AAED,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,CAAC,UAAU,EAClC,UAAU,EAAE,MAAM,EAClB,WAAW,EAAE,OAAO,EACpB,aAAa,EAAE,OAAO,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,OAAO,GACpB,MAAM,CAAC,UAAU,CAwBnB;AA+DD;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,CAAC,UAAU,EACvC,QAAQ,UAAQ,8CAWjB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,oBAAoB,EAAE,MAAM,CAAC,UAAU,EACvC,QAAQ,UAAQ,QASjB;AAwBD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,GAAG,MAAM,EAAE,CAS5E"}

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

@@ -5,10 +5,12 @@ exports.getTaskSpecificEnv = getTaskSpecificEnv;
 exports.getEnvVariablesForTask = getEnvVariablesForTask;
 exports.loadAndExpandDotEnvFile = loadAndExpandDotEnvFile;
 exports.unloadDotEnvFile = unloadDotEnvFile;
+exports.getEnvFilesForTask = getEnvFilesForTask;
 const dotenv_1 = require("dotenv");
 const dotenv_expand_1 = require("dotenv-expand");
 const workspace_root_1 = require("../utils/workspace-root");
 const node_path_1 = require("node:path");
+const task_env_paths_1 = require("./task-env-paths");
 function getEnvVariablesForBatchProcess(skipNxCache, captureStderr) {
     return {
         // User Process Env Variables override Dotenv Variables
@@ -17,11 +19,11 @@ function getEnvVariablesForBatchProcess(skipNxCache, captureStderr) {
         ...getNxEnvVariablesForForkedProcess(process.env.FORCE_COLOR === undefined ? 'true' : process.env.FORCE_COLOR, skipNxCache, captureStderr),
     };
 }
-function getTaskSpecificEnv(task) {
+function getTaskSpecificEnv(task, graph) {
     // Unload any dot env files at the root of the workspace that were loaded on init of Nx.
     const taskEnv = unloadDotEnvFiles({ ...process.env });
     return process.env.NX_LOAD_DOT_ENV_FILES === 'true'
-        ? loadDotEnvFilesForTask(task, taskEnv)
+        ? loadDotEnvFilesForTask(task, graph, taskEnv)
         : // If not loading dot env files, ensure env vars created by system are still loaded
             taskEnv;
 }
@@ -110,56 +112,30 @@ function unloadDotEnvFile(filename, environmentVariables, override = false) {
         }
     });
 }
-function getEnvFilesForTask(task) {
-    // Collect dot env files that may pertain to a task
-    return [
-        // Load DotEnv Files for a configuration in the project root
-        ...(task.target.configuration
-            ? [
-                `${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}.local`,
-                `${task.projectRoot}/.env.${task.target.target}.${task.target.configuration}`,
-                `${task.projectRoot}/.env.${task.target.configuration}.local`,
-                `${task.projectRoot}/.env.${task.target.configuration}`,
-                `${task.projectRoot}/.${task.target.target}.${task.target.configuration}.local.env`,
-                `${task.projectRoot}/.${task.target.target}.${task.target.configuration}.env`,
-                `${task.projectRoot}/.${task.target.configuration}.local.env`,
-                `${task.projectRoot}/.${task.target.configuration}.env`,
-            ]
-            : []),
-        // Load DotEnv Files for a target in the project root
-        `${task.projectRoot}/.env.${task.target.target}.local`,
-        `${task.projectRoot}/.env.${task.target.target}`,
-        `${task.projectRoot}/.${task.target.target}.local.env`,
-        `${task.projectRoot}/.${task.target.target}.env`,
-        `${task.projectRoot}/.env.local`,
-        `${task.projectRoot}/.local.env`,
-        `${task.projectRoot}/.env`,
-        // Load DotEnv Files for a configuration in the workspace root
-        ...(task.target.configuration
-            ? [
-                `.env.${task.target.target}.${task.target.configuration}.local`,
-                `.env.${task.target.target}.${task.target.configuration}`,
-                `.env.${task.target.configuration}.local`,
-                `.env.${task.target.configuration}`,
-                `.${task.target.target}.${task.target.configuration}.local.env`,
-                `.${task.target.target}.${task.target.configuration}.env`,
-                `.${task.target.configuration}.local.env`,
-                `.${task.target.configuration}.env`,
-            ]
-            : []),
-        // Load DotEnv Files for a target in the workspace root
-        `.env.${task.target.target}.local`,
-        `.env.${task.target.target}`,
-        `.${task.target.target}.local.env`,
-        `.${task.target.target}.env`,
-        // Load base DotEnv Files at workspace root
-        `.local.env`,
-        `.env.local`,
-        `.env`,
-    ];
+function getOwnerTargetForTask(task, graph) {
+    const project = graph.nodes[task.target.project];
+    if (project.data.metadata?.targetGroups) {
+        for (const targets of Object.values(project.data.metadata.targetGroups)) {
+            if (targets.includes(task.target.target)) {
+                for (const target of targets) {
+                    if (project.data.targets[target].metadata?.nonAtomizedTarget) {
+                        return [
+                            target,
+                            project.data.targets[target].metadata?.nonAtomizedTarget,
+                        ];
+                    }
+                }
+            }
+        }
+    }
+    return [task.target.target];
+}
+function getEnvFilesForTask(task, graph) {
+    const [target, nonAtomizedTarget] = getOwnerTargetForTask(task, graph);
+    return (0, task_env_paths_1.getEnvPathsForTask)(task.projectRoot, target, task.target.configuration, nonAtomizedTarget);
 }
-function loadDotEnvFilesForTask(task, environmentVariables) {
-    const dotEnvFiles = getEnvFilesForTask(task);
+function loadDotEnvFilesForTask(task, graph, environmentVariables) {
+    const dotEnvFiles = getEnvFilesForTask(task, graph);
     for (const file of dotEnvFiles) {
         loadAndExpandDotEnvFile((0, node_path_1.join)(workspace_root_1.workspaceRoot, file), environmentVariables);
     }

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

@@ -146,7 +146,7 @@ class TaskOrchestrator {
     // region Processing Scheduled Tasks
     async processTask(taskId) {
         const task = this.taskGraph.tasks[taskId];
-        const taskSpecificEnv = (0, task_env_1.getTaskSpecificEnv)(task);
+        const taskSpecificEnv = (0, task_env_1.getTaskSpecificEnv)(task, this.projectGraph);
         if (!task.hash) {
             await (0, hash_task_1.hashTask)(this.hasher, this.projectGraph, this.taskGraphForHashing, task, taskSpecificEnv, this.taskDetails);
         }