File tree 1 file changed +16
-10
lines changed
1 file changed +16
-10
lines changed Original file line number Diff line number Diff line change @@ -321,27 +321,33 @@ class Api extends Emittery {
321
321
322
322
async _computeForkExecArgv ( ) {
323
323
const { nodeArguments : execArgv } = this . options ;
324
- if ( execArgv . length === 0 ) {
325
- return execArgv ;
324
+
325
+ const mainProcessArgs = process . execArgv ;
326
+
327
+ // last has bigger priority
328
+ const args = mainProcessArgs . concat ( execArgv )
329
+
330
+ if ( args . length === 0 ) {
331
+ return args ;
326
332
}
327
333
328
- // --inspect-brk is used in addition to --inspect to break on first line and wait
329
- const inspectArgIndex = execArgv . findIndex ( arg => / ^ - - i n s p e c t ( - b r k ) ? ( $ | = ) / . test ( arg ) ) ;
330
- if ( inspectArgIndex === - 1 ) {
331
- return execArgv ;
334
+ const inspectArgs = execArgv . filter ( arg => / ^ - - i n s p e c t ( - b r k ) ? ( $ | = ) / . test ( arg ) ) ;
335
+ const restArgs = execArgv . filter ( arg => ! / ^ - - i n s p e c t ( - b r k ) ? ( $ | = ) / . test ( arg ) ) ;
336
+
337
+ if ( inspectArgs . length === 0 ) {
338
+ return args ;
332
339
}
333
340
334
341
const port = await getPort ( ) ;
335
- const forkExecArgv = execArgv . slice ( ) ;
336
342
let flagName = '--inspect' ;
337
- const oldValue = forkExecArgv [ inspectArgIndex ] ;
343
+ const oldValue = inspectArgs [ inspectArgs . length - 1 ] ;
338
344
if ( oldValue . includes ( 'brk' ) ) {
339
345
flagName += '-brk' ;
340
346
}
341
347
342
- forkExecArgv [ inspectArgIndex ] = `${ flagName } =${ port } ` ;
348
+ inspectArgs [ inspectArgs . length - 1 ] = `${ flagName } =${ port } `
343
349
344
- return forkExecArgv ;
350
+ return restArgs . concat ( inspectArgs ) . join ( ' ' ) ;
345
351
}
346
352
}
347
353
You can’t perform that action at this time.
0 commit comments