From 8213def9aa9b6e702887e4f2ed7654943e1e4154 Mon Sep 17 00:00:00 2001
From: Audrey Eschright <audrey@npmjs.com>
Date: Tue, 8 Jan 2019 11:53:15 -0800
Subject: [PATCH] npm-packlist@1.2.0

---
 node_modules/npm-packlist/index.js     |  6 +++++-
 node_modules/npm-packlist/package.json | 22 +++++++++++-----------
 package-lock.json                      |  6 +++---
 package.json                           |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/node_modules/npm-packlist/index.js b/node_modules/npm-packlist/index.js
index 2cdd37ec3df06..110a344cb04d9 100644
--- a/node_modules/npm-packlist/index.js
+++ b/node_modules/npm-packlist/index.js
@@ -57,7 +57,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.
diff --git a/node_modules/npm-packlist/package.json b/node_modules/npm-packlist/package.json
index f1188c393f2c9..d37a7bd1bb4f6 100644
--- a/node_modules/npm-packlist/package.json
+++ b/node_modules/npm-packlist/package.json
@@ -1,29 +1,29 @@
 {
-  "_from": "npm-packlist@1.1.12",
-  "_id": "npm-packlist@1.1.12",
+  "_from": "npm-packlist@1.2.0",
+  "_id": "npm-packlist@1.2.0",
   "_inBundle": false,
-  "_integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
+  "_integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
   "_location": "/npm-packlist",
   "_phantomChildren": {},
   "_requested": {
     "type": "version",
     "registry": true,
-    "raw": "npm-packlist@1.1.12",
+    "raw": "npm-packlist@1.2.0",
     "name": "npm-packlist",
     "escapedName": "npm-packlist",
-    "rawSpec": "1.1.12",
+    "rawSpec": "1.2.0",
     "saveSpec": null,
-    "fetchSpec": "1.1.12"
+    "fetchSpec": "1.2.0"
   },
   "_requiredBy": [
     "#USER",
     "/",
     "/pacote"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
-  "_shasum": "22bde2ebc12e72ca482abd67afc51eb49377243a",
-  "_spec": "npm-packlist@1.1.12",
-  "_where": "/Users/zkat/Documents/code/work/npm",
+  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+  "_shasum": "55a60e793e272f00862c7089274439a4cc31fc7f",
+  "_spec": "npm-packlist@1.2.0",
+  "_where": "/Users/aeschright/code/cli",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -64,5 +64,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100 -J"
   },
-  "version": "1.1.12"
+  "version": "1.2.0"
 }
diff --git a/package-lock.json b/package-lock.json
index c332bf5572875..74c15603f8216 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3131,9 +3131,9 @@
       }
     },
     "npm-packlist": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.12.tgz",
-      "integrity": "sha512-WJKFOVMeAlsU/pjXuqVdzU0WfgtIBCupkEVwn+1Y0ERAbUfWw8R4GjgVbaKnUjRoD2FoQbHOCbOyT5Mbs9Lw4g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.2.0.tgz",
+      "integrity": "sha512-7Mni4Z8Xkx0/oegoqlcao/JpPCPEMtUvsmB0q7mgvlMinykJLSRTYuFqoQLYgGY8biuxIeiHO+QNJKbCfljewQ==",
       "requires": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1"
diff --git a/package.json b/package.json
index 585e5a262e01a..386ba3d8b63e0 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "npm-install-checks": "~3.0.0",
     "npm-lifecycle": "^2.1.0",
     "npm-package-arg": "^6.1.0",
-    "npm-packlist": "^1.1.12",
+    "npm-packlist": "^1.2.0",
     "npm-pick-manifest": "^2.1.0",
     "npm-registry-fetch": "^3.8.0",
     "npm-user-validate": "~1.0.0",