From 2176e160883597a2bef8126c7e48d12317f58250 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 11 Apr 2016 17:34:15 -0700
Subject: [PATCH] Remove direct glob dependency.

---
 Makefile            |  2 +-
 npm-shrinkwrap.json | 55 +++++++++++----------------------------------
 package.json        |  1 -
 3 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/Makefile b/Makefile
index ece5f44a6..60cedbe3e 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ template := $(BIN)coffee tools/templates.coffee
 template_deps := \
  package.json version.json \
  tools/templates.coffee \
- node_modules/coffee-script/package.json node_modules/fs-extra/package.json node_modules/lodash/package.json node_modules/glob/package.json
+ node_modules/coffee-script/package.json node_modules/fs-extra/package.json node_modules/lodash/package.json
 cat := node tools/cat.js
 cat_deps := tools/cat.js node_modules/fs-extra/package.json
 jshint_deps := .jshintrc node_modules/jshint/package.json
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 977e0564f..4db78da32 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -106,19 +106,7 @@
     "cli": {
       "version": "0.6.6",
       "from": "cli@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz",
-      "dependencies": {
-        "glob": {
-          "version": "3.2.11",
-          "from": "glob@>=3.2.1 <3.3.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
-        },
-        "minimatch": {
-          "version": "0.3.0",
-          "from": "minimatch@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"
     },
     "coffee-script": {
       "version": "1.9.3",
@@ -257,18 +245,6 @@
       "from": "file-utils@>=0.1.5 <0.2.0",
       "resolved": "https://registry.npmjs.org/file-utils/-/file-utils-0.1.5.tgz",
       "dependencies": {
-        "glob": {
-          "version": "3.2.11",
-          "from": "glob@>=3.2.6 <3.3.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
-          "dependencies": {
-            "minimatch": {
-              "version": "0.3.0",
-              "from": "minimatch@>=0.3.0 <0.4.0",
-              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
-            }
-          }
-        },
         "lodash": {
           "version": "2.1.0",
           "from": "lodash@>=2.1.0 <2.2.0",
@@ -286,20 +262,10 @@
       "from": "findup-sync@>=0.1.2 <0.2.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz",
       "dependencies": {
-        "glob": {
-          "version": "3.2.11",
-          "from": "glob@>=3.2.9 <3.3.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz"
-        },
         "lodash": {
           "version": "2.4.2",
           "from": "lodash@>=2.4.1 <2.5.0",
           "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-        },
-        "minimatch": {
-          "version": "0.3.0",
-          "from": "minimatch@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
         }
       }
     },
@@ -324,14 +290,14 @@
       "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
     },
     "glob": {
-      "version": "7.0.3",
-      "from": "glob@>=7.0.3 <8.0.0",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz",
+      "version": "3.2.11",
+      "from": "glob@>=3.2.6 <3.3.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
       "dependencies": {
         "minimatch": {
-          "version": "3.0.0",
-          "from": "minimatch@>=2.0.0 <3.0.0||>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+          "version": "0.3.0",
+          "from": "minimatch@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz"
         }
       }
     },
@@ -367,6 +333,11 @@
             }
           }
         },
+        "glob": {
+          "version": "7.0.3",
+          "from": "glob@>=7.0.0 <7.1.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
+        },
         "grunt-cli": {
           "version": "1.2.0",
           "from": "grunt-cli@>=1.2.0 <1.3.0",
@@ -588,7 +559,7 @@
     },
     "lodash": {
       "version": "4.10.0",
-      "from": "lodash@latest",
+      "from": "lodash@>=4.10.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
     },
     "loud-rejection": {
diff --git a/package.json b/package.json
index 041eaba57..f3f52724f 100644
--- a/package.json
+++ b/package.json
@@ -51,7 +51,6 @@
     "crx": "^3.0.3",
     "font-awesome": "4.5.0",
     "fs-extra": "^0.26.7",
-    "glob": "^7.0.3",
     "grunt": "^1.0.1",
     "grunt-shell": "^1.2.1",
     "grunt-webstore-upload": "^0.8.10",