fix regex for browserify compatibility

nodejs · Jul 16, 2015 · ca99c19 · ca99c19
1 parent d175d0f
commit ca99c19
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/build/files.js b/build/files.js
@@ -110,9 +110,12 @@ const headRegexp = /(^module.exports = \w+;?)/m
     , requireStreamReplacement = [
       /var Stream = require\('stream'\);/
     ,  '\n\n/*<replacement>*/\n'
-      + 'var Stream;\n (function (){try{\n'
-      + 'Stream = require(\'st\' + \'ream\');\n'
-      + '}catch(_){Stream = require(\'events\').EventEmitter;}}())'
+      + 'var Stream;\n(function (){try{\n'
+      + '  Stream = require(\'st\' + \'ream\');\n'
+      + '}catch(_){}finally{\n'
+      + '  if (!Stream)\n'
+      + '    Stream = require(\'events\').EventEmitter;\n'
+      + '}}())'
       + '\n/*</replacement>*/\n'
     ]
 

diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
@@ -30,9 +30,12 @@ if (!EE.listenerCount) EE.listenerCount = function(emitter, type) {
 
 /*<replacement>*/
 var Stream;
- (function (){try{
-Stream = require('st' + 'ream');
-}catch(_){Stream = require('events').EventEmitter;}}())
+(function (){try{
+  Stream = require('st' + 'ream');
+}catch(_){}finally{
+  if (!Stream)
+    Stream = require('events').EventEmitter;
+}}())
 /*</replacement>*/
 
 var Buffer = require('buffer').Buffer;

diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
@@ -27,9 +27,12 @@ util.inherits = require('inherits');
 
 /*<replacement>*/
 var Stream;
- (function (){try{
-Stream = require('st' + 'ream');
-}catch(_){Stream = require('events').EventEmitter;}}())
+(function (){try{
+  Stream = require('st' + 'ream');
+}catch(_){}finally{
+  if (!Stream)
+    Stream = require('events').EventEmitter;
+}}())
 /*</replacement>*/
 
 var Buffer = require('buffer').Buffer;