npm-packlist 1.1.2 → 1.1.6

package/index.js

@@ -20,8 +20,6 @@ const path = require('path')
 const defaultRules = [
   '.npmignore',
   '.gitignore',
-  '/node_modules/**',
-  '/node_modules/.bin/**',
   '**/.git/',
   '**/.svn/',
   '**/.hg/',
@@ -34,7 +32,7 @@ const defaultRules = [
   '.*.swp',
   '.DS_Store',
   '._*',
-  '.*.orig',
+  '*.orig',
   '/test{,s}/',
   'package-lock.json'
 ]
@@ -62,15 +60,44 @@ const npmWalker = Class => class Walker extends Class {
     // also ignore anything in node_modules, except bundled dependencies
     if (!this.parent) {
       this.bundled = opt.bundled || []
-      const bundleRules = this.bundled.map(
-        dep => '!/node_modules/' + dep + '/**')
-      const rules = defaultRules.concat(bundleRules).join('\n') + '\n'
+      this.bundledScopes = Array.from(new Set(
+        this.bundled.filter(f => /^@/.test(f))
+        .map(f => f.split('/')[0])))
+      const rules = defaultRules.join('\n') + '\n'
       this.packageJsonCache = opt.packageJsonCache || new Map()
       super.onReadIgnoreFile(rootBuiltinRules, rules, _=>_)
     } else
       this.packageJsonCache = this.parent.packageJsonCache
   }
 
+  filterEntry (entry, partial) {
+    // 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
+
+    return (
+      // if we're in a bundled package, check with the parent.
+      /^node_modules($|\/)/i.test(p) ? this.parent.filterEntry(
+          this.basename + '/' + entry, partial)
+
+      // 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.
+      : 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
+
+      // always include package.json at the root.
+      : entry === 'package.json' && !this.parent ? true
+
+      // otherwise, follow ignore-walk's logic
+      : super.filterEntry(entry, partial)
+    )
+  }
+
   filterEntries () {
     if (this.ignoreRules['package.json'])
       this.ignoreRules['.gitignore'] = this.ignoreRules['.npmignore'] = null
@@ -95,12 +122,11 @@ const npmWalker = Class => class Walker extends Class {
     const rules = [
       pkg.browser ? '!' + pkg.browser : '',
       pkg.main ? '!' + pkg.main : '',
-      '!package.json',
       '!@(readme|license|licence|notice|changes|changelog|history){,.*}'
     ].filter(f => f).join('\n') + '\n'
     super.onReadIgnoreFile(packageNecessaryRules, rules, _=>_)
 
-    if (Array.isArray(pkg.files) && pkg.files.length)
+    if (Array.isArray(pkg.files))
       super.onReadIgnoreFile('package.json', '*\n' + pkg.files.map(
         f => '!' + f + '\n!' + f.replace(/\/+$/, '') + '/**'
       ).join('\n') + '\n', then)
@@ -108,6 +134,14 @@ const npmWalker = Class => class Walker extends Class {
       then()
   }
 
+  // override parent onstat function to nix all symlinks
+  onstat (st, entry, file, dir, then) {
+    if (st.isSymbolicLink())
+      then()
+    else
+      super.onstat(st, entry, file, dir, then)
+  }
+
   onReadIgnoreFile (file, data, then) {
     if (file === 'package.json')
       try {
@@ -132,8 +166,9 @@ class Walker extends npmWalker(IgnoreWalker) {
 }
 
 class WalkerSync extends npmWalker(IgnoreWalkerSync) {
-  walker (entry) {
+  walker (entry, then) {
     new WalkerSync(this.walkerOpt(entry)).start()
+    then()
   }
 }
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "npm-packlist",
-  "version": "1.1.2",
+  "version": "1.1.6",
   "main": "index.js",
   "dependencies": {
-    "ignore-walk": "^2.0.2",
+    "ignore-walk": "^3.0.0",
     "npm-bundled": "^1.0.1"
   },
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",