npm-packlist 1.1.7 → 1.1.11

package/README.md

@@ -48,12 +48,11 @@ This uses the following rules:
     1. .npmignore and .gitignore files (their effect is in the package
        already, there's no need to include them in the package)
     2. editor junk like `.*.swp`, `._*` and `.*.orig` files
-    3. A `/test/` or `/tests/` folder at the root
-    4. `.npmrc` files (these may contain private configs)
-    5. The `node_modules/.bin` folder
-    6. Waf and gyp cruft like `/build/config.gypi` and `.lock-wscript`
-    7. Darwin's `.DS_Store` files because wtf are those even
-    8. `npm-debug.log` files at the root of a project
+    3. `.npmrc` files (these may contain private configs)
+    4. The `node_modules/.bin` folder
+    5. Waf and gyp cruft like `/build/config.gypi` and `.lock-wscript`
+    6. Darwin's `.DS_Store` files because wtf are those even
+    7. `npm-debug.log` files at the root of a project
 
     You can explicitly re-include any of these with a `files` list in
     `package.json` or a negated ignore file rule.

package/index.js

@@ -33,7 +33,6 @@ const defaultRules = [
   '.DS_Store',
   '._*',
   '*.orig',
-  '/test{,s}/',
   'package-lock.json'
 ]
 
@@ -68,6 +67,7 @@ const npmWalker = Class => class Walker extends Class {
       super.onReadIgnoreFile(rootBuiltinRules, rules, _=>_)
     } else {
       this.bundled = []
+      this.bundledScopes = []
       this.packageJsonCache = this.parent.packageJsonCache
     }
   }
@@ -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)

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "npm-packlist",
-  "version": "1.1.7",
+  "version": "1.1.11",
   "description": "Get a list of the files to add from a folder into an npm package",
   "directories": {
     "test": "test"
   },
   "main": "index.js",
   "dependencies": {
-    "ignore-walk": "^3.0.0",
+    "ignore-walk": "^3.0.1",
     "npm-bundled": "^1.0.1"
   },
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
@@ -18,7 +18,7 @@
   "devDependencies": {
     "mkdirp": "^0.5.1",
     "rimraf": "^2.6.1",
-    "tap": "^10.3.2"
+    "tap": "^12.0.1"
   },
   "scripts": {
     "test": "tap test/*.js --100 -J",