Skip to content

[v24.x backport] watch: get flags from execArgv #62108

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

Closed
efekrskl wants to merge 1 commit into from
Closed

[v24.x backport] watch: get flags from execArgv #62108

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
watch: get flags from execArgv 
PR-URL: #61779
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
  • Loading branch information
@efekrskl
efekrskl committed Mar 4, 2026
commit 36ddaad88ed507d5ce6d833585ee6471a2d0518e
9 changes: 4 additions & 5 deletions lib/internal/main/watch_mode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const {
triggerUncaughtException,
exitCodes: { kNoFailure },
} = internalBinding('errors');
const { getOptionValue, getOptionsAsFlagsFromBinding } = require('internal/options');
const { getOptionValue } = require('internal/options');
const { FilesWatcher } = require('internal/watch_mode/files_watcher');
const { green, blue, red, white, clear } = require('internal/util/colors');
const { convertToValidSignal } = require('internal/util');
Expand All @@ -44,14 +44,13 @@ const kCommand = ArrayPrototypeSlice(process.argv, 1);
const kCommandStr = inspect(ArrayPrototypeJoin(kCommand, ' '));

const argsWithoutWatchOptions = [];
const argsFromBinding = getOptionsAsFlagsFromBinding();
for (let i = 0; i < argsFromBinding.length; i++) {
const arg = argsFromBinding[i];
for (let i = 0; i < process.execArgv.length; i++) {
const arg = process.execArgv[i];
if (StringPrototypeStartsWith(arg, '--watch=')) {
continue;
}
if (arg === '--watch') {
const nextArg = argsFromBinding[i + 1];
const nextArg = process.execArgv[i + 1];
if (nextArg && nextArg[0] !== '-') {
// If `--watch` doesn't include `=` and the next
// argument is not a flag then it is interpreted as
Expand Down
29 changes: 29 additions & 0 deletions test/sequential/test-watch-mode.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,4 +893,33 @@ process.on('message', (message) => {
await done();
}
});

it('should respect the order for --env-file and --env-file-if-exists', async () => {
const envKey = `TEST_ENV_${Date.now()}`;
const jsFile = createTmpFile(`console.log('ENV: ' + process.env.${envKey});`);

const envFile = createTmpFile(`${envKey}=base`, '.env');
const envFileIfExists = createTmpFile(`${envKey}=override`, '.env');

const { done, restart } = runInBackground({
args: [
'--watch',
`--env-file=${envFile}`,
`--env-file-if-exists=${envFileIfExists}`,
jsFile,
],
});

try {
const { stdout, stderr } = await restart();

assert.strictEqual(stderr, '');
assert.deepStrictEqual(stdout, [
'ENV: override',
`Completed running ${inspect(jsFile)}. Waiting for file changes before restarting...`,
]);
} finally {
await done();
}
});
});