[Pkg-javascript-commits] [node-module-deps] 143/444: upgrade concat-stream

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-module-deps.

commit c215dfeace9a5ba4cf6a11990fb62869f8b350da
Author: James Halliday <mail at substack.net>
Date:   Sat Dec 28 19:38:15 2013 -0800

    upgrade concat-stream
---
 index.js       | 4 ++--
 package.json   | 2 +-
 test/stream.js | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/index.js b/index.js
index 40c9fb4..e8e379e 100644
--- a/index.js
+++ b/index.js
@@ -81,7 +81,7 @@ module.exports = function (mains, opts) {
         pending ++;
         
         if (typeof id === 'object') {
-            id.stream.pipe(concat(function (src) {
+            id.stream.pipe(concat({ encoding: 'string' }, function (src) {
                 var pkgfile = path.join(basedir, 'package.json');
                 fs.readFile(pkgfile, function (err, pkgsrc) {
                     var pkg = {};
@@ -174,7 +174,7 @@ module.exports = function (mains, opts) {
                 if (err) return output.emit('error', err);
                 
                 s.on('error', output.emit.bind(output, 'error'));
-                s.pipe(concat(function (data) {
+                s.pipe(concat({ encoding: 'string' }, function (data) {
                     src = data;
                     ap(trs.slice(1));
                 }));
diff --git a/package.json b/package.json
index d3222c9..a159dae 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "browser-resolve": "~1.2.1",
     "resolve": "~0.6.0",
     "detective": "~2.1.2",
-    "concat-stream": "~1.0.0",
+    "concat-stream": "~1.3.1",
     "minimist": "~0.0.1"
   },
   "devDependencies": {
diff --git a/test/stream.js b/test/stream.js
index 69ba147..81878c1 100644
--- a/test/stream.js
+++ b/test/stream.js
@@ -13,9 +13,11 @@ test('read from a stream', function (t) {
     p.on('error', t.fail.bind(t));
     var pack = packer();
     
-    p.pipe(JSONStream.stringify()).pipe(pack).pipe(concat(function (src) {
-        Function(['t'],src)(t);
-    }));
+    p.pipe(JSONStream.stringify()).pipe(pack)
+        .pipe(concat({ encoding: 'string' }, function (src) {
+            Function(['t'], src)(t);
+        }))
+    ;
     
     tr.queue('t.ok(true)');
     tr.queue(null);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-module-deps.git