Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 29, 2021
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 24 additions & 18 deletions packages/workspace/src/tasks-runner/forked-process-task-runner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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',
Expand All @@ -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'),
Expand All @@ -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,
};
Expand Down