From d20ac242aeb44aa3581c65c052802a02d5eb22f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Wed, 15 Aug 2018 13:15:47 -0700 Subject: [PATCH] npm-packlist@1.1.11 No real changes in npm-packlist, but npm-bundled included a circular dependency fix, as well as adding a proper LICENSE file. Credit: @isaacs --- node_modules/npm-bundled/LICENSE | 15 ++++++++++++ node_modules/npm-bundled/README.md | 2 ++ node_modules/npm-bundled/index.js | 4 +++- node_modules/npm-bundled/package.json | 14 +++++------ node_modules/npm-packlist/package.json | 32 ++++++++++++-------------- package-lock.json | 12 +++++----- package.json | 2 +- 7 files changed, 49 insertions(+), 32 deletions(-) create mode 100644 node_modules/npm-bundled/LICENSE diff --git a/node_modules/npm-bundled/LICENSE b/node_modules/npm-bundled/LICENSE new file mode 100644 index 0000000000000..20a4762540923 --- /dev/null +++ b/node_modules/npm-bundled/LICENSE @@ -0,0 +1,15 @@ +The ISC License + +Copyright (c) npm, Inc. and Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/node_modules/npm-bundled/README.md b/node_modules/npm-bundled/README.md index 2974afa0e0db8..fcfb2322faf09 100644 --- a/node_modules/npm-bundled/README.md +++ b/node_modules/npm-bundled/README.md @@ -4,6 +4,8 @@ Run this in a node package, and it'll tell you which things in node_modules are bundledDependencies, or transitive dependencies of bundled dependencies. +[![Build Status](https://travis-ci.org/npm/npm-bundled.svg?branch=master)](https://travis-ci.org/npm/npm-bundled) + ## USAGE To get the list of deps at the top level that are bundled (or diff --git a/node_modules/npm-bundled/index.js b/node_modules/npm-bundled/index.js index dadd8473498b0..c0c5f60cc0edf 100644 --- a/node_modules/npm-bundled/index.js +++ b/node_modules/npm-bundled/index.js @@ -35,6 +35,7 @@ class BundleWalker extends EE { this.packageJsonCache = opt.packageJsonCache || new Map() } + this.seen = new Set() this.didDone = false this.children = 0 this.node_modules = [] @@ -114,7 +115,8 @@ class BundleWalker extends EE { } childDep (dep) { - if (this.node_modules.indexOf(dep) !== -1) { + if (this.node_modules.indexOf(dep) !== -1 && !this.seen.has(dep)) { + this.seen.add(dep) this.child(dep) } else if (this.parent) { this.parent.childDep(dep) diff --git a/node_modules/npm-bundled/package.json b/node_modules/npm-bundled/package.json index 26e0e2b7717ba..4c46838ce476a 100644 --- a/node_modules/npm-bundled/package.json +++ b/node_modules/npm-bundled/package.json @@ -1,8 +1,8 @@ { "_from": "npm-bundled@^1.0.1", - "_id": "npm-bundled@1.0.3", + "_id": "npm-bundled@1.0.5", "_inBundle": false, - "_integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==", + "_integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==", "_location": "/npm-bundled", "_phantomChildren": {}, "_requested": { @@ -18,10 +18,10 @@ "_requiredBy": [ "/npm-packlist" ], - "_resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "_shasum": "7e71703d973af3370a9591bafe3a63aca0be2308", + "_resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "_shasum": "3c1732b7ba936b3a10325aef616467c0ccbcc979", "_spec": "npm-bundled@^1.0.1", - "_where": "/Users/rebecca/code/npm/node_modules/npm-packlist", + "_where": "/Users/zkat/Documents/code/work/npm/node_modules/npm-packlist", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -37,7 +37,7 @@ "mkdirp": "^0.5.1", "mutate-fs": "^1.1.0", "rimraf": "^2.6.1", - "tap": "^10.3.2" + "tap": "^12.0.1" }, "files": [ "index.js" @@ -56,5 +56,5 @@ "preversion": "npm test", "test": "tap test/*.js -J --100" }, - "version": "1.0.3" + "version": "1.0.5" } diff --git a/node_modules/npm-packlist/package.json b/node_modules/npm-packlist/package.json index 91345a435c69e..7cefe9dd5815e 100644 --- a/node_modules/npm-packlist/package.json +++ b/node_modules/npm-packlist/package.json @@ -1,33 +1,29 @@ { - "_args": [ - [ - "npm-packlist@1.1.10", - "/Users/rebecca/code/npm" - ] - ], - "_from": "npm-packlist@1.1.10", - "_id": "npm-packlist@1.1.10", + "_from": "npm-packlist@1.1.11", + "_id": "npm-packlist@1.1.11", "_inBundle": false, - "_integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "_integrity": "sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==", "_location": "/npm-packlist", "_phantomChildren": {}, "_requested": { "type": "version", "registry": true, - "raw": "npm-packlist@1.1.10", + "raw": "npm-packlist@1.1.11", "name": "npm-packlist", "escapedName": "npm-packlist", - "rawSpec": "1.1.10", + "rawSpec": "1.1.11", "saveSpec": null, - "fetchSpec": "1.1.10" + "fetchSpec": "1.1.11" }, "_requiredBy": [ + "#USER", "/", "/pacote" ], - "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "_spec": "1.1.10", - "_where": "/Users/rebecca/code/npm", + "_resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz", + "_shasum": "84e8c683cbe7867d34b1d357d893ce29e28a02de", + "_spec": "npm-packlist@1.1.11", + "_where": "/Users/zkat/Documents/code/work/npm", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -36,15 +32,17 @@ "bugs": { "url": "https://github.com/npm/npm-packlist/issues" }, + "bundleDependencies": false, "dependencies": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" }, + "deprecated": false, "description": "Get a list of the files to add from a folder into an npm package", "devDependencies": { "mkdirp": "^0.5.1", "rimraf": "^2.6.1", - "tap": "^10.7.2" + "tap": "^12.0.1" }, "directories": { "test": "test" @@ -66,5 +64,5 @@ "preversion": "npm test", "test": "tap test/*.js --100 -J" }, - "version": "1.1.10" + "version": "1.1.11" } diff --git a/package-lock.json b/package-lock.json index 569cc7d5ab178..1350828f36d8a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3054,9 +3054,9 @@ } }, "npm-bundled": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.3.tgz", - "integrity": "sha512-ByQ3oJ/5ETLyglU2+8dBObvhfWXX8dtPZDMePCahptliFX2iIuhyEszyFk401PZUNQH20vvdW5MLjJxkwU80Ow==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.5.tgz", + "integrity": "sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==" }, "npm-cache-filename": { "version": "1.0.2", @@ -3103,9 +3103,9 @@ } }, "npm-packlist": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.10.tgz", - "integrity": "sha512-AQC0Dyhzn4EiYEfIUjCdMl0JJ61I2ER9ukf/sLxJUcZHfo+VyEfz2rMJgLZSS1v30OxPQe1cN0LZA1xbcaVfWA==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.1.11.tgz", + "integrity": "sha512-CxKlZ24urLkJk+9kCm48RTQ7L4hsmgSVzEk0TLGPzzyuFxD7VNgy5Sl24tOLMzQv773a/NeJ1ce1DKeacqffEA==", "requires": { "ignore-walk": "^3.0.1", "npm-bundled": "^1.0.1" diff --git a/package.json b/package.json index 7ad6851d949c1..9035a7b9a8a1a 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "npm-install-checks": "~3.0.0", "npm-lifecycle": "^2.0.3", "npm-package-arg": "^6.1.0", - "npm-packlist": "~1.1.10", + "npm-packlist": "^1.1.11", "npm-pick-manifest": "^2.1.0", "npm-profile": "^3.0.2", "npm-registry-client": "^8.5.1",