Full dependency reboot

Reinstall everything from a clean node_modules and package-lock.json
state.

Re-generate list of bundleDependencies and node_modules/.gitignore with
a script that does the right thing based on actual dependency state.

2 files changed, 26 insertions, 23 deletions

diff --git a/node_modules/rimraf/package.json b/node_modules/rimraf/package.json
index a82c85a69..23484dc23 100644
--- a/node_modules/rimraf/package.json
+++ b/node_modules/rimraf/package.json
@@ -1,46 +1,41 @@
 {
-  "_from": "rimraf@2.6.3",
-  "_id": "rimraf@2.6.3",
+  "_from": "rimraf@^2.6.3",
+  "_id": "rimraf@2.7.1",
   "_inBundle": false,
-  "_integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+  "_integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
   "_location": "/rimraf",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "range",
     "registry": true,
-    "raw": "rimraf@2.6.3",
+    "raw": "rimraf@^2.6.3",
     "name": "rimraf",
     "escapedName": "rimraf",
-    "rawSpec": "2.6.3",
+    "rawSpec": "^2.6.3",
     "saveSpec": null,
-    "fetchSpec": "2.6.3"
+    "fetchSpec": "^2.6.3"
   },
   "_requiredBy": [
-    "#USER",
     "/",
-    "/cacache",
-    "/copy-concurrently",
-    "/flat-cache",
-    "/fs-vacuum",
-    "/fstream",
-    "/libcipm",
+    "/istanbul-lib-processinfo",
+    "/istanbul-lib-source-maps",
     "/libnpx",
-    "/move-concurrently",
     "/node-gyp",
-    "/pacote",
+    "/nyc",
+    "/spawn-wrap",
     "/tap"
   ],
-  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-  "_shasum": "b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab",
-  "_spec": "rimraf@2.6.3",
-  "_where": "/Users/aeschright/code/cli",
+  "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+  "_shasum": "35797f13a7fdadc566142c29d4f07ccad483e3ec",
+  "_spec": "rimraf@^2.6.3",
+  "_where": "/Users/isaacs/dev/npm/cli",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bin": {
-    "rimraf": "./bin.js"
+    "rimraf": "bin.js"
   },
   "bugs": {
     "url": "https://github.com/isaacs/rimraf/issues"
@@ -75,5 +70,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js"
   },
-  "version": "2.6.3"
+  "version": "2.7.1"
 }
diff --git a/node_modules/rimraf/rimraf.js b/node_modules/rimraf/rimraf.js
index e80dd1069..a90ad029f 100644
--- a/node_modules/rimraf/rimraf.js
+++ b/node_modules/rimraf/rimraf.js
@@ -4,7 +4,12 @@ rimraf.sync = rimrafSync
 var assert = require("assert")
 var path = require("path")
 var fs = require("fs")
-var glob = require("glob")
+var glob = undefined
+try {
+  glob = require("glob")
+} catch (_err) {
+  // treat glob as optional.
+}
 var _0666 = parseInt('666', 8)
 
 var defaultGlobOpts = {
@@ -37,6 +42,9 @@ function defaults (options) {
   if (options.glob === false) {
     options.disableGlob = true
   }
+  if (options.disableGlob !== true && glob === undefined) {
+    throw Error('glob dependency not found, set `options.disableGlob = true` if intentional')
+  }
   options.disableGlob = options.disableGlob || false
   options.glob = options.glob || defaultGlobOpts
 }