@@ -28,7 +28,7 @@ export class ForkedProcessTaskRunner {
28
28
public forkProcessForBatch ( { executorName, taskGraph } : Batch ) {
29
29
return new Promise < BatchResults > ( ( res , rej ) => {
30
30
try {
31
- const env = this . envForForkedProcess (
31
+ const env = this . envForForkedProcessForTarget (
32
32
taskGraph . tasks [ 0 ] . target . target ,
33
33
process . env . FORCE_COLOR === undefined
34
34
? 'true'
@@ -212,20 +212,11 @@ export class ForkedProcessTaskRunner {
212
212
}
213
213
214
214
private envForForkedProcess (
215
- target : string ,
216
215
forceColor : string ,
217
216
outputPath ?: string ,
218
217
forwardOutput ?: boolean
219
218
) {
220
- const envsFromFiles = {
221
- ...parseEnv ( '.env' ) ,
222
- ...parseEnv ( '.local.env' ) ,
223
- ...parseEnv ( `.${ target } .env` ) ,
224
- ...parseEnv ( `.env.${ target } ` ) ,
225
- } ;
226
-
227
219
const env : NodeJS . ProcessEnv = {
228
- ...envsFromFiles ,
229
220
FORCE_COLOR : forceColor ,
230
221
...process . env ,
231
222
NX_INVOKED_BY_RUNNER : 'true' ,
@@ -245,18 +236,33 @@ export class ForkedProcessTaskRunner {
245
236
return env ;
246
237
}
247
238
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
+
248
260
private envForForkedProcessForTask (
249
261
task : Task ,
250
262
forceColor : string ,
251
263
outputPath : string ,
252
264
forwardOutput : boolean
253
265
) {
254
- let env : NodeJS . ProcessEnv = this . envForForkedProcess (
255
- task . target . target ,
256
- forceColor ,
257
- outputPath ,
258
- forwardOutput
259
- ) ;
260
266
const envsFromFiles = {
261
267
...parseEnv ( '.env' ) ,
262
268
...parseEnv ( '.local.env' ) ,
@@ -270,9 +276,9 @@ export class ForkedProcessTaskRunner {
270
276
...parseEnv ( `${ task . projectRoot } /.env.${ task . target . target } ` ) ,
271
277
} ;
272
278
273
- env = {
274
- ...env ,
279
+ const env : NodeJS . ProcessEnv = {
275
280
...envsFromFiles ,
281
+ ...this . envForForkedProcess ( forceColor , outputPath , forwardOutput ) ,
276
282
NX_TASK_TARGET_PROJECT : task . target . project ,
277
283
NX_TASK_HASH : task . hash ,
278
284
} ;
0 commit comments