fix(core): do not override process.env with variables in dotenv files (…

…#6540)
nrwl · Jul 29, 2021 · dc02ca9 · dc02ca9
1 parent 117ee93
commit dc02ca9
Showing 1 changed file with 24 additions and 18 deletions.
diff --git a/packages/workspace/src/tasks-runner/forked-process-task-runner.ts b/packages/workspace/src/tasks-runner/forked-process-task-runner.ts
@@ -28,7 +28,7 @@ export class ForkedProcessTaskRunner {
   public forkProcessForBatch({ executorName, taskGraph }: Batch) {
     return new Promise<BatchResults>((res, rej) => {
       try {
-        const env = this.envForForkedProcess(
+        const env = this.envForForkedProcessForTarget(
           taskGraph.tasks[0].target.target,
           process.env.FORCE_COLOR === undefined
             ? 'true'
@@ -212,20 +212,11 @@ export class ForkedProcessTaskRunner {
   }
 
   private envForForkedProcess(
-    target: string,
     forceColor: string,
     outputPath?: string,
     forwardOutput?: boolean
   ) {
-    const envsFromFiles = {
-      ...parseEnv('.env'),
-      ...parseEnv('.local.env'),
-      ...parseEnv(`.${target}.env`),
-      ...parseEnv(`.env.${target}`),
-    };
-
     const env: NodeJS.ProcessEnv = {
-      ...envsFromFiles,
       FORCE_COLOR: forceColor,
       ...process.env,
       NX_INVOKED_BY_RUNNER: 'true',
@@ -245,18 +236,33 @@ export class ForkedProcessTaskRunner {
     return env;
   }
 
+  private envForForkedProcessForTarget(
+    target: string,
+    forceColor: string,
+    outputPath?: string,
+    forwardOutput?: boolean
+  ) {
+    const envsFromFiles = {
+      ...parseEnv('.env'),
+      ...parseEnv('.local.env'),
+      ...parseEnv(`.${target}.env`),
+      ...parseEnv(`.env.${target}`),
+    };
+
+    const env: NodeJS.ProcessEnv = {
+      ...envsFromFiles,
+      ...this.envForForkedProcess(forceColor, outputPath, forwardOutput),
+    };
+
+    return env;
+  }
+
   private envForForkedProcessForTask(
     task: Task,
     forceColor: string,
     outputPath: string,
     forwardOutput: boolean
   ) {
-    let env: NodeJS.ProcessEnv = this.envForForkedProcess(
-      task.target.target,
-      forceColor,
-      outputPath,
-      forwardOutput
-    );
     const envsFromFiles = {
       ...parseEnv('.env'),
       ...parseEnv('.local.env'),
@@ -270,9 +276,9 @@ export class ForkedProcessTaskRunner {
       ...parseEnv(`${task.projectRoot}/.env.${task.target.target}`),
     };
 
-    env = {
-      ...env,
+    const env: NodeJS.ProcessEnv = {
       ...envsFromFiles,
+      ...this.envForForkedProcess(forceColor, outputPath, forwardOutput),
       NX_TASK_TARGET_PROJECT: task.target.project,
       NX_TASK_HASH: task.hash,
     };