From e9106822f0490b5adb8eaabf149bdf72ee9b9c37 Mon Sep 17 00:00:00 2001 From: Watanabe Shinnosuke Date: Mon, 8 Jul 2019 19:41:57 +0900 Subject: [PATCH] use stream.pipeline() if available --- index.js | 4 ++-- package-lock.json | 16 +++++++++++++--- package.json | 1 + 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index 671bce8..47c6e92 100644 --- a/index.js +++ b/index.js @@ -1,10 +1,10 @@ 'use strict'; const {inspect, promisify} = require('util'); +const {pipeline, Transform} = require('stream'); const {resolve} = require('path'); -const {Transform} = require('stream'); -const cancelablePump = require('cancelable-pump'); +const cancelablePump = require(`cancelable-${pipeline ? 'pipeline' : 'pump'}`); const {Unpack} = require('tar'); const inspectWithKind = require('inspect-with-kind'); const isPlainObj = require('is-plain-obj'); diff --git a/package-lock.json b/package-lock.json index ce99380..3498109 100644 --- a/package-lock.json +++ b/package-lock.json @@ -313,6 +313,11 @@ "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, + "cancelable-pipeline": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cancelable-pipeline/-/cancelable-pipeline-1.0.0.tgz", + "integrity": "sha512-vsimf+py0scGFJyZXsawF7h2ZJ6A1p5FXjieXjQ36kZyigWKYTDW3VjiYPTj+tFqdzQzYz+XV8J24Dtc88pmGQ==" + }, "cancelable-pump": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/cancelable-pump/-/cancelable-pump-0.4.0.tgz", @@ -1295,6 +1300,7 @@ "version": "0.1.4", "bundled": true, "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2", "longest": "^1.0.1", @@ -1619,7 +1625,8 @@ "is-buffer": { "version": "1.1.6", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "is-builtin-module": { "version": "1.0.0", @@ -1703,6 +1710,7 @@ "version": "3.2.2", "bundled": true, "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -1749,7 +1757,8 @@ "longest": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "lru-cache": { "version": "4.1.3", @@ -2015,7 +2024,8 @@ "repeat-string": { "version": "1.6.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "require-directory": { "version": "2.1.1", diff --git a/package.json b/package.json index 23bb675..178a032 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "observable" ], "dependencies": { + "cancelable-pipeline": "^1.0.0", "cancelable-pump": "^0.4.0", "inspect-with-kind": "^1.0.5", "is-plain-obj": "^1.1.0",