fstream-npm@1.1.1

Fixes bug with inclusion of scoped bundledDependencies.

Fixes: https://github.com/npm/npm/issues/8614
PR-URL: https://github.com/npm/fstream-npm/pull/22
Credit: @forivall
Reviewed-By: @zkat

13 files changed, 311 insertions, 137 deletions

diff --git a/node_modules/fstream-npm/fstream-npm.js b/node_modules/fstream-npm/fstream-npm.js
index c3b93214d..554b98fec 100644
--- a/node_modules/fstream-npm/fstream-npm.js
+++ b/node_modules/fstream-npm/fstream-npm.js
@@ -78,6 +78,29 @@ Packer.prototype.readBundledLinks = function () {
     list.forEach(function (pkg) {
       if (pkg.charAt(0) === '.') return then()
       var pd = this.path + '/node_modules/' + pkg
+
+      // scoped packages
+      if (pkg.charAt(0) === '@') {
+        fs.readdir(pd, function (er, slist) {
+          var sl = slist && slist.length
+          if (er || sl === 0) return then(er)
+
+          l += sl
+          slist.forEach(function (spkg) {
+            if (spkg.charAt(0) === '.') return then()
+            var spd = pd + '/' + spkg
+            fs.realpath(spd, function (er, rp) {
+              if (er) return then()
+              this.bundleLinks = this.bundleLinks || {}
+              this.bundleLinks[pkg + '/' + spkg] = rp
+              then()
+            }.bind(this))
+          }, this)
+          then()
+        }.bind(this))
+        return
+      }
+
       fs.realpath(pd, function (er, rp) {
         if (er) return then()
         this.bundleLinks = this.bundleLinks || {}
@@ -141,8 +164,16 @@ Packer.prototype.applyIgnores = function (entry, partial, entryObj) {
   // linked with npm link, even in a bundle, deps are only bundled
   // if they're not already present at a higher level.
   if (this.bundleMagic) {
+    if (entry.charAt(0) === '@') {
+      var firstSlash = entry.indexOf('/')
+      // continue to list the packages in this scope
+      if (firstSlash === -1) return true
+
+      // bubbling up.  stop here and allow anything the bundled pkg allows
+      if (entry.indexOf('/', firstSlash + 1) !== -1) return true
+    }
     // bubbling up.  stop here and allow anything the bundled pkg allows
-    if (entry.indexOf('/') !== -1) return true
+    else if (entry.indexOf('/') !== -1) return true
 
     // never include the .bin.  It's typically full of platform-specific
     // stuff like symlinks and .cmd files anyway.
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md
index d458bc2e0..ad72b8133 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/README.md
@@ -2,7 +2,7 @@
 
 A minimal matching utility.
 
-[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.png)](http://travis-ci.org/isaacs/minimatch)
+[![Build Status](https://secure.travis-ci.org/isaacs/minimatch.svg)](http://travis-ci.org/isaacs/minimatch)
 
 
 This is the matching library used internally by npm.
@@ -37,7 +37,7 @@ See:
 
 ## Minimatch Class
 
-Create a minimatch object by instanting the `minimatch.Minimatch` class.
+Create a minimatch object by instantiating the `minimatch.Minimatch` class.
 
 ```javascript
 var Minimatch = require("minimatch").Minimatch
@@ -82,13 +82,6 @@ var mm = new Minimatch(pattern, options)
 
 All other methods are internal, and will be called as necessary.
 
-## Functions
-
-The top-level exported function has a `cache` property, which is an LRU
-cache set to store 100 items.  So, calling these methods repeatedly
-with the same pattern and options will use the same Minimatch object,
-saving the cost of parsing it multiple times.
-
 ### minimatch(path, pattern, options)
 
 Main export.  Tests a path against the pattern using the options.
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js
index ec4c05c57..830a27246 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/minimatch.js
@@ -235,7 +235,7 @@ function braceExpand (pattern, options) {
     ? this.pattern : pattern
 
   if (typeof pattern === 'undefined') {
-    throw new Error('undefined pattern')
+    throw new TypeError('undefined pattern')
   }
 
   if (options.nobrace ||
@@ -261,6 +261,10 @@ function braceExpand (pattern, options) {
 Minimatch.prototype.parse = parse
 var SUBPARSE = {}
 function parse (pattern, isSub) {
+  if (pattern.length > 1024 * 64) {
+    throw new TypeError('pattern is too long')
+  }
+
   var options = this.options
 
   // shortcuts
@@ -518,7 +522,7 @@ function parse (pattern, isSub) {
   for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
     var tail = re.slice(pl.reStart + 3)
     // maybe some even number of \, then maybe 1 \, followed by a |
-    tail = tail.replace(/((?:\\{2})*)(\\?)\|/g, function (_, $1, $2) {
+    tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
       if (!$2) {
         // the | isn't already escaped, so escape it.
         $2 = '\\'
@@ -615,7 +619,15 @@ function parse (pattern, isSub) {
   }
 
   var flags = options.nocase ? 'i' : ''
-  var regExp = new RegExp('^' + re + '$', flags)
+  try {
+    var regExp = new RegExp('^' + re + '$', flags)
+  } catch (er) {
+    // If it was an invalid regular expression, then it can't match
+    // anything.  This trick looks for a character after the end of
+    // the string, which is of course impossible, except in multi-line
+    // mode, but it's not a /m regex.
+    return new RegExp('$.')
+  }
 
   regExp._glob = pattern
   regExp._src = re
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/.npmignore b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/.npmignore
deleted file mode 100644
index 353546af2..000000000
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/.npmignore
+++ /dev/null
@@ -1,3 +0,0 @@
-test
-.gitignore
-.travis.yml
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/example.js b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/example.js
deleted file mode 100644
index 60ecfc74d..000000000
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/example.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var expand = require('./');
-
-console.log(expand('http://any.org/archive{1996..1999}/vol{1..4}/part{a,b,c}.html'));
-console.log(expand('http://www.numericals.com/file{1..100..10}.txt'));
-console.log(expand('http://www.letters.com/file{a..z..2}.txt'));
-console.log(expand('mkdir /usr/local/src/bash/{old,new,dist,bugs}'));
-console.log(expand('chown root /usr/{ucb/{ex,edit},lib/{ex?.?*,how_ex}}'));
-
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js
index 932718f92..955f27c81 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/index.js
@@ -66,6 +66,16 @@ function expandTop(str) {
   if (!str)
     return [];
 
+  // I don't know why Bash 4.3 does this, but it does.
+  // Anything starting with {} will have the first two bytes preserved
+  // but *only* at the top level, so {},a}b will not expand to anything,
+  // but a{},b}c will be expanded to [a}c,abc].
+  // One could argue that this is a bug in Bash, but since the goal of
+  // this module is to match Bash's rules, we escape a leading {}
+  if (str.substr(0, 2) === '{}') {
+    str = '\\{\\}' + str.substr(2);
+  }
+
   return expand(escapeBraces(str), true).map(unescapeBraces);
 }
 
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
index d6880b2f3..08e918c0d 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/README.md
@@ -47,7 +47,7 @@ object with those keys:
 
 If there's no match, `undefined` will be returned.
 
-If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']`.
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `['{', 'a', '']` and `{a}}` will match `['', 'a', '}']`.
 
 ### var r = balanced.range(a, b, str)
 
@@ -56,7 +56,7 @@ array with indexes: `[ <a index>, <b index> ]`.
 
 If there's no match, `undefined` will be returned.
 
-If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]`.
+If the `str` contains more `a` than `b` / there are unmatched pairs, the first match that was closed will be used. For example, `{{a}` will match `[ 1, 3 ]` and `{a}}` will match `[0, 2]`.
 
 ## Installation
 
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
index 4670f7f79..e8d858702 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/index.js
@@ -30,7 +30,7 @@ function range(a, b, str) {
     begs = [];
     left = str.length;
 
-    while (i < str.length && i >= 0 && ! result) {
+    while (i >= 0 && !result) {
       if (i == ai) {
         begs.push(i);
         ai = str.indexOf(a, i + 1);
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
index 9322bb20f..fa5e604e0 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/node_modules/balanced-match/package.json
@@ -2,10 +2,11 @@
   "_args": [
     [
       {
-        "name": "balanced-match",
         "raw": "balanced-match@^0.4.1",
-        "rawSpec": "^0.4.1",
         "scope": null,
+        "escapedName": "balanced-match",
+        "name": "balanced-match",
+        "rawSpec": "^0.4.1",
         "spec": ">=0.4.1 <0.5.0",
         "type": "range"
       },
@@ -13,40 +14,41 @@
     ]
   ],
   "_from": "balanced-match@>=0.4.1 <0.5.0",
-  "_id": "balanced-match@0.4.1",
+  "_id": "balanced-match@0.4.2",
   "_inCache": true,
   "_installable": true,
   "_location": "/fstream-npm/fstream-ignore/minimatch/brace-expansion/balanced-match",
-  "_nodeVersion": "6.0.0",
+  "_nodeVersion": "4.4.7",
   "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/balanced-match-0.4.1.tgz_1462129663650_0.39764496590942144"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/balanced-match-0.4.2.tgz_1468834991581_0.6590619895141572"
   },
   "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
   },
-  "_npmVersion": "3.8.6",
+  "_npmVersion": "2.15.8",
   "_phantomChildren": {},
   "_requested": {
-    "name": "balanced-match",
     "raw": "balanced-match@^0.4.1",
-    "rawSpec": "^0.4.1",
     "scope": null,
+    "escapedName": "balanced-match",
+    "name": "balanced-match",
+    "rawSpec": "^0.4.1",
     "spec": ">=0.4.1 <0.5.0",
     "type": "range"
   },
   "_requiredBy": [
     "/fstream-npm/fstream-ignore/minimatch/brace-expansion"
   ],
-  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz",
-  "_shasum": "19053e2e0748eadb379da6c09d455cf5e1039335",
+  "_resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz",
+  "_shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
   "_shrinkwrap": null,
   "_spec": "balanced-match@^0.4.1",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion",
   "author": {
-    "email": "mail@juliangruber.com",
     "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com"
   },
   "bugs": {
@@ -55,14 +57,14 @@
   "dependencies": {},
   "description": "Match balanced character pairs, like \"{\" and \"}\"",
   "devDependencies": {
-    "tape": "~4.5.0"
+    "tape": "^4.6.0"
   },
   "directories": {},
   "dist": {
-    "shasum": "19053e2e0748eadb379da6c09d455cf5e1039335",
-    "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
+    "shasum": "cb3f3e3c732dc0f01ee70b403f302e61d7709838",
+    "tarball": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
   },
-  "gitHead": "7004b289baaaab6a832f4901735e29d37cc2a863",
+  "gitHead": "57c2ea29d89a2844ae3bdcc637c6e2cbb73725e2",
   "homepage": "https://github.com/juliangruber/balanced-match",
   "keywords": [
     "match",
@@ -75,8 +77,8 @@
   "main": "index.js",
   "maintainers": [
     {
-      "email": "julian@juliangruber.com",
-      "name": "juliangruber"
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
     }
   ],
   "name": "balanced-match",
@@ -90,6 +92,7 @@
     "test": "make test"
   },
   "testling": {
+    "files": "test/*.js",
     "browsers": [
       "ie/8..latest",
       "firefox/20..latest",
@@ -102,8 +105,7 @@
       "ipad/6.0..latest",
       "iphone/6.0..latest",
       "android-browser/4.2..latest"
-    ],
-    "files": "test/*.js"
+    ]
   },
-  "version": "0.4.1"
+  "version": "0.4.2"
 }
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
index 0a28e3def..2b603477a 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/node_modules/brace-expansion/package.json
@@ -2,10 +2,11 @@
   "_args": [
     [
       {
-        "name": "brace-expansion",
         "raw": "brace-expansion@^1.0.0",
-        "rawSpec": "^1.0.0",
         "scope": null,
+        "escapedName": "brace-expansion",
+        "name": "brace-expansion",
+        "rawSpec": "^1.0.0",
         "spec": ">=1.0.0 <2.0.0",
         "type": "range"
       },
@@ -13,40 +14,41 @@
     ]
   ],
   "_from": "brace-expansion@>=1.0.0 <2.0.0",
-  "_id": "brace-expansion@1.1.4",
+  "_id": "brace-expansion@1.1.6",
   "_inCache": true,
   "_installable": true,
   "_location": "/fstream-npm/fstream-ignore/minimatch/brace-expansion",
-  "_nodeVersion": "6.0.0",
+  "_nodeVersion": "4.4.7",
   "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/brace-expansion-1.1.4.tgz_1462130058897_0.14984136167913675"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/brace-expansion-1.1.6.tgz_1469047715600_0.9362958471756428"
   },
   "_npmUser": {
-    "email": "julian@juliangruber.com",
-    "name": "juliangruber"
+    "name": "juliangruber",
+    "email": "julian@juliangruber.com"
   },
-  "_npmVersion": "3.8.6",
+  "_npmVersion": "2.15.8",
   "_phantomChildren": {},
   "_requested": {
-    "name": "brace-expansion",
     "raw": "brace-expansion@^1.0.0",
-    "rawSpec": "^1.0.0",
     "scope": null,
+    "escapedName": "brace-expansion",
+    "name": "brace-expansion",
+    "rawSpec": "^1.0.0",
     "spec": ">=1.0.0 <2.0.0",
     "type": "range"
   },
   "_requiredBy": [
     "/fstream-npm/fstream-ignore/minimatch"
   ],
-  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz",
-  "_shasum": "464a204c77f482c085c2a36c456bbfbafb67a127",
+  "_resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz",
+  "_shasum": "7197d7eaa9b87e648390ea61fc66c84427420df9",
   "_shrinkwrap": null,
   "_spec": "brace-expansion@^1.0.0",
   "_where": "/Users/zkat/Documents/code/npm/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch",
   "author": {
-    "email": "mail@juliangruber.com",
     "name": "Julian Gruber",
+    "email": "mail@juliangruber.com",
     "url": "http://juliangruber.com"
   },
   "bugs": {
@@ -58,26 +60,26 @@
   },
   "description": "Brace expansion as known from sh/bash",
   "devDependencies": {
-    "tape": "4.5.1"
+    "tape": "^4.6.0"
   },
   "directories": {},
   "dist": {
-    "shasum": "464a204c77f482c085c2a36c456bbfbafb67a127",
-    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
+    "shasum": "7197d7eaa9b87e648390ea61fc66c84427420df9",
+    "tarball": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
   },
-  "gitHead": "1660b75d0bf03b022e7888b576cd5a4080692c1d",
+  "gitHead": "791262fa06625e9c5594cde529a21d82086af5f2",
   "homepage": "https://github.com/juliangruber/brace-expansion",
   "keywords": [],
   "license": "MIT",
   "main": "index.js",
   "maintainers": [
     {
-      "email": "julian@juliangruber.com",
-      "name": "juliangruber"
+      "name": "juliangruber",
+      "email": "julian@juliangruber.com"
     },
     {
-      "email": "isaacs@npmjs.com",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "isaacs@npmjs.com"
     }
   ],
   "name": "brace-expansion",
@@ -92,6 +94,7 @@
     "test": "tape test/*.js"
   },
   "testling": {
+    "files": "test/*.js",
     "browsers": [
       "ie/8..latest",
       "firefox/20..latest",
@@ -104,8 +107,7 @@
       "ipad/6.0..latest",
       "iphone/6.0..latest",
       "android-browser/4.2..latest"
-    ],
-    "files": "test/*.js"
+    ]
   },
-  "version": "1.1.4"
+  "version": "1.1.6"
 }
diff --git a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
index 51abf9891..05fa6e6b9 100644
--- a/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
+++ b/node_modules/fstream-npm/node_modules/fstream-ignore/node_modules/minimatch/package.json
@@ -1,60 +1,98 @@
 {
+  "_args": [
+    [
+      {
+        "raw": "minimatch@^3.0.0",
+        "scope": null,
+        "escapedName": "minimatch",
+        "name": "minimatch",
+        "rawSpec": "^3.0.0",
+        "spec": ">=3.0.0 <4.0.0",
+        "type": "range"
+      },
+      "/Users/zkat/Documents/code/npm/node_modules/fstream-npm/node_modules/fstream-ignore"
+    ]
+  ],
+  "_from": "minimatch@>=3.0.0 <4.0.0",
+  "_id": "minimatch@3.0.2",
+  "_inCache": true,
+  "_installable": true,
+  "_location": "/fstream-npm/fstream-ignore/minimatch",
+  "_nodeVersion": "4.4.4",
+  "_npmOperationalInternal": {
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/minimatch-3.0.2.tgz_1466194379770_0.11417287751100957"
+  },
+  "_npmUser": {
+    "name": "isaacs",
+    "email": "i@izs.me"
+  },
+  "_npmVersion": "3.9.1",
+  "_phantomChildren": {},
+  "_requested": {
+    "raw": "minimatch@^3.0.0",
+    "scope": null,
+    "escapedName": "minimatch",
+    "name": "minimatch",
+    "rawSpec": "^3.0.0",
+    "spec": ">=3.0.0 <4.0.0",
+    "type": "range"
+  },
+  "_requiredBy": [
+    "/fstream-npm/fstream-ignore"
+  ],
+  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
+  "_shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
+  "_shrinkwrap": null,
+  "_spec": "minimatch@^3.0.0",
+  "_where": "/Users/zkat/Documents/code/npm/node_modules/fstream-npm/node_modules/fstream-ignore",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
     "url": "http://blog.izs.me"
   },
-  "name": "minimatch",
-  "description": "a glob matcher in javascript",
-  "version": "3.0.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/isaacs/minimatch.git"
-  },
-  "main": "minimatch.js",
-  "scripts": {
-    "posttest": "standard minimatch.js test/*.js",
-    "test": "tap test/*.js"
-  },
-  "engines": {
-    "node": "*"
+  "bugs": {
+    "url": "https://github.com/isaacs/minimatch/issues"
   },
   "dependencies": {
     "brace-expansion": "^1.0.0"
   },
+  "description": "a glob matcher in javascript",
   "devDependencies": {
     "standard": "^3.7.2",
-    "tap": "^1.2.0"
+    "tap": "^5.6.0"
+  },
+  "directories": {},
+  "dist": {
+    "shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
+    "tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
+  },
+  "engines": {
+    "node": "*"
   },
-  "license": "ISC",
   "files": [
     "minimatch.js"
   ],
-  "gitHead": "270dbea567f0af6918cb18103e98c612aa717a20",
-  "bugs": {
-    "url": "https://github.com/isaacs/minimatch/issues"
-  },
+  "gitHead": "81edb7c763abd31ba981c87ec5e835f178786be0",
   "homepage": "https://github.com/isaacs/minimatch#readme",
-  "_id": "minimatch@3.0.0",
-  "_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
-  "_from": "minimatch@>=3.0.0 <4.0.0",
-  "_npmVersion": "3.3.2",
-  "_nodeVersion": "4.0.0",
-  "_npmUser": {
-    "name": "isaacs",
-    "email": "isaacs@npmjs.com"
-  },
-  "dist": {
-    "shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
-    "tarball": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
-  },
+  "license": "ISC",
+  "main": "minimatch.js",
   "maintainers": [
     {
       "name": "isaacs",
       "email": "i@izs.me"
     }
   ],
-  "directories": {},
-  "_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "name": "minimatch",
+  "optionalDependencies": {},
+  "readme": "ERROR: No README data found!",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/isaacs/minimatch.git"
+  },
+  "scripts": {
+    "posttest": "standard minimatch.js test/*.js",
+    "test": "tap test/*.js"
+  },
+  "version": "3.0.2"
 }
diff --git a/node_modules/fstream-npm/package.json b/node_modules/fstream-npm/package.json
index 0eddd8be0..0ec1f4515 100644
--- a/node_modules/fstream-npm/package.json
+++ b/node_modules/fstream-npm/package.json
@@ -2,10 +2,11 @@
   "_args": [
     [
       {
-        "name": "fstream-npm",
         "raw": "fstream-npm@latest",
-        "rawSpec": "latest",
         "scope": null,
+        "escapedName": "fstream-npm",
+        "name": "fstream-npm",
+        "rawSpec": "latest",
         "spec": "latest",
         "type": "tag"
       },
@@ -13,43 +14,45 @@
     ]
   ],
   "_from": "fstream-npm@latest",
-  "_id": "fstream-npm@1.1.0",
+  "_id": "fstream-npm@1.1.1",
   "_inCache": true,
   "_installable": true,
   "_location": "/fstream-npm",
   "_nodeVersion": "5.10.1",
   "_npmOperationalInternal": {
-    "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/fstream-npm-1.1.0.tgz_1463528747313_0.84859543829225"
+    "host": "packages-16-east.internal.npmjs.com",
+    "tmp": "tmp/fstream-npm-1.1.1.tgz_1470163716583_0.04285589815117419"
   },
   "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
-  "_npmVersion": "3.9.1",
+  "_npmVersion": "3.10.6",
   "_phantomChildren": {
-    "fstream": "1.0.9",
+    "fstream": "1.0.10",
     "inherits": "2.0.1"
   },
   "_requested": {
-    "name": "fstream-npm",
     "raw": "fstream-npm@latest",
-    "rawSpec": "latest",
     "scope": null,
+    "escapedName": "fstream-npm",
+    "name": "fstream-npm",
+    "rawSpec": "latest",
     "spec": "latest",
     "type": "tag"
   },
   "_requiredBy": [
+    "#USER",
     "/"
   ],
-  "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.0.tgz",
-  "_shasum": "80e09743485eaa70d57e89d1ff8fafa366cdefea",
+  "_resolved": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.1.tgz",
+  "_shasum": "6b9175db6239a83d8209e232426c494dbb29690c",
   "_shrinkwrap": null,
   "_spec": "fstream-npm@latest",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bugs": {
@@ -69,29 +72,29 @@
   },
   "directories": {},
   "dist": {
-    "shasum": "80e09743485eaa70d57e89d1ff8fafa366cdefea",
-    "tarball": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.0.tgz"
+    "shasum": "6b9175db6239a83d8209e232426c494dbb29690c",
+    "tarball": "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.1.1.tgz"
   },
-  "gitHead": "7df2e946714506f287b0a8125dc05566b840d4b0",
+  "gitHead": "434415a678c4759c997207f974b25c7492d39127",
   "homepage": "https://github.com/npm/fstream-npm#readme",
   "license": "ISC",
   "main": "./fstream-npm.js",
   "maintainers": [
     {
-      "email": "me@re-becca.org",
-      "name": "iarna"
+      "name": "iarna",
+      "email": "me@re-becca.org"
     },
     {
-      "email": "i@izs.me",
-      "name": "isaacs"
+      "name": "isaacs",
+      "email": "i@izs.me"
     },
     {
-      "email": "ogd@aoaioxxysz.net",
-      "name": "othiym23"
+      "name": "othiym23",
+      "email": "ogd@aoaioxxysz.net"
     },
     {
-      "email": "kat@sykosomatic.org",
-      "name": "zkat"
+      "name": "zkat",
+      "email": "kat@sykosomatic.org"
     }
   ],
   "name": "fstream-npm",
@@ -104,5 +107,5 @@
   "scripts": {
     "test": "standard && tap test/*.js"
   },
-  "version": "1.1.0"
+  "version": "1.1.1"
 }
diff --git a/node_modules/fstream-npm/test/scoped.js b/node_modules/fstream-npm/test/scoped.js
new file mode 100644
index 000000000..c001c1b33
--- /dev/null
+++ b/node_modules/fstream-npm/test/scoped.js
@@ -0,0 +1,94 @@
+var fs = require('graceful-fs')
+var join = require('path').join
+
+var mkdirp = require('mkdirp')
+var rimraf = require('rimraf')
+var test = require('tap').test
+
+var Packer = require('..')
+
+var pkg = join(__dirname, 'test-package-scoped')
+
+var elfJS = function () {/*
+module.exports = function () {
+  console.log("i'm a elf")
+}
+*/}.toString().split('\n').slice(1, -1).join()
+
+var json = {
+  'name': 'test-package-scoped',
+  'version': '3.1.4',
+  'main': 'elf.js',
+  'bundledDependencies': [
+    '@npmwombat/scoped'
+  ]
+}
+
+test('setup', function (t) {
+  setup()
+  t.end()
+})
+
+var included = [
+  'package.json',
+  'elf.js',
+  join('node_modules', '@npmwombat', 'scoped', 'index.js')
+]
+
+test('includes bundledDependencies', function (t) {
+  var subject = new Packer({ path: pkg, type: 'Directory', isDirectory: true })
+  var filenames = []
+  subject.on('entry', function (entry) {
+    t.equal(entry.type, 'File', 'only files in this package')
+
+    // include relative path in filename
+    var filename = entry._path.slice(entry.root._path.length + 1)
+
+    filenames.push(filename)
+  })
+  // need to do this so fstream doesn't explode when files are removed from
+  // under it
+  subject.on('end', function () {
+    // ensure we get *exactly* the results we expect by comparing in both
+    // directions
+    filenames.forEach(function (filename) {
+      t.ok(
+        included.indexOf(filename) > -1,
+        filename + ' is included'
+      )
+    })
+    included.forEach(function (filename) {
+      t.ok(
+        filenames.indexOf(filename) > -1,
+        filename + ' is not included'
+      )
+    })
+    t.end()
+  })
+})
+
+test('cleanup', function (t) {
+  // rimraf.sync chokes here for some reason
+  rimraf(pkg, function () { t.end() })
+})
+
+function setup () {
+  rimraf.sync(pkg)
+  mkdirp.sync(pkg)
+  fs.writeFileSync(
+    join(pkg, 'package.json'),
+    JSON.stringify(json, null, 2)
+  )
+
+  fs.writeFileSync(
+    join(pkg, 'elf.js'),
+    elfJS
+  )
+
+  var scopedDir = join(pkg, 'node_modules', '@npmwombat', 'scoped')
+  mkdirp.sync(scopedDir)
+  fs.writeFileSync(
+    join(scopedDir, 'index.js'),
+    "console.log('hello wombat')"
+  )
+}