fix(core): separate env option and task specific env for runCommands

docs/generated/packages/nx/executors/run-commands.json

@@ -146,6 +146,12 @@
         "type": "boolean",
         "description": "Whether commands should be run with a tty terminal",
         "hidden": true
+      },
+      "taskEnv": {
+        "type": "object",
+        "description": "Task specific environment variables",
+        "hidden": true,
+        "additionalProperties": { "type": "string" }
       }
     },
     "additionalProperties": true,

packages/nx/src/executors/run-commands/run-commands.impl.ts

@@ -13,6 +13,7 @@ import { signalToCode } from '../../utils/exit-codes';
 import {
   loadAndExpandDotEnvFile,
   unloadDotEnvFile,
+  unloadDotEnvFiles,
 } from '../../tasks-runner/task-env';
 
 export const LARGE_BUFFER = 1024 * 1000000;
@@ -60,6 +61,7 @@ export interface RunCommandsOptions extends Json {
   usePty?: boolean;
   streamOutput?: boolean;
   tty?: boolean;
+  taskEnv?: Record<string, string>;
 }
 
 const propKeys = [
@@ -295,7 +297,8 @@ async function runSerially(
         options.usePty,
         options.streamOutput,
         options.tty,
-        options.envFile
+        options.envFile,
+        options.taskEnv
       );
     terminalOutput += result.terminalOutput;
     if (!result.success) {
@@ -326,9 +329,10 @@ async function createProcess(
   usePty: boolean = true,
   streamOutput: boolean = true,
   tty: boolean,
-  envFile?: string
+  envFile?: string,
+  taskEnv?: Record<string, string>
 ): Promise<{ success: boolean; terminalOutput: string }> {
-  env = processEnv(color, cwd, env, envFile);
+  env = processEnv(color, cwd, env, envFile, taskEnv);
   // The rust runCommand is always a tty, so it will not look nice in parallel and if we need prefixes
   // currently does not work properly in windows
   if (
@@ -478,21 +482,27 @@ function processEnv(
   color: boolean,
   cwd: string,
   envOptionFromExecutor: Record<string, string>,
-  envFile?: string
+  envFile?: string,
+  taskEnv?: Record<string, string>
 ) {
+  const inlineEnvs = unloadDotEnvFiles({ ...process.env });
+  const envsFromEnvFile = {};
+  if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false' && envFile) {
+    loadEnvVarsFile(envFile, envsFromEnvFile);
+  }
+  let res: Record<string, string> = {
+    ...(taskEnv ?? {}),
+    ...envsFromEnvFile,
+    ...envOptionFromExecutor,
+    ...inlineEnvs,
+  };
+
   let localEnv = appendLocalEnv({ cwd: cwd ?? process.cwd() });
   localEnv = {
     ...process.env,
     ...localEnv,
   };
 
-  if (process.env.NX_LOAD_DOT_ENV_FILES !== 'false' && envFile) {
-    loadEnvVarsFile(envFile, localEnv);
-  }
-  let res: Record<string, string> = {
-    ...localEnv,
-    ...envOptionFromExecutor,
-  };
   // need to override PATH to make sure we are using the local node_modules
   if (localEnv.PATH) res.PATH = localEnv.PATH; // UNIX-like
   if (localEnv.Path) res.Path = localEnv.Path; // Windows

packages/nx/src/executors/run-commands/schema.json

@@ -169,6 +169,14 @@
       "type": "boolean",
       "description": "Whether commands should be run with a tty terminal",
       "hidden": true
+    },
+    "taskEnv": {
+      "type": "object",
+      "description": "Task specific environment variables",
+      "hidden": true,
+      "additionalProperties": {
+        "type": "string"
+      }
     }
   },
   "additionalProperties": true,

packages/nx/src/tasks-runner/task-env.ts

@@ -227,7 +227,7 @@ function loadDotEnvFilesForTask(
   return environmentVariables;
 }
 
-function unloadDotEnvFiles(environmentVariables: NodeJS.ProcessEnv) {
+export function unloadDotEnvFiles(environmentVariables: NodeJS.ProcessEnv) {
   for (const file of ['.env', '.local.env', '.env.local']) {
     unloadDotEnvFile(join(workspaceRoot, file), environmentVariables);
   }

packages/nx/src/tasks-runner/task-orchestrator.ts

@@ -421,12 +421,6 @@ export class TaskOrchestrator {
             relative(task.projectRoot ?? workspaceRoot, process.cwd()),
             process.env.NX_VERBOSE_LOGGING === 'true'
           );
-          if (combinedOptions.env) {
-            env = {
-              ...env,
-              ...combinedOptions.env,
-            };
-          }
           if (streamOutput) {
             const args = getPrintableCommandArgsForTask(task);
             output.logCommand(args.join(' '));
@@ -434,9 +428,9 @@ export class TaskOrchestrator {
           const { success, terminalOutput } = await runCommandsImpl(
             {
               ...combinedOptions,
-              env,
               usePty: isRunOne && !this.tasksSchedule.hasTasks(),
               streamOutput,
+              taskEnv: env,
             },
             {
               root: workspaceRoot, // only root is needed in runCommandsImpl