From 57e771a032165d1e31e71d0ff7530442139c21a6 Mon Sep 17 00:00:00 2001 From: Kyle Mitchell Date: Tue, 19 Feb 2019 09:22:23 -0800 Subject: [PATCH] licensee@6.1.0 (#164) PR-URL: https://github.com/npm/cli/pull/164 Credit: @kemitchell Reviewed-By: @zkat --- .licensee.json | 1 + node_modules/.gitignore | 5 ++++ package-lock.json | 63 +++++++++++++++++++++++------------------ package.json | 2 +- 4 files changed, 43 insertions(+), 28 deletions(-) diff --git a/.licensee.json b/.licensee.json index 820425a9ce80a..ad7c812367371 100644 --- a/.licensee.json +++ b/.licensee.json @@ -1,5 +1,6 @@ { "license": "(MIT OR BSD-2-Clause OR BSD-3-Clause OR Apache-2.0 OR ISC OR Unlicense OR CC-BY-3.0 OR CC0-1.0 OR Artistic-2.0)", + "corrections": true, "whitelist": { "config-chain": "1.1.12", "cyclist": "0.2.2", diff --git a/node_modules/.gitignore b/node_modules/.gitignore index 8cff09c21384f..68d2cbc75eaad 100644 --- a/node_modules/.gitignore +++ b/node_modules/.gitignore @@ -13,6 +13,7 @@ /array-includes /babel-code-frame /bind-obj-methods +/bl /browser-process-hrtime /browser-request /builtin-modules @@ -29,6 +30,7 @@ /color-support /connect /contains-path +/correct-license-metadata /couchapp /coveralls /debug-log @@ -75,6 +77,7 @@ /flat-cache /foreground-child /fs-access +/fs-constants /fs-exists-cached /function-bind /function-loop @@ -114,6 +117,7 @@ /marked-man /nano /natural-compare +/npm-license-corrections /npm-registry-couchapp /npm-registry-mock /null-check @@ -168,6 +172,7 @@ /tap /tap-mocha-reporter /tap-parser +/tar-stream /tmatch /tmp /trivial-deferred diff --git a/package-lock.json b/package-lock.json index 508fd3d8baf0c..5b2fe18c46965 100644 --- a/package-lock.json +++ b/package-lock.json @@ -865,6 +865,15 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, + "correct-license-metadata": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/correct-license-metadata/-/correct-license-metadata-1.4.0.tgz", + "integrity": "sha512-nvbNpK/aYCbztZWGi9adIPqR+ZcQmZTWNT7eMYLvkaVGroN1nTHiVuuNPl7pK6ZNx1mvDztlRBJtfUdrVwKJ5A==", + "dev": true, + "requires": { + "spdx-expression-validate": "^2.0.0" + } + }, "couchapp": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/couchapp/-/couchapp-0.11.0.tgz", @@ -1776,9 +1785,9 @@ } }, "fs-access": { - "version": "1.0.1", - "resolved": "http://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-2.0.0.tgz", + "integrity": "sha512-Vt45hBKJrYDQeAD9ja43liw8JfK75uB7XexIXWEtDKwFLQNmzmvuulh28hRxexxuFm0zsGGq7nISGQSK6KnGrA==", "dev": true, "requires": { "null-check": "^1.0.0" @@ -2766,19 +2775,21 @@ } }, "licensee": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/licensee/-/licensee-5.0.0.tgz", - "integrity": "sha512-g243BLsJYWWyNhwDEMewc2f6Ebyy1yiJmMDgO8MCQtLOXA8JO4O2/kbJ1QwwWdlmrwDgYECdl9CJBrKsr4ZezA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/licensee/-/licensee-6.1.0.tgz", + "integrity": "sha512-z0zTmZmHHXlbHMYYUQncutJ0u19SwaidkMdm4t37jvxuJL3HnxcESfzNfXRYnazi6VwGUUYheZcHw+U9mqYr7A==", "dev": true, "requires": { + "correct-license-metadata": "^1.0.1", "docopt": "^0.6.2", - "fs-access": "^1.0.0", + "fs-access": "^2.0.0", "json-parse-errback": "^2.0.1", + "npm-license-corrections": "^1.0.0", "read-package-tree": "^5.2.1", "run-parallel": "^1.1.9", - "semver": "^5.5.0", + "semver": "^5.6.0", "simple-concat": "^1.0.0", - "spdx-expression-validate": "^1.0.1", + "spdx-expression-validate": "^2.0.0", "spdx-satisfies": "^4.0.0" } }, @@ -3261,6 +3272,12 @@ "semver": "^2.3.0 || 3.x || 4 || 5" } }, + "npm-license-corrections": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/npm-license-corrections/-/npm-license-corrections-1.3.0.tgz", + "integrity": "sha512-YnHOE4v9LCzRLC5IIsaatKjmqcGh10ksuUYTlU/v6DD5GzxHWCPZWJ+jqZquxxRDFKa7Jka61OD5hDbI1Iq7Ww==", + "dev": true + }, "npm-lifecycle": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-2.1.0.tgz", @@ -7113,20 +7130,12 @@ } }, "spdx-expression-validate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-1.0.2.tgz", - "integrity": "sha1-Wk5NdhbtHJuIFQNmtCF/dnwn6eM=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz", + "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==", "dev": true, "requires": { - "spdx-expression-parse": "^1.0.0" - }, - "dependencies": { - "spdx-expression-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true - } + "spdx-expression-parse": "^3.0.0" } }, "spdx-license-ids": { @@ -7135,15 +7144,15 @@ "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" }, "spdx-ranges": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.0.0.tgz", - "integrity": "sha512-AUUXLfqkwD7GlzZkXv8ePPCpPjeVWI9xJCfysL8re/uKb6H10umMnC7bFRsHmLJan4fslUtekAgpHlSgLc/7mA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.0.tgz", + "integrity": "sha512-OOWghvosfmECc9edy/A9j7GabERmn8bJWHc0J1knVytQtO5Rw7VfxK6CDqmivJhfMJqWhWWUfffNNMPYvyvyQA==", "dev": true }, "spdx-satisfies": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.0.tgz", - "integrity": "sha512-OcARj6U1OuVv98SVrRqgrR30sVocONtoPpnX8Xz4vXNrFVedqtbgkA+0KmQoXIQ2xjfltPPRVIMeNzKEFLWWKQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/spdx-satisfies/-/spdx-satisfies-4.0.1.tgz", + "integrity": "sha512-WVzZ/cXAzoNmjCWiEluEA3BjHp5tiUmmhn9MK+X0tBbR9sOqtC6UQwmgCNrAIZvNlMuBUYAaHYfb2oqlF9SwKA==", "dev": true, "requires": { "spdx-compare": "^1.0.0", diff --git a/package.json b/package.json index 79815b394ca69..0fb7b6a7e97bc 100644 --- a/package.json +++ b/package.json @@ -269,7 +269,7 @@ "devDependencies": { "deep-equal": "^1.0.1", "get-stream": "^4.1.0", - "licensee": "^5.0.0", + "licensee": "^6.1.0", "marked": "^0.6.0", "marked-man": "^0.2.1", "npm-registry-couchapp": "^2.7.1",