diff --git a/lib/cli/changeset.js b/lib/cli/changeset.js index 5664161a..833a06a8 100755 --- 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 [...] [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 index 2e90e49e..c05e1fef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1077,11 +1077,6 @@ "esutils": "^2.0.2" } }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=" - }, "duplexify": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", @@ -1495,20 +1490,6 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "event-stream": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.5.tgz", - "integrity": "sha512-vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g==", - "requires": { - "duplexer": "^0.1.1", - "from": "^0.1.7", - "map-stream": "0.0.7", - "pause-stream": "^0.0.11", - "split": "^1.0.1", - "stream-combiner": "^0.2.2", - "through": "^2.3.8" - } - }, "ext": { "version": "1.4.0", "resolved": "https://globaldevtools.bbva.com:443/artifactory/api/npm/npm-repo/ext/-/ext-1.4.0.tgz", @@ -1729,11 +1710,6 @@ "mime-types": "^2.1.12" } }, - "from": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", - "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=" - }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", @@ -2631,10 +2607,10 @@ "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", "dev": true }, - "map-stream": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz", - "integrity": "sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=" + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" }, "mime-db": { "version": "1.27.0", @@ -3316,14 +3292,6 @@ "integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=", "dev": true }, - "pause-stream": { - "version": "0.0.11", - "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", - "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", - "requires": { - "through": "~2.3" - } - }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -3771,14 +3739,6 @@ "amdefine": ">=0.0.4" } }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "requires": { - "through": "2" - } - }, "split2": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/split2/-/split2-3.0.0.tgz", @@ -3892,15 +3852,6 @@ "stacktrace-gps": "^3.0.4" } }, - "stream-combiner": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", - "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", - "requires": { - "duplexer": "~0.1.1", - "through": "~2.3.4" - } - }, "stream-each": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", @@ -4103,7 +4054,8 @@ "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true }, "through2": { "version": "2.0.3", diff --git a/package.json b/package.json index c55182aa..3848796f 100644 --- 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",