npm-packlist 1.1.12 → 1.4.1

package/index.js

@@ -34,11 +34,20 @@ const defaultRules = [
   'npm-debug.log',
   '**/.npmrc',
   '.*.swp',
-  '.DS_Store',
+  '**/.DS_Store/**',
   '._*',
+  '**/._*/**',
   '*.orig',
-  'package-lock.json',
+  '/package-lock.json',
+  '/yarn.lock',
   'archived-packages/**',
+  'core',
+  '!core/',
+  '!**/core/',
+  '*.core',
+  '*.vgcore',
+  'vgcore.*',
+  'core.+([0-9])',
 ]
 
 // a decorator that applies our custom rules to an ignore walker
@@ -57,7 +66,11 @@ const npmWalker = Class => class Walker extends Class {
 
     opt.includeEmpty = false
     opt.path = opt.path || process.cwd()
-    opt.follow = path.basename(opt.path) === 'node_modules'
+    const dirName = path.basename(opt.path)
+    const parentName = path.basename(path.dirname(opt.path))
+    opt.follow =
+      dirName === 'node_modules' ||
+      (parentName === 'node_modules' && /^@/.test(dirName))
     super(opt)
 
     // ignore a bunch of things by default at the root level.
@@ -132,13 +145,23 @@ const npmWalker = Class => class Walker extends Class {
   onPackageJson (ig, pkg, then) {
     this.packageJsonCache.set(ig, pkg)
 
-    // if there's a browser or main, make sure we don't ignore it
+    // if there's a bin, browser or main, make sure we don't ignore it
+    // also, don't ignore the package.json itself!
     const rules = [
       pkg.browser ? '!' + pkg.browser : '',
       pkg.main ? '!' + pkg.main : '',
-      '!@(readme|copying|license|licence|notice|changes|changelog|history){,.*}'
-    ].filter(f => f).join('\n') + '\n'
-    super.onReadIgnoreFile(packageNecessaryRules, rules, _=>_)
+      '!package.json',
+      '!@(readme|copying|license|licence|notice|changes|changelog|history){,.*[^~$]}'
+    ]
+    if (pkg.bin)
+      if (typeof pkg.bin === "object")
+        for (const key in pkg.bin)
+          rules.push('!' + pkg.bin[key])
+      else
+        rules.push('!' + pkg.bin)
+
+    const data = rules.filter(f => f).join('\n') + '\n'
+    super.onReadIgnoreFile(packageNecessaryRules, data, _=>_)
 
     if (Array.isArray(pkg.files))
       super.onReadIgnoreFile('package.json', '*\n' + pkg.files.map(
@@ -159,7 +182,8 @@ const npmWalker = Class => class Walker extends Class {
   onReadIgnoreFile (file, data, then) {
     if (file === 'package.json')
       try {
-        this.onPackageJson(file, JSON.parse(data), then)
+        const ig = path.resolve(this.path, file)
+        this.onPackageJson(ig, JSON.parse(data), then)
       } catch (er) {
         // ignore package.json files that are not json
         then()
@@ -189,12 +213,13 @@ class WalkerSync extends npmWalker(IgnoreWalkerSync) {
 const walk = (options, callback) => {
   options = options || {}
   const p = new Promise((resolve, reject) => {
-    const bw = new BundleWalker(options).start()
+    const bw = new BundleWalker(options)
     bw.on('done', bundled => {
       options.bundled = bundled
       options.packageJsonCache = bw.packageJsonCache
       new Walker(options).on('done', resolve).on('error', reject).start()
     })
+    bw.start()
   })
   return callback ? p.then(res => callback(null, res), callback) : p
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-packlist",
-  "version": "1.1.12",
+  "version": "1.4.1",
   "description": "Get a list of the files to add from a folder into an npm package",
   "directories": {
     "test": "test"