build based on 5.7.0 now with babel

new build uses babel for arrow functions and const/let stuff
also makes iThings allowed failures

Author: calvinmetcalf

.travis.yml

@@ -6,6 +6,10 @@ before_install:
 notifications:
   email: false
 matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TASK=browser BROWSER_NAME=ipad BROWSER_VERSION="6.0..latest"
+    - env: TASK=browser BROWSER_NAME=iphone BROWSER_VERSION="6.0..latest"
   include:
   - node_js: '0.8'
     env: TASK=test
@@ -36,9 +40,9 @@ matrix:
   - node_js: 5
     env: TASK=browser BROWSER_NAME=firefox BROWSER_VERSION="-3..latest"
   - node_js: 5
-    env: TASK=browser BROWSER_NAME=ipad BROWSER_VERSION="6.0..7.1"
+    env: TASK=browser BROWSER_NAME=ipad BROWSER_VERSION="6.0..latest"
   - node_js: 5
-    env: TASK=browser BROWSER_NAME=iphone BROWSER_VERSION="6.0..7.1"
+    env: TASK=browser BROWSER_NAME=iphone BROWSER_VERSION="6.0..latest"
   - node_js: 5
     env: TASK=browser BROWSER_NAME=safari BROWSER_VERSION="5..latest"
 script: "npm run $TASK"

README.md

@@ -1,6 +1,6 @@
 # readable-stream
 
-***Node-core v5.6.0 streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream)
+***Node-core v5.7.0 streams for userland*** [![Build Status](https://travis-ci.org/nodejs/readable-stream.svg?branch=master)](https://travis-ci.org/nodejs/readable-stream)
 
 
 [![NPM](https://nodei.co/npm/readable-stream.png?downloads=true&downloadRank=true)](https://nodei.co/npm/readable-stream/)

build/build.js

@@ -5,6 +5,7 @@ const hyperquest  = require('hyperzip')(require('hyperdirect'))
     , fs          = require('fs')
     , path        = require('path')
     , cheerio     = require('cheerio')
+    , babel       = require('babel-core')
     , encoding    = 'utf8'
     , urlRegex = /^https?:\/\//
     , nodeVersion = process.argv[2]
@@ -46,7 +47,13 @@ function processFile (inputLoc, out, replacements) {
     replacements.forEach(function (replacement) {
       data = data.replace.apply(data, replacement)
     })
-
+    if (inputLoc.slice(-3) === '.js') {
+      const transformed = babel.transform(data, {
+        retainLines: true,
+        plugins: ['transform-es2015-arrow-functions', 'transform-es2015-block-scoping']
+      })
+      data = transformed.code
+    }
     fs.writeFile(out, data, encoding, function (err) {
       if (err) throw err
 

build/common-replacements.js

@@ -39,8 +39,3 @@ module.exports.objectKeysReplacement = [
      /Object\.keys/g
    , 'objectKeys'
  ]
-
-module.exports.constReplacement = [
-    /\bconst\b/g
-  , 'var'
-]

build/files.js

@@ -12,7 +12,6 @@ const headRegexp = /(^module.exports = \w+;?)/m
           /(require\(['"])(_stream_)/g
         , '$1./$2'
       ]
-
     , instanceofReplacement = [
           /instanceof Stream\.(\w+)/g
         , function (match, streamType) {
@@ -44,15 +43,15 @@ const headRegexp = /(^module.exports = \w+;?)/m
     , altIndexOfUseReplacement  = require('./common-replacements').altIndexOfUseReplacement
 
     , utilReplacement = [
-          /^var util = require\('util'\);/m
-        ,   '\n/*<replacement>*/\nvar util = require(\'core-util-is\');\n'
+          /^const util = require\('util'\);/m
+        ,   '\n/*<replacement>*/\nconst util = require(\'core-util-is\');\n'
           + 'util.inherits = require(\'inherits\');\n/*</replacement>*/\n'
       ]
 
     , debugLogReplacement = [
-          /var debug = util.debuglog\('stream'\);/
-      ,   '\n\n/*<replacement>*/\nvar debugUtil = require(\'util\');\n'
-        + 'var debug;\n'
+          /const debug = util.debuglog\('stream'\);/
+      ,   '\n\n/*<replacement>*/\nconst debugUtil = require(\'util\');\n'
+        + 'let debug;\n'
         + 'if (debugUtil && debugUtil.debuglog) {\n'
         + '  debug = debugUtil.debuglog(\'stream\');\n'
         + '} else {\n'
@@ -103,8 +102,6 @@ const headRegexp = /(^module.exports = \w+;?)/m
         ,   'EElistenerCount'
         ]
 
-    , constReplacement = require('./common-replacements').constReplacement
-
     , bufferIsEncodingReplacement = [
       /Buffer.isEncoding\((\w+)\)/
     ,   '([\'hex\', \'utf8\', \'utf-8\', \'ascii\', \'binary\', \'base64\',\n'
@@ -113,7 +110,7 @@ const headRegexp = /(^module.exports = \w+;?)/m
     ]
 
     , requireStreamReplacement = [
-      /var Stream = require\('stream'\);/
+      /const Stream = require\('stream'\);/
     ,  '\n\n/*<replacement>*/\n'
       + 'var Stream;\n(function (){try{\n'
       + '  Stream = require(\'st\' + \'ream\');\n'
@@ -140,18 +137,13 @@ const headRegexp = /(^module.exports = \w+;?)/m
     ]
 
     , internalUtilReplacement = [
-          /^var internalUtil = require\('internal\/util'\);/m
-        ,   '\n/*<replacement>*/\nvar internalUtil = {\n  deprecate: require(\'util-deprecate\')\n};\n'
+          /^const internalUtil = require\('internal\/util'\);/m
+        ,   '\n/*<replacement>*/\nconst internalUtil = {\n  deprecate: require(\'util-deprecate\')\n};\n'
           + '/*</replacement>*/\n'
       ]
-    ,
-    letReplacements = [
-        /\blet\b/g
-      , 'var'
-    ]
+
 module.exports['_stream_duplex.js'] = [
-    constReplacement
-  , requireReplacement
+    requireReplacement
   , instanceofReplacement
   , utilReplacement
   , stringDecoderReplacement
@@ -164,16 +156,14 @@ module.exports['_stream_duplex.js'] = [
 ]
 
 module.exports['_stream_passthrough.js'] = [
-    constReplacement
-  , requireReplacement
+    requireReplacement
   , instanceofReplacement
   , utilReplacement
   , stringDecoderReplacement
 ]
 
 module.exports['_stream_readable.js'] = [
-    constReplacement
-  , addDuplexRequire
+    addDuplexRequire
   , requireReplacement
   , instanceofReplacement
   , bufferReplacement
@@ -194,20 +184,17 @@ module.exports['_stream_readable.js'] = [
   , processNextTickImport
   , processNextTickReplacement
   , eventEmittterListenerCountReplacement
-  , letReplacements
 ]
 
 module.exports['_stream_transform.js'] = [
-    constReplacement
-  , requireReplacement
+    requireReplacement
   , instanceofReplacement
   , utilReplacement
   , stringDecoderReplacement
 ]
 
 module.exports['_stream_writable.js'] = [
-    constReplacement
-  , addDuplexRequire
+    addDuplexRequire
   , requireReplacement
   , instanceofReplacement
   , bufferReplacement
@@ -224,4 +211,5 @@ module.exports['_stream_writable.js'] = [
   , processNextTickImport
   , processNextTickReplacement
   , internalUtilReplacement
+
 ]

build/package.json

@@ -4,9 +4,12 @@
   "description": "",
   "main": "build.js",
   "dependencies": {
+    "babel-core": "^6.5.2",
+    "babel-plugin-transform-es2015-arrow-functions": "^6.5.2",
+    "babel-plugin-transform-es2015-block-scoping": "^6.5.0",
     "bl": "~0.6.0",
-    "hyperzip": "0.0.0",
+    "cheerio": "~0.13.1",
     "hyperdirect": "0.0.0",
-    "cheerio": "~0.13.1"
+    "hyperzip": "0.0.0"
   }
 }

build/test-replacements.js

@@ -6,8 +6,6 @@ const altForEachImplReplacement = require('./common-replacements').altForEachImp
     require('./common-replacements').objectKeysDefine
     , objectKeysReplacement =
     require('./common-replacements').objectKeysReplacement
-    , constReplacement =
-    require('./common-replacements').constReplacement
 
 module.exports.all = [
     [
@@ -32,7 +30,6 @@ module.exports.all = [
         /Stream.(Readable|Writable|Duplex|Transform|PassThrough)/g
       , 'require(\'../../\').$1'
     ]
-  , constReplacement
 
 ]
 
@@ -66,7 +63,6 @@ module.exports['common.js'] = [
   , objectKeysReplacement
   , altForEachImplReplacement
   , altForEachUseReplacement
-  , constReplacement
 
   , [
         /(exports.mustCall[\s\S]*)/m
@@ -147,21 +143,16 @@ module.exports['common.js'] = [
         /require\(['"]stream['"]\)/g
       , 'require(\'../\')'
     ],
-    [/forEach\(data, line => \{\n\s+this\.emit\('data', line \+ '\\n'\);\n\s+\}\);/m,
-    `var self = this;
-    forEach(data, function(line) {
-      self.emit('data', line + '\\n');
-    });`
-  ],
-    [
-      /(varructor,)/,
-      '// $1'
-    ],
     [
     /^var util = require\('util'\);/m
   ,   '\n/*<replacement>*/\nvar util = require(\'core-util-is\');\n'
     + 'util.inherits = require(\'inherits\');\n/*</replacement>*/\n'
-  ]
+  ],
+  [
+  /^const util = require\('util'\);/m
+,   '\n/*<replacement>*/\nvar util = require(\'core-util-is\');\n'
+  + 'util.inherits = require(\'inherits\');\n/*</replacement>*/\n'
+]
 ]
 
 // this test has some trouble with the nextTick depth when run
@@ -191,7 +182,12 @@ module.exports['test-stream2-large-read-stall.js'] = [
 module.exports['test-stream-pipe-cleanup.js'] = [
     [
         /(function Writable\(\) \{)/
-      , 'if (/^v0\\.8\\./.test(process.version))\n  return\n\n$1'
+      , '(function (){\nif (/^v0\\.8\\./.test(process.version))\n  return\n\n$1'
+    ]
+    ,
+    [
+      /$/
+      ,'}())'
     ]
 ]
 
@@ -218,25 +214,31 @@ module.exports['test-stream-pipe-without-listenerCount.js'] = [
   [
     /require\(\'stream\'\)/g,
     'stream'
-  ],
-  [
-    /const /g,
-    'var '
   ]
 ]
 
-module.exports['test-stream-pipe-cleanup-pause.js'] = [
+module.exports['test-stream2-readable-empty-buffer-no-eof.js'] = [
   [
-    /const /g,
-    'var '
+    `const buf = Buffer(5).fill('x');`,
+    `const buf = new Buffer(5);
+  buf.fill('x');`
   ]
 ]
-module.exports['test-stream2-readable-empty-buffer-no-eof.js'] = [[
-  /let /g,
-  'var '],
+
+module.exports['test-stream2-unpipe-drain.js'] = [
   [
-    `var buf = Buffer(5).fill('x');`,
-    `var buf = new Buffer(5);
-  buf.fill('x');`
+    /^/,
+    `(function () {\n`
+  ],
+  [
+    /$/
+    ,'}())'
   ]
 ]
+
+module.exports['test-stream2-decode-partial.js'] = [
+ [
+   /readable\.push\(source\.slice\(4, 6\)\)/
+  ,`readable.push(source.slice(4, source.length));`
+ ]
+]