pacote: (hopefully) fix integrity-related issue

10 files changed, 69 insertions, 53 deletions

diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md
index b97ecf26f..e176199c9 100644
--- a/node_modules/pacote/CHANGELOG.md
+++ b/node_modules/pacote/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="2.7.32"></a>
+## [2.7.32](https://github.com/zkat/pacote/compare/v2.7.31...v2.7.32) (2017-06-07)
+
+
+### Bug Fixes
+
+* **registry:** print both 111 and 199 warnings ([2f8c201](https://github.com/zkat/pacote/commit/2f8c201))
+
+
+
 <a name="2.7.31"></a>
 ## [2.7.31](https://github.com/zkat/pacote/compare/v2.7.30...v2.7.31) (2017-06-06)
 
diff --git a/node_modules/pacote/lib/fetchers/registry/check-warning-header.js b/node_modules/pacote/lib/fetchers/registry/check-warning-header.js
index bd4dbc517..446b1eebc 100644
--- a/node_modules/pacote/lib/fetchers/registry/check-warning-header.js
+++ b/node_modules/pacote/lib/fetchers/registry/check-warning-header.js
@@ -23,9 +23,11 @@ function checkWarnings (res, registry, opts) {
     BAD_HOSTS.set(registry, true)
     if (warnings['199'] && warnings['199'].message.match(/ENOTFOUND/)) {
       opts.log.warn('registry', `Using stale data from ${registry} because the host is inaccessible -- are you offline?`)
-    } else if (warnings['199']) {
+    }
+    if (warnings['199']) {
       opts.log.warn('registry', `Unexpected warning for ${registry}: ${warnings['199'].message}`)
-    } else if (warnings['111']) {
+    }
+    if (warnings['111']) {
       // 111 Revalidation failed -- we're using stale data
       opts.log.warn(
         'registry',
diff --git a/node_modules/pacote/node_modules/tar-fs/index.js b/node_modules/pacote/node_modules/tar-fs/index.js
index 4bb7637cb..4b345b7d0 100644
--- a/node_modules/pacote/node_modules/tar-fs/index.js
+++ b/node_modules/pacote/node_modules/tar-fs/index.js
@@ -15,7 +15,7 @@ var echo = function (name) {
 }
 
 var normalize = !win32 ? echo : function (name) {
-  return name.replace(/\\/g, '/').replace(/:/g, '_')
+  return name.replace(/\\/g, '/').replace(/[:?<>|]/g, '_')
 }
 
 var statAll = function (fs, stat, cwd, ignore, entries, sort) {
diff --git a/node_modules/pacote/node_modules/tar-fs/package.json b/node_modules/pacote/node_modules/tar-fs/package.json
index 2574d083a..2832072b5 100644
--- a/node_modules/pacote/node_modules/tar-fs/package.json
+++ b/node_modules/pacote/node_modules/tar-fs/package.json
@@ -1,7 +1,8 @@
 {
   "_from": "tar-fs@^1.15.1",
-  "_id": "tar-fs@1.15.2",
-  "_integrity": "sha1-dh9bMpMsezlGGmDVN/rqDYCEgww=",
+  "_id": "tar-fs@1.15.3",
+  "_inBundle": false,
+  "_integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=",
   "_location": "/pacote/tar-fs",
   "_phantomChildren": {
     "once": "1.4.0"
@@ -19,15 +20,13 @@
   "_requiredBy": [
     "/pacote"
   ],
-  "_resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz",
-  "_shasum": "761f5b32932c7b39461a60d537faea0d8084830c",
-  "_shrinkwrap": null,
+  "_resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz",
+  "_shasum": "eccf935e941493d8151028e636e51ce4c3ca7f20",
   "_spec": "tar-fs@^1.15.1",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/pacote",
   "author": {
     "name": "Mathias Buus"
   },
-  "bin": null,
   "bugs": {
     "url": "https://github.com/mafintosh/tar-fs/issues"
   },
@@ -60,8 +59,6 @@
   "license": "MIT",
   "main": "index.js",
   "name": "tar-fs",
-  "optionalDependencies": {},
-  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git+https://github.com/mafintosh/tar-fs.git"
@@ -69,5 +66,5 @@
   "scripts": {
     "test": "standard && tape test/index.js"
   },
-  "version": "1.15.2"
+  "version": "1.15.3"
 }
diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json
index 3ae047a7a..611c809c7 100644
--- a/node_modules/pacote/package.json
+++ b/node_modules/pacote/package.json
@@ -1,8 +1,8 @@
 {
-  "_from": "pacote@2.7.31",
-  "_id": "pacote@2.7.31",
+  "_from": "pacote@2.7.32",
+  "_id": "pacote@2.7.32",
   "_inBundle": false,
-  "_integrity": "sha512-POj+CFlJ5tb9W1QS0INbUibVOHPHuA4ei3ClpcVULsm1dYKOCs0WrgvtdtsKB6o/cjbd01JQivbgffvkjtn0LQ==",
+  "_integrity": "sha512-LaNJsAs8Yd7i8z8kMAfU+D63HCWRbGhrgnR8oSfngoCzW+mNybZvnUYNUcDt7iCQOw+zXmYC7uqucNxZjxzONw==",
   "_location": "/pacote",
   "_phantomChildren": {
     "cacache": "9.2.8",
@@ -16,25 +16,25 @@
     "retry": "0.10.1",
     "safe-buffer": "5.1.0",
     "semver": "5.3.0",
-    "ssri": "4.1.5"
+    "ssri": "4.1.6"
   },
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "pacote@2.7.31",
+    "raw": "pacote@2.7.32",
     "name": "pacote",
     "escapedName": "pacote",
-    "rawSpec": "2.7.31",
+    "rawSpec": "2.7.32",
     "saveSpec": null,
-    "fetchSpec": "2.7.31"
+    "fetchSpec": "2.7.32"
   },
   "_requiredBy": [
     "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.31.tgz",
-  "_shasum": "340144d11b54a0a0f5413390cda80ef867f46c2b",
-  "_spec": "pacote@2.7.31",
+  "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.32.tgz",
+  "_shasum": "6affb8fc98037fe3f91440cd73f0c2e6e7b93e2d",
+  "_spec": "pacote@2.7.32",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
@@ -120,5 +120,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "2.7.31"
+  "version": "2.7.32"
 }
diff --git a/node_modules/ssri/CHANGELOG.md b/node_modules/ssri/CHANGELOG.md
index c03bb4174..c1136092e 100644
--- a/node_modules/ssri/CHANGELOG.md
+++ b/node_modules/ssri/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="4.1.6"></a>
+## [4.1.6](https://github.com/zkat/ssri/compare/v4.1.5...v4.1.6) (2017-06-07)
+
+
+### Bug Fixes
+
+* **checkStream:** make sure to pass all opts through ([0b1bcbe](https://github.com/zkat/ssri/commit/0b1bcbe))
+
+
+
 <a name="4.1.5"></a>
 ## [4.1.5](https://github.com/zkat/ssri/compare/v4.1.4...v4.1.5) (2017-06-05)
 
diff --git a/node_modules/ssri/index.js b/node_modules/ssri/index.js
index 6ec0d73df..8ece662ba 100644
--- a/node_modules/ssri/index.js
+++ b/node_modules/ssri/index.js
@@ -214,12 +214,9 @@ module.exports.checkStream = checkStream
 function checkStream (stream, sri, opts) {
   opts = opts || {}
   const P = opts.Promise || Promise
-  const checker = integrityStream({
-    integrity: sri,
-    size: opts.size,
-    strict: opts.strict,
-    pickAlgorithm: opts.pickAlgorithm
-  })
+  const checker = integrityStream(Object.assign({}, opts, {
+    integrity: sri
+  }))
   return new P((resolve, reject) => {
     stream.pipe(checker)
     stream.on('error', reject)
diff --git a/node_modules/ssri/package.json b/node_modules/ssri/package.json
index b004400f3..027914300 100644
--- a/node_modules/ssri/package.json
+++ b/node_modules/ssri/package.json
@@ -1,19 +1,19 @@
 {
-  "_from": "ssri@4.1.5",
-  "_id": "ssri@4.1.5",
+  "_from": "ssri@4.1.6",
+  "_id": "ssri@4.1.6",
   "_inBundle": false,
-  "_integrity": "sha512-TaLitc/pZH1UF8LCgZWdbssPiOUcPjBmIJsYJa+YltP77mY2qQ0Y2b+VS4C9RbZRH1GPMt4zckqqBd7GE/61ew==",
+  "_integrity": "sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA==",
   "_location": "/ssri",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "ssri@4.1.5",
+    "raw": "ssri@4.1.6",
     "name": "ssri",
     "escapedName": "ssri",
-    "rawSpec": "4.1.5",
+    "rawSpec": "4.1.6",
     "saveSpec": null,
-    "fetchSpec": "4.1.5"
+    "fetchSpec": "4.1.6"
   },
   "_requiredBy": [
     "#USER",
@@ -23,9 +23,9 @@
     "/pacote",
     "/pacote/make-fetch-happen"
   ],
-  "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.5.tgz",
-  "_shasum": "e3844770b5379ced69b512e70a28d86d86abd43a",
-  "_spec": "ssri@4.1.5",
+  "_resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz",
+  "_shasum": "0cb49b6ac84457e7bdd466cb730c3cb623e9a25b",
+  "_spec": "ssri@4.1.6",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Kat Marchán",
@@ -44,15 +44,15 @@
     }
   },
   "dependencies": {
-    "safe-buffer": "^5.0.1"
+    "safe-buffer": "^5.1.0"
   },
   "deprecated": false,
   "description": "Standard Subresource Integrity library --  parses, serializes, generates, and verifies integrity metadata according to the SRI spec.",
   "devDependencies": {
     "nyc": "^10.3.2",
     "standard": "^9.0.2",
-    "standard-version": "^4.0.0",
-    "tap": "^10.3.2",
+    "standard-version": "^4.1.0",
+    "tap": "^10.3.3",
     "weallbehave": "^1.2.0",
     "weallcontribute": "^1.0.8"
   },
@@ -90,5 +90,5 @@
     "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'",
     "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'"
   },
-  "version": "4.1.5"
+  "version": "4.1.6"
 }
diff --git a/package-lock.json b/package-lock.json
index 3fd555371..624b69593 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1300,9 +1300,9 @@
       }
     },
     "pacote": {
-      "version": "2.7.31",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.31.tgz",
-      "integrity": "sha512-POj+CFlJ5tb9W1QS0INbUibVOHPHuA4ei3ClpcVULsm1dYKOCs0WrgvtdtsKB6o/cjbd01JQivbgffvkjtn0LQ==",
+      "version": "2.7.32",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.32.tgz",
+      "integrity": "sha512-LaNJsAs8Yd7i8z8kMAfU+D63HCWRbGhrgnR8oSfngoCzW+mNybZvnUYNUcDt7iCQOw+zXmYC7uqucNxZjxzONw==",
       "dependencies": {
         "make-fetch-happen": {
           "version": "2.4.12",
@@ -1533,9 +1533,9 @@
           }
         },
         "tar-fs": {
-          "version": "1.15.2",
-          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.2.tgz",
-          "integrity": "sha1-dh9bMpMsezlGGmDVN/rqDYCEgww=",
+          "version": "1.15.3",
+          "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz",
+          "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=",
           "dependencies": {
             "pump": {
               "version": "1.0.2",
@@ -2063,9 +2063,9 @@
       "dev": true
     },
     "ssri": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.5.tgz",
-      "integrity": "sha512-TaLitc/pZH1UF8LCgZWdbssPiOUcPjBmIJsYJa+YltP77mY2qQ0Y2b+VS4C9RbZRH1GPMt4zckqqBd7GE/61ew=="
+      "version": "4.1.6",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-4.1.6.tgz",
+      "integrity": "sha512-WUbCdgSAMQjTFZRWvSPpauryvREEA+Krn19rx67UlJEJx/M192ZHxMmJXjZ4tkdFm+Sb0SXGlENeQVlA5wY7kA=="
     },
     "standard": {
       "version": "6.0.8",
diff --git a/package.json b/package.json
index 69fda83ab..7b183d3d9 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "once": "~1.4.0",
     "opener": "~1.4.3",
     "osenv": "~0.1.4",
-    "pacote": "~2.7.31",
+    "pacote": "~2.7.32",
     "path-is-inside": "~1.0.2",
     "promise-inflight": "~1.0.1",
     "read": "~1.0.7",
@@ -101,7 +101,7 @@
     "slide": "~1.1.6",
     "sorted-object": "~2.0.1",
     "sorted-union-stream": "~2.1.3",
-    "ssri": "~4.1.5",
+    "ssri": "~4.1.6",
     "strip-ansi": "~3.0.1",
     "tar": "~2.2.1",
     "text-table": "~0.2.0",