1
0
mirror of https://github.com/S2-/gitlit synced 2025-08-03 21:00:04 +02:00

update dependencies

This commit is contained in:
s2
2018-10-10 15:11:12 +02:00
parent da4083f574
commit 5c55c54b71
90877 changed files with 339776 additions and 33677 deletions

View File

@@ -224,7 +224,9 @@ var lastResorts = [
['GNU', 'GPL-3.0-or-later'],
['LGPL', 'LGPL-3.0-or-later'],
['GPLV1', 'GPL-1.0-only'],
['GPL-1', 'GPL-1.0-only'],
['GPLV2', 'GPL-2.0-only'],
['GPL-2', 'GPL-2.0-only'],
['GPL', 'GPL-3.0-or-later'],
['MIT +NO-FALSE-ATTRIBS', 'MITNFA'],
['MIT', 'MIT'],
@@ -283,10 +285,14 @@ module.exports = function (identifier) {
if (!validArugment) {
throw Error('Invalid argument. Expected non-empty string.')
}
identifier = identifier.replace(/\+$/, '').trim()
identifier = identifier.trim()
if (valid(identifier)) {
return upgradeGPLs(identifier)
}
var noPlus = identifier.replace(/\+$/, '').trim()
if (valid(noPlus)) {
return upgradeGPLs(noPlus)
}
var transformed = validTransformation(identifier)
if (transformed !== null) {
return upgradeGPLs(transformed)
@@ -318,6 +324,12 @@ function upgradeGPLs (value) {
'LGPL-2.1'
].indexOf(value) !== -1) {
return value + '-only'
} else if ([
'GPL-1.0+', 'GPL-2.0+', 'GPL-3.0+',
'LGPL-2.0+', 'LGPL-2.1+', 'LGPL-3.0+',
'AGPL-1.0+', 'AGPL-3.0+'
].indexOf(value) !== -1) {
return value.replace(/\+$/, '-or-later')
} else if (['GPL-3.0', 'LGPL-3.0', 'AGPL-3.0'].indexOf(value) !== -1) {
return value + '-or-later'
} else {

View File

@@ -1,33 +1,27 @@
{
"_args": [
[
"spdx-correct@3.0.0",
"E:\\projects\\p\\gitlit\\app"
]
],
"_development": true,
"_from": "spdx-correct@3.0.0",
"_id": "spdx-correct@3.0.0",
"_from": "spdx-correct@^3.0.0",
"_id": "spdx-correct@3.0.2",
"_inBundle": false,
"_integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==",
"_integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
"_location": "/spdx-correct",
"_phantomChildren": {},
"_requested": {
"type": "version",
"type": "range",
"registry": true,
"raw": "spdx-correct@3.0.0",
"raw": "spdx-correct@^3.0.0",
"name": "spdx-correct",
"escapedName": "spdx-correct",
"rawSpec": "3.0.0",
"rawSpec": "^3.0.0",
"saveSpec": null,
"fetchSpec": "3.0.0"
"fetchSpec": "^3.0.0"
},
"_requiredBy": [
"/validate-npm-package-license"
],
"_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz",
"_spec": "3.0.0",
"_where": "E:\\projects\\p\\gitlit\\app",
"_resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
"_shasum": "19bb409e91b47b1ad54159243f7312a858db3c2e",
"_spec": "spdx-correct@^3.0.0",
"_where": "E:\\projects\\p\\gitlit\\app\\node_modules\\validate-npm-package-license",
"author": {
"name": "Kyle E. Mitchell",
"email": "kyle@kemitchell.com",
@@ -36,6 +30,7 @@
"bugs": {
"url": "https://github.com/jslicense/spdx-correct.js/issues"
},
"bundleDependencies": false,
"contributors": [
{
"name": "Kyle E. Mitchell",
@@ -45,12 +40,17 @@
{
"name": "Christian Zommerfelds",
"email": "aero_super@yahoo.com"
},
{
"name": "Tal Einat",
"email": "taleinat@gmail.com"
}
],
"dependencies": {
"spdx-expression-parse": "^3.0.0",
"spdx-license-ids": "^3.0.0"
},
"deprecated": false,
"description": "correct invalid SPDX expressions",
"devDependencies": {
"defence-cli": "^2.0.1",
@@ -77,8 +77,8 @@
"url": "git+https://github.com/jslicense/spdx-correct.js.git"
},
"scripts": {
"lint": "standard && standard-markdown",
"lint": "standard && standard-markdown README.md",
"test": "defence README.md | replace-require-self | node && node test.js"
},
"version": "3.0.0"
"version": "3.0.2"
}