diff options
author | isaacs <i@izs.me> | 2020-07-23 20:58:04 +0300 |
---|---|---|
committer | isaacs <i@izs.me> | 2020-07-29 21:53:42 +0300 |
commit | ad5e07d8bd86d1dbe2b03dc142f8c8d6f4828ffe (patch) | |
tree | 97b66f97d77f35774f10a5e3e9957b1897d150bb /node_modules/spdx-expression-parse | |
parent | a16994cfdd2f255016f3d8ee60d03473d80eabd8 (diff) |
Full dependency reboot
Reinstall everything from a clean node_modules and package-lock.json
state.
Re-generate list of bundleDependencies and node_modules/.gitignore with
a script that does the right thing based on actual dependency state.
Diffstat (limited to 'node_modules/spdx-expression-parse')
-rw-r--r-- | node_modules/spdx-expression-parse/README.md | 2 | ||||
-rw-r--r-- | node_modules/spdx-expression-parse/package.json | 28 | ||||
-rw-r--r-- | node_modules/spdx-expression-parse/parse.js | 4 | ||||
-rw-r--r-- | node_modules/spdx-expression-parse/scan.js | 4 |
4 files changed, 20 insertions, 18 deletions
diff --git a/node_modules/spdx-expression-parse/README.md b/node_modules/spdx-expression-parse/README.md index 514895b7d..9406462e3 100644 --- a/node_modules/spdx-expression-parse/README.md +++ b/node_modules/spdx-expression-parse/README.md @@ -39,7 +39,7 @@ The syntax comes from the [Software Package Data eXchange (SPDX)](https://spdx.o The bulk of the SPDX standard describes syntax and semantics of XML metadata files. This package implements two lightweight, plain-text components of that larger standard: -1. The [license list](https://spdx.org/licenses), a mapping from specific string identifiers, like `Apache-2.0`, to standard form license texts and bolt-on license exceptions. The [spdx-license-ids](https://www.npmjs.com/package/spdx-exceptions) and [spdx-exceptions](https://www.npmjs.com/package/spdx-license-ids) packages implement the license list. `spdx-expression-parse` depends on and `require()`s them. +1. The [license list](https://spdx.org/licenses), a mapping from specific string identifiers, like `Apache-2.0`, to standard form license texts and bolt-on license exceptions. The [spdx-license-ids](https://www.npmjs.com/package/spdx-license-ids) and [spdx-exceptions](https://www.npmjs.com/package/spdx-exceptions) packages implement the license list. `spdx-expression-parse` depends on and `require()`s them. Any license identifier from the license list is a valid license expression: diff --git a/node_modules/spdx-expression-parse/package.json b/node_modules/spdx-expression-parse/package.json index 8f7fa1d26..9d7ced755 100644 --- a/node_modules/spdx-expression-parse/package.json +++ b/node_modules/spdx-expression-parse/package.json @@ -1,8 +1,8 @@ { "_from": "spdx-expression-parse@^3.0.0", - "_id": "spdx-expression-parse@3.0.0", + "_id": "spdx-expression-parse@3.0.1", "_inBundle": false, - "_integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "_integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "_location": "/spdx-expression-parse", "_phantomChildren": {}, "_requested": { @@ -16,17 +16,20 @@ "fetchSpec": "^3.0.0" }, "_requiredBy": [ + "/licensee", + "/spdx-compare", "/spdx-correct", + "/spdx-expression-validate", "/validate-npm-package-license" ], - "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "_shasum": "99e119b7a5da00e05491c9fa338b7904823b41d0", + "_resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "_shasum": "cf70f50482eefdc98e3ce0a6833e4a53ceeba679", "_spec": "spdx-expression-parse@^3.0.0", - "_where": "/Users/rebecca/code/npm/node_modules/validate-npm-package-license", + "_where": "/Users/isaacs/dev/npm/cli/node_modules/validate-npm-package-license", "author": { "name": "Kyle E. Mitchell", "email": "kyle@kemitchell.com", - "url": "http://kemitchell.com" + "url": "https://kemitchell.com" }, "bugs": { "url": "https://github.com/jslicense/spdx-expression-parse.js/issues" @@ -59,10 +62,9 @@ "deprecated": false, "description": "parse SPDX license expressions", "devDependencies": { - "defence-cli": "^2.0.1", - "mocha": "^3.4.2", + "defence-cli": "^3.0.1", "replace-require-self": "^1.0.0", - "standard": "^10.0.2" + "standard": "^14.1.0" }, "files": [ "AUTHORS", @@ -89,9 +91,9 @@ }, "scripts": { "lint": "standard", - "test": "npm run test:mocha && npm run test:readme", - "test:mocha": "mocha test/index.js", - "test:readme": "defence -i javascript README.md | replace-require-self | node" + "test": "npm run test:suite && npm run test:readme", + "test:readme": "defence -i javascript README.md | replace-require-self | node", + "test:suite": "node test.js" }, - "version": "3.0.0" + "version": "3.0.1" } diff --git a/node_modules/spdx-expression-parse/parse.js b/node_modules/spdx-expression-parse/parse.js index a4a52ce93..5a00b45c5 100644 --- a/node_modules/spdx-expression-parse/parse.js +++ b/node_modules/spdx-expression-parse/parse.js @@ -60,7 +60,7 @@ module.exports = function (tokens) { if (t.type === 'LICENSEREF') { next() string += 'LicenseRef-' + t.string - return {license: string} + return { license: string } } index = begin } @@ -69,7 +69,7 @@ module.exports = function (tokens) { var t = token() if (t && t.type === 'LICENSE') { next() - var node = {license: t.string} + var node = { license: t.string } if (parseOperator('+')) { node.plus = true } diff --git a/node_modules/spdx-expression-parse/scan.js b/node_modules/spdx-expression-parse/scan.js index d0567f494..b74fce2e2 100644 --- a/node_modules/spdx-expression-parse/scan.js +++ b/node_modules/spdx-expression-parse/scan.js @@ -70,14 +70,14 @@ module.exports = function (source) { function documentRef () { if (read('DocumentRef-')) { var string = expectIdstring() - return {type: 'DOCUMENTREF', string: string} + return { type: 'DOCUMENTREF', string: string } } } function licenseRef () { if (read('LicenseRef-')) { var string = expectIdstring() - return {type: 'LICENSEREF', string: string} + return { type: 'LICENSEREF', string: string } } } |