Revert "deps: upgrade npm to 5.8.0"

This reverts commit 25a816dcda7b1db0929501acfe13f2fe5119759b.

PR-URL: https://github.com/nodejs/node/pull/19837
Reviewed-By: Gus Caplan <me@gus.host>

2 files changed, 80 insertions, 88 deletions

diff --git a/deps/npm/node_modules/ini/ini.js b/deps/npm/node_modules/ini/ini.js
index 590195dd31..ddf5bd9cc6 100644
--- a/deps/npm/node_modules/ini/ini.js
+++ b/deps/npm/node_modules/ini/ini.js
@@ -1,18 +1,17 @@
-exports.parse = exports.decode = decode
 
+exports.parse = exports.decode = decode
 exports.stringify = exports.encode = encode
 
 exports.safe = safe
 exports.unsafe = unsafe
 
-var eol = typeof process !== 'undefined' &&
-  process.platform === 'win32' ? '\r\n' : '\n'
+var eol = process.platform === "win32" ? "\r\n" : "\n"
 
 function encode (obj, opt) {
   var children = []
-  var out = ''
+    , out = ""
 
-  if (typeof opt === 'string') {
+  if (typeof opt === "string") {
     opt = {
       section: opt,
       whitespace: false
@@ -22,15 +21,16 @@ function encode (obj, opt) {
     opt.whitespace = opt.whitespace === true
   }
 
-  var separator = opt.whitespace ? ' = ' : '='
+  var separator = opt.whitespace ? " = " : "="
 
   Object.keys(obj).forEach(function (k, _, __) {
     var val = obj[k]
     if (val && Array.isArray(val)) {
-      val.forEach(function (item) {
-        out += safe(k + '[]') + separator + safe(item) + '\n'
-      })
-    } else if (val && typeof val === 'object') {
+        val.forEach(function(item) {
+            out += safe(k + "[]") + separator + safe(item) + "\n"
+        })
+    }
+    else if (val && typeof val === "object") {
       children.push(k)
     } else {
       out += safe(k) + separator + safe(val) + eol
@@ -38,12 +38,12 @@ function encode (obj, opt) {
   })
 
   if (opt.section && out.length) {
-    out = '[' + safe(opt.section) + ']' + eol + out
+    out = "[" + safe(opt.section) + "]" + eol + out
   }
 
   children.forEach(function (k, _, __) {
     var nk = dotSplit(k).join('\\.')
-    var section = (opt.section ? opt.section + '.' : '') + nk
+    var section = (opt.section ? opt.section + "." : "") + nk
     var child = encode(obj[k], {
       section: section,
       whitespace: opt.whitespace
@@ -59,20 +59,22 @@ function encode (obj, opt) {
 
 function dotSplit (str) {
   return str.replace(/\1/g, '\u0002LITERAL\\1LITERAL\u0002')
-    .replace(/\\\./g, '\u0001')
-    .split(/\./).map(function (part) {
-      return part.replace(/\1/g, '\\.')
-      .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
-    })
+         .replace(/\\\./g, '\u0001')
+         .split(/\./).map(function (part) {
+           return part.replace(/\1/g, '\\.')
+                  .replace(/\2LITERAL\\1LITERAL\2/g, '\u0001')
+        })
 }
 
 function decode (str) {
   var out = {}
-  var p = out
-  var section = null
-  //          section     |key      = value
-  var re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
-  var lines = str.split(/[\r\n]+/g)
+    , p = out
+    , section = null
+    , state = "START"
+           // section     |key = value
+    , re = /^\[([^\]]*)\]$|^([^=]+)(=(.*))?$/i
+    , lines = str.split(/[\r\n]+/g)
+    , section = null
 
   lines.forEach(function (line, _, __) {
     if (!line || line.match(/^\s*[;#]/)) return
@@ -84,7 +86,7 @@ function decode (str) {
       return
     }
     var key = unsafe(match[2])
-    var value = match[3] ? unsafe(match[4]) : true
+      , value = match[3] ? unsafe((match[4] || "")) : true
     switch (value) {
       case 'true':
       case 'false':
@@ -92,20 +94,22 @@ function decode (str) {
     }
 
     // Convert keys with '[]' suffix to an array
-    if (key.length > 2 && key.slice(-2) === '[]') {
-      key = key.substring(0, key.length - 2)
-      if (!p[key]) {
-        p[key] = []
-      } else if (!Array.isArray(p[key])) {
-        p[key] = [p[key]]
-      }
+    if (key.length > 2 && key.slice(-2) === "[]") {
+        key = key.substring(0, key.length - 2)
+        if (!p[key]) {
+          p[key] = []
+        }
+        else if (!Array.isArray(p[key])) {
+          p[key] = [p[key]]
+        }
     }
 
     // safeguard against resetting a previously defined
     // array by accidentally forgetting the brackets
     if (Array.isArray(p[key])) {
       p[key].push(value)
-    } else {
+    }
+    else {
       p[key] = value
     }
   })
@@ -113,24 +117,18 @@ function decode (str) {
   // {a:{y:1},"a.b":{x:2}} --> {a:{y:1,b:{x:2}}}
   // use a filter to return the keys that have to be deleted.
   Object.keys(out).filter(function (k, _, __) {
-    if (!out[k] ||
-      typeof out[k] !== 'object' ||
-      Array.isArray(out[k])) {
-      return false
-    }
+    if (!out[k] || typeof out[k] !== "object" || Array.isArray(out[k])) return false
     // see if the parent section is also an object.
     // if so, add it to that, and mark this one for deletion
     var parts = dotSplit(k)
-    var p = out
-    var l = parts.pop()
-    var nl = l.replace(/\\\./g, '.')
+      , p = out
+      , l = parts.pop()
+      , nl = l.replace(/\\\./g, '.')
     parts.forEach(function (part, _, __) {
-      if (!p[part] || typeof p[part] !== 'object') p[part] = {}
+      if (!p[part] || typeof p[part] !== "object") p[part] = {}
       p = p[part]
     })
-    if (p === out && nl === l) {
-      return false
-    }
+    if (p === out && nl === l) return false
     p[nl] = out[k]
     return true
   }).forEach(function (del, _, __) {
@@ -141,54 +139,52 @@ function decode (str) {
 }
 
 function isQuoted (val) {
-  return (val.charAt(0) === '"' && val.slice(-1) === '"') ||
-    (val.charAt(0) === "'" && val.slice(-1) === "'")
+  return (val.charAt(0) === "\"" && val.slice(-1) === "\"")
+         || (val.charAt(0) === "'" && val.slice(-1) === "'")
 }
 
 function safe (val) {
-  return (typeof val !== 'string' ||
-    val.match(/[=\r\n]/) ||
-    val.match(/^\[/) ||
-    (val.length > 1 &&
-     isQuoted(val)) ||
-    val !== val.trim())
-      ? JSON.stringify(val)
-      : val.replace(/;/g, '\\;').replace(/#/g, '\\#')
+  return ( typeof val !== "string"
+         || val.match(/[=\r\n]/)
+         || val.match(/^\[/)
+         || (val.length > 1
+             && isQuoted(val))
+         || val !== val.trim() )
+         ? JSON.stringify(val)
+         : val.replace(/;/g, '\\;').replace(/#/g, "\\#")
 }
 
 function unsafe (val, doUnesc) {
-  val = (val || '').trim()
+  val = (val || "").trim()
   if (isQuoted(val)) {
     // remove the single quotes before calling JSON.parse
     if (val.charAt(0) === "'") {
-      val = val.substr(1, val.length - 2)
+      val = val.substr(1, val.length - 2);
     }
     try { val = JSON.parse(val) } catch (_) {}
   } else {
     // walk the val to find the first not-escaped ; character
     var esc = false
-    var unesc = ''
+    var unesc = "";
     for (var i = 0, l = val.length; i < l; i++) {
       var c = val.charAt(i)
       if (esc) {
-        if ('\\;#'.indexOf(c) !== -1) {
+        if ("\\;#".indexOf(c) !== -1)
           unesc += c
-        } else {
-          unesc += '\\' + c
-        }
+        else
+          unesc += "\\" + c
         esc = false
-      } else if (';#'.indexOf(c) !== -1) {
+      } else if (";#".indexOf(c) !== -1) {
         break
-      } else if (c === '\\') {
+      } else if (c === "\\") {
         esc = true
       } else {
         unesc += c
       }
     }
-    if (esc) {
-      unesc += '\\'
-    }
-    return unesc.trim()
+    if (esc)
+      unesc += "\\"
+    return unesc
   }
   return val
 }
diff --git a/deps/npm/node_modules/ini/package.json b/deps/npm/node_modules/ini/package.json
index 1bce638696..8e13a10d4f 100644
--- a/deps/npm/node_modules/ini/package.json
+++ b/deps/npm/node_modules/ini/package.json
@@ -1,37 +1,36 @@
 {
-  "_from": "ini@1.3.5",
-  "_id": "ini@1.3.5",
-  "_inBundle": false,
-  "_integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+  "_from": "ini@~1.3.4",
+  "_id": "ini@1.3.4",
+  "_integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=",
   "_location": "/ini",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "ini@1.3.5",
+    "raw": "ini@~1.3.4",
     "name": "ini",
     "escapedName": "ini",
-    "rawSpec": "1.3.5",
+    "rawSpec": "~1.3.4",
     "saveSpec": null,
-    "fetchSpec": "1.3.5"
+    "fetchSpec": "~1.3.4"
   },
   "_requiredBy": [
-    "#USER",
     "/",
     "/config-chain",
-    "/update-notifier/is-installed-globally/global-dirs",
     "/update-notifier/latest-version/package-json/registry-auth-token/rc",
     "/update-notifier/latest-version/package-json/registry-url/rc"
   ],
-  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-  "_shasum": "eee25f56db1c9ec6085e0c22778083f596abf927",
-  "_spec": "ini@1.3.5",
-  "_where": "/Users/rebecca/code/npm",
+  "_resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
+  "_shasum": "0537cb79daf59b59a1a517dff706c86ec039162e",
+  "_shrinkwrap": null,
+  "_spec": "ini@~1.3.4",
+  "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
+  "bin": null,
   "bugs": {
     "url": "https://github.com/isaacs/ini/issues"
   },
@@ -40,8 +39,7 @@
   "deprecated": false,
   "description": "An ini encoder/decoder for node",
   "devDependencies": {
-    "standard": "^10.0.3",
-    "tap": "^10.7.3 || 11"
+    "tap": "^1.2.0"
   },
   "engines": {
     "node": "*"
@@ -53,16 +51,14 @@
   "license": "ISC",
   "main": "ini.js",
   "name": "ini",
+  "optionalDependencies": {},
+  "peerDependencies": {},
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/ini.git"
   },
   "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "postversion": "npm publish",
-    "pretest": "standard ini.js",
-    "preversion": "npm test",
-    "test": "tap test/*.js --100 -J"
+    "test": "tap test/*.js"
   },
-  "version": "1.3.5"
+  "version": "1.3.4"
 }