Skip to content

Commit ca99c19

Browse files
committed
fix regex for browserify compatibility
1 parent d175d0f commit ca99c19

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

build/files.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,12 @@ const headRegexp = /(^module.exports = \w+;?)/m
110110
, requireStreamReplacement = [
111111
/var Stream = require\('stream'\);/
112112
, '\n\n/*<replacement>*/\n'
113-
+ 'var Stream;\n (function (){try{\n'
114-
+ 'Stream = require(\'st\' + \'ream\');\n'
115-
+ '}catch(_){Stream = require(\'events\').EventEmitter;}}())'
113+
+ 'var Stream;\n(function (){try{\n'
114+
+ ' Stream = require(\'st\' + \'ream\');\n'
115+
+ '}catch(_){}finally{\n'
116+
+ ' if (!Stream)\n'
117+
+ ' Stream = require(\'events\').EventEmitter;\n'
118+
+ '}}())'
116119
+ '\n/*</replacement>*/\n'
117120
]
118121

lib/_stream_readable.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ if (!EE.listenerCount) EE.listenerCount = function(emitter, type) {
3030

3131
/*<replacement>*/
3232
var Stream;
33-
(function (){try{
34-
Stream = require('st' + 'ream');
35-
}catch(_){Stream = require('events').EventEmitter;}}())
33+
(function (){try{
34+
Stream = require('st' + 'ream');
35+
}catch(_){}finally{
36+
if (!Stream)
37+
Stream = require('events').EventEmitter;
38+
}}())
3639
/*</replacement>*/
3740

3841
var Buffer = require('buffer').Buffer;

lib/_stream_writable.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ util.inherits = require('inherits');
2727

2828
/*<replacement>*/
2929
var Stream;
30-
(function (){try{
31-
Stream = require('st' + 'ream');
32-
}catch(_){Stream = require('events').EventEmitter;}}())
30+
(function (){try{
31+
Stream = require('st' + 'ream');
32+
}catch(_){}finally{
33+
if (!Stream)
34+
Stream = require('events').EventEmitter;
35+
}}())
3336
/*</replacement>*/
3437

3538
var Buffer = require('buffer').Buffer;

0 commit comments

Comments
 (0)