deps: upgrade npm to 6.2.0

PR-URL: https://github.com/nodejs/node/pull/21592
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

6 files changed, 20 insertions, 24 deletions

diff --git a/deps/npm/node_modules/JSONStream/.npmignore b/deps/npm/node_modules/JSONStream/.npmignore
deleted file mode 100644
index a9a9d586e5..0000000000
--- a/deps/npm/node_modules/JSONStream/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/*
-node_modules
diff --git a/deps/npm/node_modules/JSONStream/index.js b/deps/npm/node_modules/JSONStream/index.js
index 4e3b0ef678..359e3b8454 100755
--- a/deps/npm/node_modules/JSONStream/index.js
+++ b/deps/npm/node_modules/JSONStream/index.js
@@ -102,7 +102,7 @@ exports.parse = function (path, map) {
 
     count ++
     var actualPath = this.stack.slice(1).map(function(element) { return element.key }).concat([this.key])
-    var data = this.value[this.key]
+    var data = value
     if(null != data)
       if(null != (data = map ? map(data, actualPath) : data)) {
         if (emitKey || emitPath) {
@@ -115,7 +115,6 @@ exports.parse = function (path, map) {
 
         stream.queue(data)
       }
-    delete this.value[this.key]
     for(var k in this.stack)
       if (!Object.isFrozen(this.stack[k]))
         this.stack[k].value = null
diff --git a/deps/npm/node_modules/JSONStream/package.json b/deps/npm/node_modules/JSONStream/package.json
index 5f6be1368e..deeeb9d465 100644
--- a/deps/npm/node_modules/JSONStream/package.json
+++ b/deps/npm/node_modules/JSONStream/package.json
@@ -1,31 +1,27 @@
 {
-  "_args": [
-    [
-      "JSONStream@1.3.2",
-      "/Users/rebecca/code/npm"
-    ]
-  ],
-  "_from": "JSONStream@1.3.2",
-  "_id": "JSONStream@1.3.2",
+  "_from": "JSONStream@1.3.3",
+  "_id": "JSONStream@1.3.3",
   "_inBundle": false,
-  "_integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
+  "_integrity": "sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg==",
   "_location": "/JSONStream",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "JSONStream@1.3.2",
+    "raw": "JSONStream@1.3.3",
     "name": "JSONStream",
     "escapedName": "JSONStream",
-    "rawSpec": "1.3.2",
+    "rawSpec": "1.3.3",
     "saveSpec": null,
-    "fetchSpec": "1.3.2"
+    "fetchSpec": "1.3.3"
   },
   "_requiredBy": [
+    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
-  "_spec": "1.3.2",
+  "_resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.3.tgz",
+  "_shasum": "27b4b8fbbfeab4e71bcf551e7f27be8d952239bf",
+  "_spec": "JSONStream@1.3.3",
   "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Dominic Tarr",
@@ -38,10 +34,12 @@
   "bugs": {
     "url": "https://github.com/dominictarr/JSONStream/issues"
   },
+  "bundleDependencies": false,
   "dependencies": {
     "jsonparse": "^1.2.0",
     "through": ">=2.2.7 <3"
   },
+  "deprecated": false,
   "description": "rawStream.pipe(JSONStream.parse()).pipe(streamOfObjects)",
   "devDependencies": {
     "assertions": "~2.2.2",
@@ -73,5 +71,5 @@
   "scripts": {
     "test": "set -e; for t in test/*.js; do echo '***' $t '***'; node $t; done"
   },
-  "version": "1.3.2"
+  "version": "1.3.3"
 }
diff --git a/deps/npm/node_modules/JSONStream/test/disabled/doubledot1.js b/deps/npm/node_modules/JSONStream/test/doubledot1.js
index ceaa3edb33..ceaa3edb33 100644
--- a/deps/npm/node_modules/JSONStream/test/disabled/doubledot1.js
+++ b/deps/npm/node_modules/JSONStream/test/doubledot1.js
diff --git a/deps/npm/node_modules/JSONStream/test/disabled/doubledot2.js b/deps/npm/node_modules/JSONStream/test/doubledot2.js
index c957683db7..980024153c 100644
--- a/deps/npm/node_modules/JSONStream/test/disabled/doubledot2.js
+++ b/deps/npm/node_modules/JSONStream/test/doubledot2.js
@@ -22,8 +22,9 @@
  })
 
  process.on('exit', function () {
-   it(called).equal(5)
+   var expectedValues = [0, [1], {"a": 2}, "3", 4]
+   it(called).equal(expectedValues.length)
    for (var i = 0 ; i < 5 ; i++)
-     it(parsed[i]).deepEqual(i)
+     it(parsed[i]).deepEqual(expectedValues[i])
    console.error('PASSED')
  })
diff --git a/deps/npm/node_modules/JSONStream/test/fixtures/depth.json b/deps/npm/node_modules/JSONStream/test/fixtures/depth.json
index 868062f306..682887dc2f 100644
--- a/deps/npm/node_modules/JSONStream/test/fixtures/depth.json
+++ b/deps/npm/node_modules/JSONStream/test/fixtures/depth.json
@@ -7,9 +7,9 @@
         "some": "property"
       }
     },
-    {"value": 1},
-    {"value": 2},
-    {"blbl": [{}, {"a":0, "b":1, "value":3}, 10]},
+    {"value": [1]},
+    {"value": {"a":2}},
+    {"blbl": [{}, {"a":0, "b":1, "value":"3"}, 10]},
     {"value": 4}
   ]
 }
\ No newline at end of file