From f63a0d6cf0b7db3dcc80e72e1383c3df723c8119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kat=20March=C3=A1n?= Date: Mon, 7 Jan 2019 14:56:25 -0800 Subject: [PATCH] spdx-license-ids@3.0.3 Ref: https://github.com/npm/cli/pull/121 --- node_modules/spdx-license-ids/README.md | 4 +- node_modules/spdx-license-ids/deprecated.json | 11 +- node_modules/spdx-license-ids/index.json | 204 +++++++++--------- node_modules/spdx-license-ids/package.json | 43 ++-- package-lock.json | 6 +- 5 files changed, 140 insertions(+), 128 deletions(-) diff --git a/node_modules/spdx-license-ids/README.md b/node_modules/spdx-license-ids/README.md index 09b080cb20eab..c7b5b5f320845 100644 --- a/node_modules/spdx-license-ids/README.md +++ b/node_modules/spdx-license-ids/README.md @@ -23,7 +23,7 @@ All license IDs except for the currently deprecated ones. ```javascript const ids = require('spdx-license-ids'); -//=> ['0BSD', 'AAL', 'Abstyles', 'Adobe-2006', 'Adobe-Glyph', 'ADSL', 'AFL-1.1', ...] +//=> ['0BSD', 'AAL', 'Abstyles', 'Adobe-2006', 'Adobe-Glyph', 'ADSL', 'AFL-1.1', 'AFL-1.2', ...] ids.includes('BSD-3-Clause'); //=> true ids.includes('CC-BY-1.0'); //=> true @@ -39,7 +39,7 @@ Deprecated license IDs. ```javascript const deprecatedIds = require('spdx-license-ids/deprecated'); -//=> ['AGPL-3.0', 'eCos-2.0', 'GFDL-1.1', 'GFDL-1.2', 'GFDL-1.3', 'GPL-1.0', ...] +//=> ['AGPL-1.0', 'AGPL-3.0', 'eCos-2.0', 'GFDL-1.1', 'GFDL-1.2', 'GFDL-1.3', 'GPL-1.0', ...] deprecatedIds.includes('BSD-3-Clause'); //=> false deprecatedIds.includes('CC-BY-1.0'); //=> false diff --git a/node_modules/spdx-license-ids/deprecated.json b/node_modules/spdx-license-ids/deprecated.json index 2e40ab7618e30..1681f4870d5d9 100644 --- a/node_modules/spdx-license-ids/deprecated.json +++ b/node_modules/spdx-license-ids/deprecated.json @@ -1,23 +1,24 @@ [ + "AGPL-1.0", "AGPL-3.0", - "eCos-2.0", "GFDL-1.1", "GFDL-1.2", "GFDL-1.3", "GPL-1.0", + "GPL-2.0", + "GPL-2.0-with-GCC-exception", "GPL-2.0-with-autoconf-exception", "GPL-2.0-with-bison-exception", "GPL-2.0-with-classpath-exception", "GPL-2.0-with-font-exception", - "GPL-2.0-with-GCC-exception", - "GPL-2.0", - "GPL-3.0-with-autoconf-exception", - "GPL-3.0-with-GCC-exception", "GPL-3.0", + "GPL-3.0-with-GCC-exception", + "GPL-3.0-with-autoconf-exception", "LGPL-2.0", "LGPL-2.1", "LGPL-3.0", "Nunit", "StandardML-NJ", + "eCos-2.0", "wxWindows" ] diff --git a/node_modules/spdx-license-ids/index.json b/node_modules/spdx-license-ids/index.json index d383fccb3a194..ed06199127e0c 100644 --- a/node_modules/spdx-license-ids/index.json +++ b/node_modules/spdx-license-ids/index.json @@ -1,63 +1,61 @@ [ "0BSD", "AAL", - "Abstyles", - "Adobe-2006", - "Adobe-Glyph", "ADSL", "AFL-1.1", "AFL-1.2", "AFL-2.0", "AFL-2.1", "AFL-3.0", - "Afmparse", - "AGPL-1.0", + "AGPL-1.0-only", + "AGPL-1.0-or-later", "AGPL-3.0-only", "AGPL-3.0-or-later", - "Aladdin", "AMDPLPA", "AML", "AMPAS", "ANTLR-PD", - "Apache-1.0", - "Apache-1.1", - "Apache-2.0", "APAFML", "APL-1.0", "APSL-1.0", "APSL-1.1", "APSL-1.2", "APSL-2.0", - "Artistic-1.0-cl8", - "Artistic-1.0-Perl", + "Abstyles", + "Adobe-2006", + "Adobe-Glyph", + "Afmparse", + "Aladdin", + "Apache-1.0", + "Apache-1.1", + "Apache-2.0", "Artistic-1.0", + "Artistic-1.0-Perl", + "Artistic-1.0-cl8", "Artistic-2.0", - "Bahyph", - "Barr", - "Beerware", - "BitTorrent-1.0", - "BitTorrent-1.1", - "Borceux", "BSD-1-Clause", + "BSD-2-Clause", "BSD-2-Clause-FreeBSD", "BSD-2-Clause-NetBSD", "BSD-2-Clause-Patent", - "BSD-2-Clause", + "BSD-3-Clause", "BSD-3-Clause-Attribution", "BSD-3-Clause-Clear", "BSD-3-Clause-LBNL", - "BSD-3-Clause-No-Nuclear-License-2014", "BSD-3-Clause-No-Nuclear-License", + "BSD-3-Clause-No-Nuclear-License-2014", "BSD-3-Clause-No-Nuclear-Warranty", - "BSD-3-Clause", - "BSD-4-Clause-UC", "BSD-4-Clause", + "BSD-4-Clause-UC", "BSD-Protection", "BSD-Source-Code", "BSL-1.0", - "bzip2-1.0.5", - "bzip2-1.0.6", - "Caldera", + "Bahyph", + "Barr", + "Beerware", + "BitTorrent-1.0", + "BitTorrent-1.1", + "Borceux", "CATOSL-1.1", "CC-BY-1.0", "CC-BY-2.0", @@ -100,85 +98,77 @@ "CECILL-2.1", "CECILL-B", "CECILL-C", - "ClArtistic", "CNRI-Jython", - "CNRI-Python-GPL-Compatible", "CNRI-Python", - "Condor-1.1", + "CNRI-Python-GPL-Compatible", "CPAL-1.0", "CPL-1.0", "CPOL-1.02", + "CUA-OPL-1.0", + "Caldera", + "ClArtistic", + "Condor-1.1", "Crossword", "CrystalStacker", - "CUA-OPL-1.0", "Cube", - "curl", "D-FSL-1.0", - "diffmark", "DOC", - "Dotseqn", "DSDP", - "dvipdfm", + "Dotseqn", "ECL-1.0", "ECL-2.0", "EFL-1.0", "EFL-2.0", - "eGenix", - "Entessa", "EPL-1.0", "EPL-2.0", - "ErlPL-1.1", "EUDatagrid", "EUPL-1.0", "EUPL-1.1", "EUPL-1.2", + "Entessa", + "ErlPL-1.1", "Eurosym", - "Fair", - "Frameworx-1.0", - "FreeImage", "FSFAP", "FSFUL", "FSFULLR", "FTL", + "Fair", + "Frameworx-1.0", + "FreeImage", "GFDL-1.1-only", "GFDL-1.1-or-later", "GFDL-1.2-only", "GFDL-1.2-or-later", "GFDL-1.3-only", "GFDL-1.3-or-later", - "Giftware", "GL2PS", - "Glide", - "Glulxe", - "gnuplot", "GPL-1.0-only", "GPL-1.0-or-later", "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", "GPL-3.0-or-later", - "gSOAP-1.3b", - "HaskellReport", + "Giftware", + "Glide", + "Glulxe", "HPND", + "HaskellReport", "IBM-pibs", "ICU", "IJG", + "IPA", + "IPL-1.0", + "ISC", "ImageMagick", - "iMatix", "Imlib2", "Info-ZIP", - "Intel-ACPI", "Intel", + "Intel-ACPI", "Interbase-1.0", - "IPA", - "IPL-1.0", - "ISC", - "JasPer-2.0", "JSON", + "JasPer-2.0", "LAL-1.2", "LAL-1.3", - "Latex2e", - "Leptonica", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", @@ -186,11 +176,6 @@ "LGPL-3.0-only", "LGPL-3.0-or-later", "LGPLLR", - "Libpng", - "libtiff", - "LiLiQ-P-1.1", - "LiLiQ-R-1.1", - "LiLiQ-Rplus-1.1", "LPL-1.0", "LPL-1.02", "LPPL-1.0", @@ -198,59 +183,70 @@ "LPPL-1.2", "LPPL-1.3a", "LPPL-1.3c", - "MakeIndex", - "MirOS", - "MIT-advertising", + "Latex2e", + "Leptonica", + "LiLiQ-P-1.1", + "LiLiQ-R-1.1", + "LiLiQ-Rplus-1.1", + "Libpng", + "Linux-OpenIB", + "MIT", + "MIT-0", "MIT-CMU", + "MIT-advertising", "MIT-enna", "MIT-feh", - "MIT", "MITNFA", - "Motosoto", - "mpich2", "MPL-1.0", "MPL-1.1", - "MPL-2.0-no-copyleft-exception", "MPL-2.0", + "MPL-2.0-no-copyleft-exception", "MS-PL", "MS-RL", "MTLL", + "MakeIndex", + "MirOS", + "Motosoto", "Multics", "Mup", "NASA-1.3", - "Naumen", "NBPL-1.0", "NCSA", - "Net-SNMP", - "NetCDF", - "Newsletr", "NGPL", "NLOD-1.0", "NLPL", - "Nokia", "NOSL", - "Noweb", "NPL-1.0", "NPL-1.1", "NPOSL-3.0", "NRL", "NTP", + "Naumen", + "Net-SNMP", + "NetCDF", + "Newsletr", + "Nokia", + "Noweb", "OCCT-PL", "OCLC-2.0", + "ODC-By-1.0", "ODbL-1.0", "OFL-1.0", "OFL-1.1", + "OGL-UK-1.0", + "OGL-UK-2.0", + "OGL-UK-3.0", "OGTSL", "OLDAP-1.1", "OLDAP-1.2", "OLDAP-1.3", "OLDAP-1.4", - "OLDAP-2.0.1", "OLDAP-2.0", + "OLDAP-2.0.1", "OLDAP-2.1", + "OLDAP-2.2", "OLDAP-2.2.1", "OLDAP-2.2.2", - "OLDAP-2.2", "OLDAP-2.3", "OLDAP-2.4", "OLDAP-2.5", @@ -258,7 +254,6 @@ "OLDAP-2.7", "OLDAP-2.8", "OML", - "OpenSSL", "OPL-1.0", "OSET-PL-2.1", "OSL-1.0", @@ -266,79 +261,96 @@ "OSL-2.0", "OSL-2.1", "OSL-3.0", + "OpenSSL", "PDDL-1.0", "PHP-3.0", "PHP-3.01", "Plexus", "PostgreSQL", - "psfrag", - "psutils", "Python-2.0", - "Qhull", "QPL-1.0", - "Rdisc", + "Qhull", "RHeCos-1.1", "RPL-1.1", "RPL-1.5", "RPSL-1.0", "RSA-MD", "RSCPL", + "Rdisc", "Ruby", "SAX-PD", - "Saxpath", "SCEA", - "Sendmail", "SGI-B-1.0", "SGI-B-1.1", "SGI-B-2.0", - "SimPL-2.0", - "SISSL-1.2", "SISSL", - "Sleepycat", + "SISSL-1.2", "SMLNJ", "SMPPL", "SNIA", + "SPL-1.0", + "SWL", + "Saxpath", + "Sendmail", + "Sendmail-8.23", + "SimPL-2.0", + "Sleepycat", "Spencer-86", "Spencer-94", "Spencer-99", - "SPL-1.0", "SugarCRM-1.1.3", - "SWL", "TCL", "TCP-wrappers", "TMate", "TORQUE-1.1", "TOSL", + "TU-Berlin-1.0", + "TU-Berlin-2.0", + "UPL-1.0", "Unicode-DFS-2015", "Unicode-DFS-2016", "Unicode-TOU", "Unlicense", - "UPL-1.0", - "Vim", "VOSTROM", "VSL-1.0", + "Vim", + "W3C", "W3C-19980720", "W3C-20150513", - "W3C", + "WTFPL", "Watcom-1.0", "Wsuipa", - "WTFPL", "X11", - "Xerox", "XFree86-1.1", - "xinetd", - "Xnet", - "xpp", "XSkat", + "Xerox", + "Xnet", "YPL-1.0", "YPL-1.1", + "ZPL-1.1", + "ZPL-2.0", + "ZPL-2.1", "Zed", "Zend-2.0", "Zimbra-1.3", "Zimbra-1.4", - "zlib-acknowledgement", "Zlib", - "ZPL-1.1", - "ZPL-2.0", - "ZPL-2.1" + "bzip2-1.0.5", + "bzip2-1.0.6", + "copyleft-next-0.3.0", + "copyleft-next-0.3.1", + "curl", + "diffmark", + "dvipdfm", + "eGenix", + "gSOAP-1.3b", + "gnuplot", + "iMatix", + "libtiff", + "mpich2", + "psfrag", + "psutils", + "xinetd", + "xpp", + "zlib-acknowledgement" ] diff --git a/node_modules/spdx-license-ids/package.json b/node_modules/spdx-license-ids/package.json index a8b60d5886096..84fd02c3d6022 100644 --- a/node_modules/spdx-license-ids/package.json +++ b/node_modules/spdx-license-ids/package.json @@ -1,28 +1,30 @@ { - "_from": "spdx-license-ids@^3.0.0", - "_id": "spdx-license-ids@3.0.0", + "_from": "spdx-license-ids@3.0.3", + "_id": "spdx-license-ids@3.0.3", "_inBundle": false, - "_integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", + "_integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==", "_location": "/spdx-license-ids", "_phantomChildren": {}, "_requested": { - "type": "range", + "type": "version", "registry": true, - "raw": "spdx-license-ids@^3.0.0", + "raw": "spdx-license-ids@3.0.3", "name": "spdx-license-ids", "escapedName": "spdx-license-ids", - "rawSpec": "^3.0.0", + "rawSpec": "3.0.3", "saveSpec": null, - "fetchSpec": "^3.0.0" + "fetchSpec": "3.0.3" }, "_requiredBy": [ + "#USER", + "/", "/spdx-correct", "/spdx-expression-parse" ], - "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "_shasum": "7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87", - "_spec": "spdx-license-ids@^3.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/spdx-correct", + "_resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", + "_shasum": "81c0ce8f21474756148bbb5f3bfc0f36bf15d76e", + "_spec": "spdx-license-ids@3.0.3", + "_where": "/Users/zkat/Documents/code/work/npm", "author": { "name": "Shinnosuke Watanabe", "url": "https://github.com/shinnn" @@ -34,18 +36,15 @@ "deprecated": false, "description": "A list of SPDX license identifiers", "devDependencies": { - "@shinnn/eslint-config-node": "^5.0.0", - "chalk": "^2.3.0", - "eslint": "^4.16.0", + "@shinnn/eslint-config": "^6.8.7", + "chalk": "^2.4.1", + "eslint": "^5.10.0", "get-spdx-license-ids": "^2.1.0", - "log-symbols": "^2.2.0", - "loud-rejection": "^1.6.0", - "rmfr": "^2.0.0-3", - "tape": "^4.8.0", - "write-file-atomically": "^1.0.0" + "rmfr": "^2.0.0", + "tape": "^4.9.1" }, "eslintConfig": { - "extends": "@shinnn/node" + "extends": "@shinnn" }, "files": [ "deprecated.json", @@ -71,8 +70,8 @@ }, "scripts": { "build": "node build.js", - "pretest": "eslint --fix --format=codeframe .", + "pretest": "eslint .", "test": "node test.js" }, - "version": "3.0.0" + "version": "3.0.3" } diff --git a/package-lock.json b/package-lock.json index 58fe37370bda7..2309b176f9ee2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6871,9 +6871,9 @@ } }, "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==" + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz", + "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==" }, "spdx-ranges": { "version": "2.0.0",