From 9b8b6513fbce92764b32a067322984985ff683fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kat=20March=C3=A1n?= <kzm@zkat.tech>
Date: Wed, 20 Feb 2019 11:19:51 -0800
Subject: [PATCH] npm-packlist@1.4.1

Fixes: https://npm.community/t/npm-pack-leaving-out-files-6-8-0-only/5382
Credit: @zkat
---
 node_modules/npm-packlist/index.js     | 11 ++++++++---
 node_modules/npm-packlist/package.json | 24 ++++++++++++------------
 package-lock.json                      |  6 +++---
 package.json                           |  2 +-
 4 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/node_modules/npm-packlist/index.js b/node_modules/npm-packlist/index.js
index 5cbe011fb66e8..777b58590d11e 100644
--- a/node_modules/npm-packlist/index.js
+++ b/node_modules/npm-packlist/index.js
@@ -34,13 +34,16 @@ const defaultRules = [
   'npm-debug.log',
   '**/.npmrc',
   '.*.swp',
-  '.DS_Store',
+  '**/.DS_Store/**',
   '._*',
+  '**/._*/**',
   '*.orig',
-  'package-lock.json',
-  'yarn.lock',
+  '/package-lock.json',
+  '/yarn.lock',
   'archived-packages/**',
   'core',
+  '!core/',
+  '!**/core/',
   '*.core',
   '*.vgcore',
   'vgcore.*',
@@ -143,9 +146,11 @@ const npmWalker = Class => class Walker extends Class {
     this.packageJsonCache.set(ig, pkg)
 
     // 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 : '',
+      '!package.json',
       '!@(readme|copying|license|licence|notice|changes|changelog|history){,.*[^~$]}'
     ]
     if (pkg.bin)
diff --git a/node_modules/npm-packlist/package.json b/node_modules/npm-packlist/package.json
index 20b37c55b5e8c..c5be026edaff9 100644
--- a/node_modules/npm-packlist/package.json
+++ b/node_modules/npm-packlist/package.json
@@ -1,29 +1,29 @@
 {
-  "_from": "npm-packlist@1.3.0",
-  "_id": "npm-packlist@1.3.0",
+  "_from": "npm-packlist@latest",
+  "_id": "npm-packlist@1.4.1",
   "_inBundle": false,
-  "_integrity": "sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==",
+  "_integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
   "_location": "/npm-packlist",
   "_phantomChildren": {},
   "_requested": {
-    "type": "version",
+    "type": "tag",
     "registry": true,
-    "raw": "npm-packlist@1.3.0",
+    "raw": "npm-packlist@latest",
     "name": "npm-packlist",
     "escapedName": "npm-packlist",
-    "rawSpec": "1.3.0",
+    "rawSpec": "latest",
     "saveSpec": null,
-    "fetchSpec": "1.3.0"
+    "fetchSpec": "latest"
   },
   "_requiredBy": [
     "#USER",
     "/",
     "/pacote"
   ],
-  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz",
-  "_shasum": "7f01e8e44408341379ca98cfd756e7b29bd2626c",
-  "_spec": "npm-packlist@1.3.0",
-  "_where": "/Users/aeschright/code/npm-release",
+  "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+  "_shasum": "19064cdf988da80ea3cee45533879d90192bbfbc",
+  "_spec": "npm-packlist@latest",
+  "_where": "/Users/zkat/Documents/code/work/npm",
   "author": {
     "name": "Isaac Z. Schlueter",
     "email": "i@izs.me",
@@ -64,5 +64,5 @@
     "preversion": "npm test",
     "test": "tap test/*.js --100 -J"
   },
-  "version": "1.3.0"
+  "version": "1.4.1"
 }
diff --git a/package-lock.json b/package-lock.json
index 5b2fe18c46965..2a78636d1c38f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3310,9 +3310,9 @@
       }
     },
     "npm-packlist": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.3.0.tgz",
-      "integrity": "sha512-qPBc6CnxEzpOcc4bjoIBJbYdy0D/LFFPUdxvfwor4/w3vxeE0h6TiOVurCEPpQ6trjN77u/ShyfeJGsbAfB3dA==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz",
+      "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==",
       "requires": {
         "ignore-walk": "^3.0.1",
         "npm-bundled": "^1.0.1"
diff --git a/package.json b/package.json
index 0fb7b6a7e97bc..a35a456c30162 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.3.0",
+    "npm-packlist": "^1.4.1",
     "npm-pick-manifest": "^2.2.3",
     "npm-registry-fetch": "^3.9.0",
     "npm-user-validate": "~1.0.0",