8000 fix(core): fix env for batch mode (#6719) · nrwl/nx@713a8fc · GitHub
[go: up one dir, main page]
Skip to content

Commit 713a8fc

Browse files
FrozenPandazFrozenPandaz
committed
fix(core): fix env for batch mode (#6719)
1 parent 7a479bc commit 713a8fc

File tree

1 file changed

+20
-31
lines changed

1 file changed

+20
-31
lines changed

‎packages/workspace/src/tasks-runner/forked-process-task-runner.ts

Lines changed: 20 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ export class ForkedProcessTaskRunner {
2828
public forkProcessForBatch({ executorName, taskGraph }: Batch) {
2929
return new Promise<BatchResults>((res, rej) => {
3030
try {
31-
const env = this.envForForkedProcessForTarget(
32-
taskGraph.tasks[0].target.target,
31+
const env = this.envForForkedProcess(
3332
process.env.FORCE_COLOR === undefined
3433
? 'true'
3534
: process.env.FORCE_COLOR
@@ -50,7 +49,10 @@ export class ForkedProcessTaskRunner {
5049

5150
const p = fork(workerPath, {
5251
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
53-
env,
52+
env: {
53+
...env,
54+
...process.env,
55+
},
5456
});
5557
this.processes.add(p);
5658

@@ -113,7 +115,10 @@ export class ForkedProcessTaskRunner {
113115
}
114116
const p = fork(this.cliPath, args, {
115117
stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
116-
env,
118+
env: {
119+
...env,
120+
...process.env,
121+
},
117122
});
118123
this.processes.add(p);
119124
let out = [];
@@ -173,7 +178,10 @@ export class ForkedProcessTaskRunner {
173178
}
174179
const p = fork(this.cliPath, args, {
175180
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
176-
env,
181+
env: {
182+
...env,
183+
...< 8000 span class=pl-s1>process.env,
184+
},
177185
});
178186
this.processes.add(p);
179187
p.on('exit', (code, signal) => {
@@ -216,9 +224,14 @@ export class ForkedProcessTaskRunner {
216224
outputPath?: string,
217225
forwardOutput?: boolean
218226
) {
227+
const envsFromFiles = {
228+
...parseEnv('.env'),
229+
...parseEnv('.local.env'),
230+
...parseEnv('.env.local'),
231+
};
219232
const env: NodeJS.ProcessEnv = {
233+
...envsFromFiles,
220234
FORCE_COLOR: forceColor,
221-
...process.env,
222235
NX_INVOKED_BY_RUNNER: 'true',
223236
NX_WORKSPACE_ROOT: this.workspaceRoot,
224237
};
@@ -236,37 +249,13 @@ export class ForkedProcessTaskRunner {
236249
return env;
237250
}
238251

239-
private envForForkedProcessForTarget(
240-
target: string,
241-
forceColor: string,
242-
outputPath?: string,
243-
forwardOutput?: boolean
244-
) {
245-
const envsFromFiles = {
246-
...parseEnv('.env'),
247-
...parseEnv('.local.env'),
248-
...parseEnv(`.${target}.env`),
249-
...parseEnv(`.env.${target}`),
250-
};
251-
252-
const env: NodeJS.ProcessEnv = {
253-
...envsFromFiles,
254-
...this.envForForkedProcess(forceColor, outputPath, forwardOutput),
255-
};
256-
257-
return env;
258-
}
259-
260252
private envForForkedProcessForTask(
261253
task: Task,
262254
forceColor: string,
263255
outputPath: string,
264256
forwardOutput: boolean
265257
) {
266258
const envsFromFiles = {
267-
...parseEnv('.env'),
268-
...parseEnv('.local.env'),
269-
...parseEnv('.env.local'),
270259
...parseEnv(`.${task.target.target}.env`),
271260
...parseEnv(`.env.${task.target.target}`),
272261
...parseEnv(`${task.projectRoot}/.env`),
@@ -277,8 +266,8 @@ export class ForkedProcessTaskRunner {
277266
};
278267

279268
const env: NodeJS.ProcessEnv = {
280-
...envsFromFiles,
281269
...this.envForForkedProcess(forceColor, outputPath, forwardOutput),
270+
...envsFromFiles,
282271
NX_TASK_TARGET_PROJECT: task.target.project,
283272
NX_TASK_HASH: task.hash,
284273
};

0 commit comments

Comments
 (0)
0