Merge pull request #244 from amtrack/fix/replace-event-stream-with-me…

…rge-stream fix(deps): replace event-stream with merge-stream
amtrack · May 23, 2020 · 0a9cfab · 0a9cfab
2 parents fbca8bd + fc45a18
commit 0a9cfab
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 57 deletions.
diff --git a/lib/cli/changeset.js b/lib/cli/changeset.js
@@ -13,7 +13,7 @@ var fs = require('fs-extra');
 var vinylFs = require('vinyl-fs');
 var miss = require('mississippi')
 var split = require('split2');
-var es = require('event-stream');
+var mergeStream = require('merge-stream');
 
 var doc = "Usage:\n" +
 	"	force-dev-tool changeset create <name> [<metadataFileOrComponentNames>...] [options]\n" +
@@ -104,7 +104,7 @@ SubCommand.prototype.process = function(proc, callback) {
 		stdin.end();
 	});
 
-	es.merge(stdin, metadataContainer.getStream())
+	mergeStream(stdin, metadataContainer.getStream())
 		.pipe(MetadataContainer.completeMetadataStream())
 		.pipe(MetadataContainer.outputStream({
 			apiVersion: apiVersion

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,11 +10,11 @@
     "async": "^3.0.0",
     "chalk": "^4.0.0",
     "docopt": "^0.6.2",
-    "event-stream": "3.3.5",
     "find-up": "^4.0.0",
     "fs-extra": "^9.0.0",
     "glob": "^7.0.6",
     "jsforce": "^1.7.0",
+    "merge-stream": "^2.0.0",
     "mississippi": "^4.0.0",
     "mkdirp": "^0.5.1",
     "multimatch": "^4.0.0",