npm-packlist@1.1.10

4 files changed, 35 insertions, 29 deletions

diff --git a/node_modules/npm-packlist/index.js b/node_modules/npm-packlist/index.js
index 25105eed0..c1b878359 100644
--- a/node_modules/npm-packlist/index.js
+++ b/node_modules/npm-packlist/index.js
@@ -76,7 +76,11 @@ const npmWalker = Class => class Walker extends Class {
     // get the partial path from the root of the walk
     const p = this.path.substr(this.root.length + 1)
     const pkgre = /^node_modules\/(@[^\/]+\/?[^\/]+|[^\/]+)(\/.*)?$/
-    const pkg = pkgre.test(entry) ? entry.replace(pkgre, '$1') : null
+    const isRoot = !this.parent
+    const pkg = isRoot && pkgre.test(entry) ?
+      entry.replace(pkgre, '$1') : null
+    const rootNM = isRoot && entry === 'node_modules'
+    const rootPJ = isRoot && entry === 'package.json'
 
     return (
       // if we're in a bundled package, check with the parent.
@@ -86,14 +90,17 @@ const npmWalker = Class => class Walker extends Class {
       // if package is bundled, all files included
       // also include @scope dirs for bundled scoped deps
       // they'll be ignored if no files end up in them.
+      // However, this only matters if we're in the root.
+      // node_modules folders elsewhere, like lib/node_modules,
+      // should be included normally unless ignored.
       : pkg ? -1 !== this.bundled.indexOf(pkg) ||
         -1 !== this.bundledScopes.indexOf(pkg)
 
       // only walk top node_modules if we want to bundle something
-      : entry === 'node_modules' && !this.parent ? !!this.bundled.length
+      : rootNM ? !!this.bundled.length
 
       // always include package.json at the root.
-      : entry === 'package.json' && !this.parent ? true
+      : rootPJ ? true
 
       // otherwise, follow ignore-walk's logic
       : super.filterEntry(entry, partial)
diff --git a/node_modules/npm-packlist/node_modules/ignore-walk/index.js b/node_modules/npm-packlist/node_modules/ignore-walk/index.js
index 22517fb0e..abfd9ece5 100644
--- a/node_modules/npm-packlist/node_modules/ignore-walk/index.js
+++ b/node_modules/npm-packlist/node_modules/ignore-walk/index.js
@@ -100,8 +100,7 @@ class Walker extends EE {
       .filter(line => !/^#|^$/.test(line.trim()))
       .map(r => new Minimatch(r, mmopt))
 
-    if (rules.length)
-      this.ignoreRules[file] = rules
+    this.ignoreRules[file] = rules
 
     then()
   }
diff --git a/node_modules/npm-packlist/node_modules/ignore-walk/package.json b/node_modules/npm-packlist/node_modules/ignore-walk/package.json
index 2411f58f5..890635b26 100644
--- a/node_modules/npm-packlist/node_modules/ignore-walk/package.json
+++ b/node_modules/npm-packlist/node_modules/ignore-walk/package.json
@@ -1,27 +1,27 @@
 {
-  "_from": "ignore-walk@^3.0.0",
-  "_id": "ignore-walk@3.0.0",
+  "_from": "ignore-walk@^3.0.1",
+  "_id": "ignore-walk@3.0.1",
   "_inBundle": false,
-  "_integrity": "sha512-tKHrQ70YReq6IFyAs/XAQy91mgLVpLExNh3HrjExr6vqg8FLq/vd27D4eAN0K2PodhLjiQu5Xc2Q+AkW/T7hKQ==",
+  "_integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
   "_location": "/npm-packlist/ignore-walk",
   "_phantomChildren": {},
   "_requested": {
     "type": "range",
     "registry": true,
-    "raw": "ignore-walk@^3.0.0",
+    "raw": "ignore-walk@^3.0.1",
     "name": "ignore-walk",
     "escapedName": "ignore-walk",
-    "rawSpec": "^3.0.0",
+    "rawSpec": "^3.0.1",
     "saveSpec": null,
-    "fetchSpec": "^3.0.0"
+    "fetchSpec": "^3.0.1"
   },
   "_requiredBy": [
     "/npm-packlist"
   ],
-  "_resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.0.tgz",
-  "_shasum": "e407919edee5c47c63473b319bfe3ea4a771a57e",
-  "_spec": "ignore-walk@^3.0.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/npm-packlist",
+  "_resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+  "_shasum": "a83e62e7d272ac0e3b551aaa82831a19b69f82f8",
+  "_spec": "ignore-walk@^3.0.1",
+  "_where": "/Users/zkat/Documents/code/npm/node_modules/npm-packlist",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -40,7 +40,7 @@
     "mkdirp": "^0.5.1",
     "mutate-fs": "^1.1.0",
     "rimraf": "^2.6.1",
-    "tap": "^10.3.2"
+    "tap": "^10.7.2"
   },
   "files": [
     "index.js"
@@ -67,5 +67,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100"
   },
-  "version": "3.0.0"
+  "version": "3.0.1"
 }
diff --git a/node_modules/npm-packlist/package.json b/node_modules/npm-packlist/package.json
index 7a27ba6d4..f5d2e9a70 100644
--- a/node_modules/npm-packlist/package.json
+++ b/node_modules/npm-packlist/package.json
@@ -1,28 +1,28 @@
 {
-  "_from": "npm-packlist@1.1.9",
-  "_id": "npm-packlist@1.1.9",
+  "_from": "npm-packlist@1.1.10",
+  "_id": "npm-packlist@1.1.10",
   "_inBundle": false,
-  "_integrity": "sha512-9YECSMmx4grAK0dClDr3vGgo1c8O03DLrA4DCOlJMrtnwP2eLHC+JyH7YCM8qO8HgyWjILY4e5/BY7jVChYaWg==",
+  "_integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==",
   "_location": "/npm-packlist",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "npm-packlist@1.1.9",
+    "raw": "npm-packlist@1.1.10",
     "name": "npm-packlist",
     "escapedName": "npm-packlist",
-    "rawSpec": "1.1.9",
+    "rawSpec": "1.1.10",
     "saveSpec": null,
-    "fetchSpec": "1.1.9"
+    "fetchSpec": "1.1.10"
   },
   "_requiredBy": [
     "#USER",
     "/",
     "/pacote"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.9.tgz",
-  "_shasum": "bd24a0b7a31a307315b07c2e54f4888f10577548",
-  "_spec": "npm-packlist@1.1.9",
+  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz",
+  "_shasum": "1039db9e985727e464df066f4cf0ab6ef85c398a",
+  "_spec": "npm-packlist@1.1.10",
   "_where": "/Users/zkat/Documents/code/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
@@ -34,7 +34,7 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "ignore-walk": "^3.0.0",
+    "ignore-walk": "^3.0.1",
     "npm-bundled": "^1.0.1"
   },
   "deprecated": false,
@@ -42,7 +42,7 @@
   "devDependencies": {
     "mkdirp": "^0.5.1",
     "rimraf": "^2.6.1",
-    "tap": "^10.3.2"
+    "tap": "^10.7.2"
   },
   "directories": {
     "test": "test"
@@ -64,5 +64,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100 -J"
   },
-  "version": "1.1.9"
+  "version": "1.1.10"
 }