Skip to content

Commit d686854

Browse files
committed
watch: watch for unexsiting dependencies
1 parent 1f51713 commit d686854

File tree

6 files changed

+24
-18
lines changed

6 files changed

+24
-18
lines changed

lib/internal/modules/cjs/loader.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const {
2828
ArrayPrototypeIncludes,
2929
ArrayPrototypeIndexOf,
3030
ArrayPrototypeJoin,
31+
ArrayPrototypeMap,
3132
ArrayPrototypePush,
3233
ArrayPrototypeSlice,
3334
ArrayPrototypeSplice,
@@ -191,7 +192,13 @@ function updateChildren(parent, child, scan) {
191192

192193
function reportModuleToWatchMode(filename) {
193194
if (shouldReportRequiredModules && process.send) {
194-
process.send({ 'watch:require': filename });
195+
process.send({ 'watch:require': [filename] });
196+
}
197+
}
198+
199+
function reportModuleNotFoundToWatchMode(basePath, extensions) {
200+
if (shouldReportRequiredModules && process.send) {
201+
process.send({ 'watch:require': ArrayPrototypeMap(extensions, (ext) => path.resolve(`${basePath}${ext}`)) });
195202
}
196203
}
197204

@@ -648,6 +655,7 @@ Module._findPath = function(request, paths, isMain) {
648655
Module._pathCache[cacheKey] = filename;
649656
return filename;
650657
}
658+
reportModuleNotFoundToWatchMode(basePath, exts);
651659
}
652660

653661
return false;

lib/internal/modules/esm/loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ class ESMLoader {
463463
);
464464

465465
if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) {
466-
process.send({ 'watch:import': url });
466+
process.send({ 'watch:import': [url] });
467467
}
468468

469469
const job = new ModuleJob(

lib/internal/modules/esm/resolve.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,9 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
254254
err.url = String(resolved);
255255
throw err;
256256
} else if (!stats.isFile()) {
257+
if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) {
258+
process.send({ 'watch:require': [path || resolved.pathname] });
259+
}
257260
throw new ERR_MODULE_NOT_FOUND(
258261
path || resolved.pathname, base && fileURLToPath(base), 'module');
259262
}

lib/internal/watch_mode/files_watcher.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
'use strict';
22

33
const {
4+
ArrayIsArray,
5+
ArrayPrototypeForEach,
46
SafeMap,
57
SafeSet,
68
StringPrototypeStartsWith,
@@ -94,6 +96,7 @@ class FilesWatcher extends EventEmitter {
9496
}
9597

9698
filterFile(file) {
99+
if (!file) return;
97100
if (supportsRecursiveWatching) {
98101
this.watchPath(dirname(file));
99102
} else {
@@ -109,11 +112,11 @@ class FilesWatcher extends EventEmitter {
109112
}
110113
child.on('message', (message) => {
111114
try {
112-
if (message['watch:require']) {
113-
this.filterFile(message['watch:require']);
115+
if (ArrayIsArray(message['watch:require'])) {
116+
ArrayPrototypeForEach(message['watch:require'], (file) => this.filterFile(file));
114117
}
115-
if (message['watch:import']) {
116-
this.filterFile(fileURLToPath(message['watch:import']));
118+
if (ArrayIsArray(message['watch:import'])) {
119+
ArrayPrototypeForEach(message['watch:import'], (file) => this.filterFile(fileURLToPath(file)));
117120
}
118121
} catch {
119122
// Failed watching file. ignore

test/fixtures/watch-mode/ipc.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const tmpdir = require('../../common/tmpdir');
66
const tmpfile = path.join(tmpdir.path, 'file');
77
fs.writeFileSync(tmpfile, '');
88

9-
process.send({ 'watch:require': path.resolve(__filename) });
10-
process.send({ 'watch:import': url.pathToFileURL(path.resolve(__filename)).toString() });
11-
process.send({ 'watch:import': url.pathToFileURL(tmpfile).toString() });
12-
process.send({ 'watch:import': new URL('http://invalid.com').toString() });
9+
process.send({ 'watch:require': [path.resolve(__filename)] });
10+
process.send({ 'watch:import': [url.pathToFileURL(path.resolve(__filename)).toString()] });
11+
process.send({ 'watch:import': [url.pathToFileURL(tmpfile).toString()] });
12+
process.send({ 'watch:import': [new URL('http://invalid.com').toString()] });

test/sequential/test-watch-mode.mjs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@ describe('watch mode', { concurrency: true, timeout: 60_0000 }, () => {
104104
});
105105
});
106106

107-
it('should not watch when running an non-existing file', async () => {
108-
const file = fixtures.path('watch-mode/non-existing.js');
109-
const { stderr, stdout } = await spawnWithRestarts({ file, restarts: 0 });
110-
111-
assert.match(stderr, /code: 'MODULE_NOT_FOUND'/);
112-
assert.strictEqual(stdout, `Failed running ${inspect(file)}\n`);
113-
});
114-
115107
it('should watch when running an non-existing file - when specified under --watch-path', {
116108
skip: !common.isOSX && !common.isWindows
117109
}, async () => {

0 commit comments

Comments
 (0)