deps: upgrade npm to 3.10.8

PR-URL: https://github.com/nodejs/node/pull/8706
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

2 files changed, 49 insertions, 35 deletions

diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json
index ccc09c5afd..c4043f1eb3 100644
--- a/deps/npm/node_modules/rimraf/package.json
+++ b/deps/npm/node_modules/rimraf/package.json
@@ -1,53 +1,59 @@
 {
   "_args": [
     [
-      "rimraf@~2.5.1",
+      {
+        "raw": "rimraf@2.5.4",
+        "scope": null,
+        "escapedName": "rimraf",
+        "name": "rimraf",
+        "rawSpec": "2.5.4",
+        "spec": "2.5.4",
+        "type": "version"
+      },
       "/Users/rebecca/code/npm"
     ]
   ],
-  "_from": "rimraf@>=2.5.1 <2.6.0",
-  "_id": "rimraf@2.5.2",
+  "_from": "rimraf@2.5.4",
+  "_id": "rimraf@2.5.4",
   "_inCache": true,
   "_installable": true,
   "_location": "/rimraf",
-  "_nodeVersion": "5.6.0",
+  "_nodeVersion": "4.4.4",
   "_npmOperationalInternal": {
-    "host": "packages-6-west.internal.npmjs.com",
-    "tmp": "tmp/rimraf-2.5.2.tgz_1455346499772_0.9326622514054179"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/rimraf-2.5.4.tgz_1469206941888_0.8645927573088557"
   },
   "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "i@izs.me"
   },
-  "_npmVersion": "3.7.0",
+  "_npmVersion": "3.10.6",
   "_phantomChildren": {},
   "_requested": {
-    "name": "rimraf",
-    "raw": "rimraf@~2.5.1",
-    "rawSpec": "~2.5.1",
+    "raw": "rimraf@2.5.4",
     "scope": null,
-    "spec": ">=2.5.1 <2.6.0",
-    "type": "range"
+    "escapedName": "rimraf",
+    "name": "rimraf",
+    "rawSpec": "2.5.4",
+    "spec": "2.5.4",
+    "type": "version"
   },
   "_requiredBy": [
+    "#USER",
     "/",
     "/fs-vacuum",
     "/fstream",
     "/node-gyp",
-    "/npm-registry-client",
-    "/standard/standard-engine/eslint/file-entry-cache/flat-cache/del",
-    "/tacks",
-    "/tap/nyc",
-    "/tap/nyc/spawn-wrap"
+    "/npm-registry-client"
   ],
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz",
-  "_shasum": "62ba947fa4c0b4363839aefecd4f0fbad6059726",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+  "_shasum": "96800093cbf1a0c86bd95b4625467535c29dfa04",
   "_shrinkwrap": null,
-  "_spec": "rimraf@~2.5.1",
+  "_spec": "rimraf@2.5.4",
   "_where": "/Users/rebecca/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bin": {
@@ -57,17 +63,17 @@
     "url": "https://github.com/isaacs/rimraf/issues"
   },
   "dependencies": {
-    "glob": "^7.0.0"
+    "glob": "^7.0.5"
   },
   "description": "A deep deletion module for node (like `rm -rf`)",
   "devDependencies": {
     "mkdirp": "^0.5.1",
-    "tap": "^5.1.1"
+    "tap": "^6.1.1"
   },
   "directories": {},
   "dist": {
-    "shasum": "62ba947fa4c0b4363839aefecd4f0fbad6059726",
-    "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
+    "shasum": "96800093cbf1a0c86bd95b4625467535c29dfa04",
+    "tarball": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
   },
   "files": [
     "LICENSE",
@@ -75,14 +81,14 @@
     "bin.js",
     "rimraf.js"
   ],
-  "gitHead": "f414f87021f88d004ac487eebc8d07ce6a152721",
+  "gitHead": "2af08bbbd0a03549b278414309dc5d8097699443",
   "homepage": "https://github.com/isaacs/rimraf#readme",
   "license": "ISC",
   "main": "rimraf.js",
   "maintainers": [
     {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
     }
   ],
   "name": "rimraf",
@@ -95,5 +101,5 @@
   "scripts": {
     "test": "tap test/*.js"
   },
-  "version": "2.5.2"
+  "version": "2.5.4"
 }
diff --git a/deps/npm/node_modules/rimraf/rimraf.js b/deps/npm/node_modules/rimraf/rimraf.js
index c01d13b200..5d9a5768a4 100644
--- a/deps/npm/node_modules/rimraf/rimraf.js
+++ b/deps/npm/node_modules/rimraf/rimraf.js
@@ -48,9 +48,9 @@ function rimraf (p, options, cb) {
 
   assert(p, 'rimraf: missing path')
   assert.equal(typeof p, 'string', 'rimraf: path should be a string')
-  assert(options, 'rimraf: missing options')
-  assert.equal(typeof options, 'object', 'rimraf: options should be object')
   assert.equal(typeof cb, 'function', 'rimraf: callback function required')
+  assert(options, 'rimraf: invalid options argument provided')
+  assert.equal(typeof options, 'object', 'rimraf: options should be object')
 
   defaults(options)
 
@@ -61,7 +61,7 @@ function rimraf (p, options, cb) {
   if (options.disableGlob || !glob.hasMagic(p))
     return afterGlob(null, [p])
 
-  fs.lstat(p, function (er, stat) {
+  options.lstat(p, function (er, stat) {
     if (!er)
       return afterGlob(null, [p])
 
@@ -135,6 +135,10 @@ function rimraf_ (p, options, cb) {
     if (er && er.code === "ENOENT")
       return cb(null)
 
+    // Windows can EPERM on stat.  Life is suffering.
+    if (er && er.code === "EPERM" && isWindows)
+      fixWinEPERM(p, options, er, cb)
+
     if (st && st.isDirectory())
       return rmdir(p, options, er, cb)
 
@@ -269,7 +273,7 @@ function rimrafSync (p, options) {
     results = [p]
   } else {
     try {
-      fs.lstatSync(p)
+      options.lstatSync(p)
       results = [p]
     } catch (er) {
       results = glob.sync(p, options.glob)
@@ -287,6 +291,10 @@ function rimrafSync (p, options) {
     } catch (er) {
       if (er.code === "ENOENT")
         return
+
+      // Windows can EPERM on stat.  Life is suffering.
+      if (er.code === "EPERM" && isWindows)
+        fixWinEPERMSync(p, options, er)
     }
 
     try {