fixup old nodes

Signed-off-by: Matteo Collina <hello@matteocollina.com>
nodejs · Dec 15, 2023 · 3517f9d · 3517f9d
1 parent bf97973
commit 3517f9d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/build/replacements.mjs b/build/replacements.mjs
@@ -276,8 +276,8 @@ const duplexFromTestWebStreamNeutralizeWritable = [
 ]
 
 const polyfillAddAbortListener = [
-  'require\\(\'events\'\\).addAbortListener',
-  'require(\'../../ours/util\').addAbortListener'
+  'addAbortListener \\?\\?= require\\(\'events\'\\)\\.addAbortListener',
+  'addAbortListener = addAbortListener || require(\'../../ours/util\').addAbortListener'
 ]
 
 const abortSignalAny = [

diff --git a/lib/internal/streams/add-abort-signal.js b/lib/internal/streams/add-abort-signal.js
@@ -44,7 +44,7 @@ module.exports.addAbortSignalNoValidate = function (signal, stream) {
   if (signal.aborted) {
     onAbort()
   } else {
-    addAbortListener ??= require('../../ours/util').addAbortListener
+    addAbortListener = addAbortListener || require('../../ours/util').addAbortListener
     const disposable = addAbortListener(signal, onAbort)
     eos(stream, disposable[SymbolDispose])
   }

diff --git a/lib/internal/streams/end-of-stream.js b/lib/internal/streams/end-of-stream.js
@@ -213,7 +213,7 @@ function eos(stream, options, callback) {
     if (options.signal.aborted) {
       process.nextTick(abort)
     } else {
-      addAbortListener ??= require('../../ours/util').addAbortListener
+      addAbortListener = addAbortListener || require('../../ours/util').addAbortListener
       const disposable = addAbortListener(options.signal, abort)
       const originalCallback = callback
       callback = once((...args) => {
@@ -240,7 +240,7 @@ function eosWeb(stream, options, callback) {
     if (options.signal.aborted) {
       process.nextTick(abort)
     } else {
-      addAbortListener ??= require('../../ours/util').addAbortListener
+      addAbortListener = addAbortListener || require('../../ours/util').addAbortListener
       const disposable = addAbortListener(options.signal, abort)
       const originalCallback = callback
       callback = once((...args) => {

diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js
@@ -186,7 +186,7 @@ function pipelineImpl(streams, callback, opts) {
   function abort() {
     finishImpl(new AbortError())
   }
-  addAbortListener ??= require('../../ours/util').addAbortListener
+  addAbortListener = addAbortListener || require('../../ours/util').addAbortListener
   let disposable
   if (outerSignal) {
     disposable = addAbortListener(outerSignal, abort)