From 803e538efaae4b56a764029742adcf6761e8398b Mon Sep 17 00:00:00 2001
From: Rebecca Turner <me@re-becca.org>
Date: Thu, 11 Aug 2016 15:48:17 -0700
Subject: [PATCH] rimraf@2.5.4

Clarify assertions: cb is required, options are not

Fixes: https://github.com/isaacs/rimraf/issues/111
Credit: @isaacs
---
 node_modules/rimraf/package.json | 38 +++++++++++++++-----------------
 node_modules/rimraf/rimraf.js    |  4 ++--
 package.json                     |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index cb1eb18b13c..c4043f1eb37 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -2,40 +2,40 @@
   "_args": [
     [
       {
-        "raw": "rimraf@2.5.3",
+        "raw": "rimraf@2.5.4",
         "scope": null,
         "escapedName": "rimraf",
         "name": "rimraf",
-        "rawSpec": "2.5.3",
-        "spec": "2.5.3",
+        "rawSpec": "2.5.4",
+        "spec": "2.5.4",
         "type": "version"
       },
       "/Users/rebecca/code/npm"
     ]
   ],
-  "_from": "rimraf@2.5.3",
-  "_id": "rimraf@2.5.3",
+  "_from": "rimraf@2.5.4",
+  "_id": "rimraf@2.5.4",
   "_inCache": true,
   "_installable": true,
   "_location": "/rimraf",
   "_nodeVersion": "4.4.4",
   "_npmOperationalInternal": {
     "host": "packages-16-east.internal.npmjs.com",
-    "tmp": "tmp/rimraf-2.5.3.tgz_1467582915019_0.6380921453237534"
+    "tmp": "tmp/rimraf-2.5.4.tgz_1469206941888_0.8645927573088557"
   },
   "_npmUser": {
     "name": "isaacs",
     "email": "i@izs.me"
   },
-  "_npmVersion": "3.10.2",
+  "_npmVersion": "3.10.6",
   "_phantomChildren": {},
   "_requested": {
-    "raw": "rimraf@2.5.3",
+    "raw": "rimraf@2.5.4",
     "scope": null,
     "escapedName": "rimraf",
     "name": "rimraf",
-    "rawSpec": "2.5.3",
-    "spec": "2.5.3",
+    "rawSpec": "2.5.4",
+    "spec": "2.5.4",
     "type": "version"
   },
   "_requiredBy": [
@@ -44,14 +44,12 @@
     "/fs-vacuum",
     "/fstream",
     "/node-gyp",
-    "/npm-registry-client",
-    "/standard/eslint/file-entry-cache/flat-cache/del",
-    "/tacks"
+    "/npm-registry-client"
   ],
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.3.tgz",
-  "_shasum": "6e5efdda4aa2f03417f6b2a574aec29f4b652705",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+  "_shasum": "96800093cbf1a0c86bd95b4625467535c29dfa04",
   "_shrinkwrap": null,
-  "_spec": "rimraf@2.5.3",
+  "_spec": "rimraf@2.5.4",
   "_where": "/Users/rebecca/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
@@ -74,8 +72,8 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "6e5efdda4aa2f03417f6b2a574aec29f4b652705",
-    "tarball": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.3.tgz"
+    "shasum": "96800093cbf1a0c86bd95b4625467535c29dfa04",
+    "tarball": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"
   },
   "files": [
     "LICENSE",
@@ -83,7 +81,7 @@
     "bin.js",
     "rimraf.js"
   ],
-  "gitHead": "7263a784e8f08d94dd6caf6ee934fceb525a6f3d",
+  "gitHead": "2af08bbbd0a03549b278414309dc5d8097699443",
   "homepage": "https://github.com/isaacs/rimraf#readme",
   "license": "ISC",
   "main": "rimraf.js",
@@ -103,5 +101,5 @@
   "scripts": {
     "test": "tap test/*.js"
   },
-  "version": "2.5.3"
+  "version": "2.5.4"
 }
diff --git a/node_modules/rimraf/rimraf.js b/node_modules/rimraf/rimraf.js
index db518a9d6cc..5d9a5768a45 100644
--- a/node_modules/rimraf/rimraf.js
+++ b/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)
 
diff --git a/package.json b/package.json
index ab23bce67dd..6eb149d21d6 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "realize-package-specifier": "~3.0.3",
     "request": "~2.74.0",
     "retry": "~0.9.0",
-    "rimraf": "~2.5.3",
+    "rimraf": "~2.5.4",
     "semver": "~5.1.0",
     "sha": "~2.0.1",
     "slide": "~1.1.6",