Skip to content

Commit f74c2fc

Browse files
atlowChemiruyadorno
authored andcommitted
lib: use addAbortListener
PR-URL: #48550 Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
1 parent b5df084 commit f74c2fc

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

‎lib/internal/abort_controller.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const{
2323
kTrustEvent,
2424
kNewListener,
2525
kRemoveListener,
26+
kResistStopPropagation,
2627
kWeakHandler,
2728
}=require('internal/event_target');
2829
const{
@@ -447,7 +448,8 @@ async function aborted(signal, resource){
447448
if(signal.aborted)
448449
returnPromiseResolve();
449450
constabortPromise=createDeferredPromise();
450-
signal.addEventListener('abort',abortPromise.resolve,{[kWeakHandler]: resource,once: true});
451+
constopts={__proto__: null,[kWeakHandler]: resource,once: true,[kResistStopPropagation]: true};
452+
signal.addEventListener('abort',abortPromise.resolve,opts);
451453
returnabortPromise.promise;
452454
}
453455

‎lib/internal/watch_mode/files_watcher.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ const{fileURLToPath } = require('url');
1818
const{ resolve, dirname }=require('path');
1919
const{ setTimeout }=require('timers');
2020

21-
2221
constsupportsRecursiveWatching=process.platform==='win32'||
2322
process.platform==='darwin';
2423

@@ -41,7 +40,9 @@ class FilesWatcher extends EventEmitter{
4140
this.#mode =mode;
4241
this.#signal =signal;
4342

44-
signal?.addEventListener('abort',()=>this.clear(),{__proto__: null,once: true});
43+
if(signal){
44+
EventEmitter.addAbortListener(signal,()=>this.clear());
45+
}
4546
}
4647

4748
#isPathWatched(path){

0 commit comments

Comments
(0)