From aa8ddf15e28a69a82508091fd0f12e5924b3e080 Mon Sep 17 00:00:00 2001
From: Zoltan Kochan <zoltan.kochan@gmail.com>
Date: Fri, 31 May 2019 01:27:18 +0300
Subject: [PATCH] fix(deps): update unpack-stream to v6

---
 packages/fetcher-base/package.json               |  3 ++-
 packages/fetcher-base/src/index.ts               |  3 ++-
 packages/tarball-fetcher/package.json            |  2 +-
 packages/tarball-fetcher/src/createDownloader.ts |  2 +-
 pnpm-lock.yaml                                   | 15 ++++++++-------
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/packages/fetcher-base/package.json b/packages/fetcher-base/package.json
index 8756f34b6c..4cbf6b35d9 100644
--- a/packages/fetcher-base/package.json
+++ b/packages/fetcher-base/package.json
@@ -29,7 +29,8 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/master/packages/fetcher-base#readme",
   "dependencies": {
-    "@pnpm/resolver-base": "3.1.2"
+    "@pnpm/resolver-base": "3.1.2",
+    "@types/ssri": "6.0.1"
   },
   "devDependencies": {
     "rimraf": "^2.6.2",
diff --git a/packages/fetcher-base/src/index.ts b/packages/fetcher-base/src/index.ts
index 620004029e..7c3826a338 100644
--- a/packages/fetcher-base/src/index.ts
+++ b/packages/fetcher-base/src/index.ts
@@ -1,4 +1,5 @@
 import { Resolution } from '@pnpm/resolver-base'
+import { IntegrityMap } from 'ssri'
 
 export interface FetchOptions {
   cachedTarballLocation: string,
@@ -21,6 +22,6 @@ export interface FetchResult {
 export interface FilesIndex {
   [filename: string]: {
     size: number,
-    generatingIntegrity: Promise<string>,
+    generatingIntegrity?: Promise<IntegrityMap>,
   },
 }
diff --git a/packages/tarball-fetcher/package.json b/packages/tarball-fetcher/package.json
index 4cd9c7f806..ab1cbbd82e 100644
--- a/packages/tarball-fetcher/package.json
+++ b/packages/tarball-fetcher/package.json
@@ -43,7 +43,7 @@
     "retry": "0.12.0",
     "rimraf": "2.6.3",
     "ssri": "6.0.1",
-    "unpack-stream": "5.0.1"
+    "unpack-stream": "6.0.0"
   },
   "devDependencies": {
     "@pnpm/logger": "2.1.1",
diff --git a/packages/tarball-fetcher/src/createDownloader.ts b/packages/tarball-fetcher/src/createDownloader.ts
index fa1429bf11..1d818fb436 100644
--- a/packages/tarball-fetcher/src/createDownloader.ts
+++ b/packages/tarball-fetcher/src/createDownloader.ts
@@ -202,7 +202,7 @@ export default (
   }
 }
 
-function createIgnorer (tarballUrl: string, ignore?: (filename: string) => Boolean) {
+function createIgnorer (tarballUrl: string, ignore?: (filename: string) => boolean) {
   const lowercaseFiles = new Set<string>()
   if (ignore) {
     return (filename: string) => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0b82765ca8..556332a31f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -328,12 +328,14 @@ importers:
   packages/fetcher-base:
     dependencies:
       '@pnpm/resolver-base': 'link:../resolver-base'
+      '@types/ssri': 6.0.1
     devDependencies:
       rimraf: 2.6.3
       tslint: 5.16.0_typescript@3.4.5
       typescript: 3.4.5
     specifiers:
       '@pnpm/resolver-base': 3.1.2
+      '@types/ssri': 6.0.1
       rimraf: ^2.6.2
       tslint: 5.16.0
       typescript: 3.4.5
@@ -1885,7 +1887,7 @@ importers:
       retry: 0.12.0
       rimraf: 2.6.3
       ssri: 6.0.1
-      unpack-stream: 5.0.1
+      unpack-stream: 6.0.0
     devDependencies:
       '@pnpm/logger': 2.1.1
       '@pnpm/tarball-fetcher': 'link:'
@@ -1929,7 +1931,7 @@ importers:
       ts-node: 8.1.0
       tslint: 5.16.0
       typescript: 3.4.5
-      unpack-stream: 5.0.1
+      unpack-stream: 6.0.0
   packages/tarball-resolver:
     dependencies:
       '@pnpm/resolver-base': 'link:../resolver-base'
@@ -2672,7 +2674,6 @@ packages:
     resolution:
       integrity: sha512-fo0MWpVPSUrnZZhp9wyu+hhI3VJ9+Jhs+PWrokBTg3d2ryNPDOAWF1csIhQuYWBTn7KdZzXpRgpX2o6cwOlPWg==
   /@types/ssri/6.0.1:
-    dev: true
     resolution:
       integrity: sha512-Sf5NnDETSFGTHXIfG4zTTczRFhGEjSCfwfvHZ5oFmyX0fUA5BJKV/hdQ2zDnfcC6WXvE78ZTh+/18VzMyMM1QQ==
   /@types/tape/4.2.33:
@@ -8908,17 +8909,17 @@ packages:
     dev: true
     resolution:
       integrity: sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs=
-  /unpack-stream/5.0.1:
+  /unpack-stream/6.0.0:
     dependencies:
-      '@types/node': 12.0.4
+      '@types/ssri': 6.0.1
       decompress-maybe: 1.0.0
       ssri: 6.0.1
       tar-fs: 2.0.0
     dev: false
     engines:
-      node: '>=8'
+      node: '>=8.15'
     resolution:
-      integrity: sha512-MR9t86P3I8THidcbdwjH6Az4908rH/mDuwhDPMNYHdIfM0MPjYH4rJfUu9RlpraFHeMYW76bWyte7ug+80IrPw==
+      integrity: sha512-BJVLP4Vo+BE5r3mZdcioGFA1XHFUI1wmhy7ytlCicItn815lWZXGj4uxip3H7ou1UWBLFUDFBnX6t4ScvOVSEA==
   /unpipe/1.0.0:
     dev: true
     engines: