npm-packlist 2.0.2 → 2.1.2

package/index.js

@@ -83,13 +83,23 @@ const npmWalker = Class => class Walker extends Class {
     opt.path = opt.path || process.cwd()
     const dirName = path.basename(opt.path)
     const parentName = path.basename(path.dirname(opt.path))
-    opt.follow =
-      dirName === 'node_modules' ||
-      (parentName === 'node_modules' && /^@/.test(dirName))
+
+    // only follow links in the root node_modules folder, because if those
+    // folders are included, it's because they're bundled, and bundles
+    // should include the contents, not the symlinks themselves.
+    // This regexp tests to see that we're either a node_modules folder,
+    // or a @scope within a node_modules folder, in the root's node_modules
+    // hierarchy (ie, not in test/foo/node_modules/ or something).
+    const followRe = /^(?:\/node_modules\/(?:@[^\/]+\/[^\/]+|[^\/]+)\/)*\/node_modules(?:\/@[^\/]+)?$/
+    const rootPath = opt.parent ? opt.parent.root : opt.path
+    const followTestPath = opt.path.replace(/\\/g, '/').substr(rootPath.length)
+    opt.follow = followRe.test(followTestPath)
+
     super(opt)
 
     // ignore a bunch of things by default at the root level.
-    // also ignore anything in node_modules, except bundled dependencies
+    // also ignore anything in the main project node_modules hierarchy,
+    // except bundled dependencies
     if (!this.parent) {
       this.bundled = opt.bundled || []
       this.bundledScopes = Array.from(new Set(
@@ -123,6 +133,23 @@ const npmWalker = Class => class Walker extends Class {
       return super.onReaddir(entries)
     }
 
+    // when the cache has been seeded with the root manifest,
+    // we must respect that (it may differ from the filesystem)
+    const ig = path.resolve(this.path, 'package.json')
+
+    if (this.packageJsonCache.has(ig)) {
+      const pkg = this.packageJsonCache.get(ig)
+
+      // fall back to filesystem when seeded manifest is invalid
+      if (!pkg || typeof pkg !== 'object') {
+        return this.readPackageJson(entries)
+      }
+
+      // feels wonky, but this ensures package bin is _always_
+      // normalized, as well as guarding against invalid JSON
+      return this.getPackageFiles(entries, JSON.stringify(pkg))
+    }
+
     this.readPackageJson(entries)
   }
 
@@ -164,12 +191,20 @@ const npmWalker = Class => class Walker extends Class {
     const ig = path.resolve(this.path, 'package.json')
     this.packageJsonCache.set(ig, pkg)
 
-    // no files list
+    // no files list, just return the normal readdir() result
     if (!Array.isArray(pkg.files))
       return super.onReaddir(entries)
 
     pkg.files.push(...this.mustHaveFilesFromPackage(pkg))
 
+    // If the package has a files list, then it's unlikely to include
+    // node_modules, because why would you do that?  but since we use
+    // the files list as the effective readdir result, that means it
+    // looks like we don't have a node_modules folder at all unless we
+    // include it here.
+    if (pkg.bundleDependencies && entries.includes('node_modules'))
+      pkg.files.push('node_modules')
+
     const patterns = Array.from(new Set(pkg.files)).reduce((set, pattern) => {
       const excl = pattern.match(/^!+/)
       if (excl)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-packlist",
-  "version": "2.0.2",
+  "version": "2.1.2",
   "description": "Get a list of the files to add from a folder into an npm package",
   "directories": {
     "test": "test"
@@ -9,7 +9,7 @@
   "dependencies": {
     "glob": "^7.1.6",
     "ignore-walk": "^3.0.3",
-    "npm-bundled": "^1.0.1",
+    "npm-bundled": "^1.1.1",
     "npm-normalize-package-bin": "^1.0.1"
   },
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me/)",
@@ -18,11 +18,9 @@
     "index.js"
   ],
   "devDependencies": {
-    "mkdirp": "^0.5.1",
     "mutate-fs": "^2.1.1",
     "require-inject": "^1.4.4",
-    "rimraf": "^2.7.1",
-    "tap": "^14.7.0"
+    "tap": "^14.10.7"
   },
   "scripts": {
     "test": "tap",
@@ -42,5 +40,8 @@
       "--include=bin/index.js"
     ]
   },
-  "bin": "bin/index.js"
+  "bin": "bin/index.js",
+  "engines": {
+    "node": ">=10"
+  }
 }