mirror of
https://github.com/apache/cordova-android.git
synced 2026-05-11 00:00:05 +08:00
CB-13912 Updated checked-in node_modules
This commit is contained in:
+22
@@ -20,6 +20,8 @@ semver.clean(' =v1.2.3 ') // '1.2.3'
|
||||
semver.satisfies('1.2.3', '1.x || >=2.5.0 || 5.0.0 - 7.2.3') // true
|
||||
semver.gt('1.2.3', '9.8.7') // false
|
||||
semver.lt('1.2.3', '9.8.7') // true
|
||||
semver.valid(semver.coerce('v2')) // '2.0.0'
|
||||
semver.valid(semver.coerce('42.6.7.9.3-alpha')) // '42.6.7'
|
||||
```
|
||||
|
||||
As a command-line utility:
|
||||
@@ -52,6 +54,10 @@ Options:
|
||||
-l --loose
|
||||
Interpret versions and ranges loosely
|
||||
|
||||
-c --coerce
|
||||
Coerce a string into SemVer if possible
|
||||
(does not imply --loose)
|
||||
|
||||
Program exits successfully if any valid version satisfies
|
||||
all supplied ranges, and prints all satisfying versions.
|
||||
|
||||
@@ -364,3 +370,19 @@ satisfy the range.
|
||||
|
||||
If you want to know if a version satisfies or does not satisfy a
|
||||
range, use the `satisfies(version, range)` function.
|
||||
|
||||
### Coercion
|
||||
|
||||
* `coerce(version)`: Coerces a string to semver if possible
|
||||
|
||||
This aims to provide a very forgiving translation of a non-semver
|
||||
string to semver. It looks for the first digit in a string, and
|
||||
consumes all remaining characters which satisfy at least a partial semver
|
||||
(e.g., `1`, `1.2`, `1.2.3`) up to the max permitted length (256 characters).
|
||||
Longer versions are simply truncated (`4.6.3.9.2-alpha2` becomes `4.6.3`).
|
||||
All surrounding text is simply ignored (`v3.4 replaces v3.3.1` becomes `3.4.0`).
|
||||
Only text which lacks digits will fail coercion (`version one` is not valid).
|
||||
The maximum length for any semver component considered for coercion is 16 characters;
|
||||
longer components will be ignored (`10000000000000000.4.7.4` becomes `4.7.4`).
|
||||
The maximum value for any semver component is `Integer.MAX_SAFE_INTEGER || (2**53 - 1)`;
|
||||
higher value components are invalid (`9999999999999999.4.7.4` is likely invalid).
|
||||
|
||||
+12
-2
@@ -12,6 +12,7 @@ var argv = process.argv.slice(2)
|
||||
, inc = null
|
||||
, version = require("../package.json").version
|
||||
, loose = false
|
||||
, coerce = false
|
||||
, identifier = undefined
|
||||
, semver = require("../semver")
|
||||
, reverse = false
|
||||
@@ -54,6 +55,9 @@ function main () {
|
||||
case "-r": case "--range":
|
||||
range.push(argv.shift())
|
||||
break
|
||||
case "-c": case "--coerce":
|
||||
coerce = true
|
||||
break
|
||||
case "-h": case "--help": case "-?":
|
||||
return help()
|
||||
default:
|
||||
@@ -62,8 +66,10 @@ function main () {
|
||||
}
|
||||
}
|
||||
|
||||
versions = versions.filter(function (v) {
|
||||
return semver.valid(v, loose)
|
||||
versions = versions.map(function (v) {
|
||||
return coerce ? (semver.coerce(v) || {version: v}).version : v
|
||||
}).filter(function (v) {
|
||||
return semver.valid(v)
|
||||
})
|
||||
if (!versions.length) return fail()
|
||||
if (inc && (versions.length !== 1 || range.length))
|
||||
@@ -122,6 +128,10 @@ function help () {
|
||||
,"-l --loose"
|
||||
," Interpret versions and ranges loosely"
|
||||
,""
|
||||
,"-c --coerce"
|
||||
," Coerce a string into SemVer if possible"
|
||||
," (does not imply --loose)"
|
||||
,""
|
||||
,"Program exits successfully if any valid version satisfies"
|
||||
,"all supplied ranges, and prints all satisfying versions."
|
||||
,""
|
||||
|
||||
+22
-21
@@ -2,49 +2,50 @@
|
||||
"_args": [
|
||||
[
|
||||
{
|
||||
"raw": "semver@^5.0.1",
|
||||
"raw": "semver@^5.4.1",
|
||||
"scope": null,
|
||||
"escapedName": "semver",
|
||||
"name": "semver",
|
||||
"rawSpec": "^5.0.1",
|
||||
"spec": ">=5.0.1 <6.0.0",
|
||||
"rawSpec": "^5.4.1",
|
||||
"spec": ">=5.4.1 <6.0.0",
|
||||
"type": "range"
|
||||
},
|
||||
"/Users/jbowser/cordova/cordova-android/node_modules/cordova-common"
|
||||
"/Users/steveng/repo/cordova/cordova-android/node_modules/android-versions"
|
||||
]
|
||||
],
|
||||
"_from": "semver@>=5.0.1 <6.0.0",
|
||||
"_id": "semver@5.4.1",
|
||||
"_from": "semver@>=5.4.1 <6.0.0",
|
||||
"_id": "semver@5.5.0",
|
||||
"_inCache": true,
|
||||
"_location": "/semver",
|
||||
"_nodeVersion": "8.2.1",
|
||||
"_nodeVersion": "8.9.1",
|
||||
"_npmOperationalInternal": {
|
||||
"host": "s3://npm-registry-packages",
|
||||
"tmp": "tmp/semver-5.4.1.tgz_1500922107643_0.5125251261051744"
|
||||
"tmp": "tmp/semver-5.5.0.tgz_1516130879707_0.30317740654572845"
|
||||
},
|
||||
"_npmUser": {
|
||||
"name": "isaacs",
|
||||
"email": "i@izs.me"
|
||||
},
|
||||
"_npmVersion": "5.3.0",
|
||||
"_npmVersion": "5.6.0",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"raw": "semver@^5.0.1",
|
||||
"raw": "semver@^5.4.1",
|
||||
"scope": null,
|
||||
"escapedName": "semver",
|
||||
"name": "semver",
|
||||
"rawSpec": "^5.0.1",
|
||||
"spec": ">=5.0.1 <6.0.0",
|
||||
"rawSpec": "^5.4.1",
|
||||
"spec": ">=5.4.1 <6.0.0",
|
||||
"type": "range"
|
||||
},
|
||||
"_requiredBy": [
|
||||
"/android-versions",
|
||||
"/cordova-common"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
|
||||
"_shasum": "e059c09d8571f0540823733433505d3a2f00b18e",
|
||||
"_resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
|
||||
"_shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
|
||||
"_shrinkwrap": null,
|
||||
"_spec": "semver@^5.0.1",
|
||||
"_where": "/Users/jbowser/cordova/cordova-android/node_modules/cordova-common",
|
||||
"_spec": "semver@^5.4.1",
|
||||
"_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/android-versions",
|
||||
"bin": {
|
||||
"semver": "./bin/semver"
|
||||
},
|
||||
@@ -58,16 +59,16 @@
|
||||
},
|
||||
"directories": {},
|
||||
"dist": {
|
||||
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
|
||||
"shasum": "e059c09d8571f0540823733433505d3a2f00b18e",
|
||||
"tarball": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz"
|
||||
"integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
|
||||
"shasum": "dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab",
|
||||
"tarball": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz"
|
||||
},
|
||||
"files": [
|
||||
"bin",
|
||||
"range.bnf",
|
||||
"semver.js"
|
||||
],
|
||||
"gitHead": "0877c942a6af00edcda5c16fdd934684e1b20a1c",
|
||||
"gitHead": "44cbc8482ac4f0f8d2de0abb7f8808056d2d55f9",
|
||||
"homepage": "https://github.com/npm/node-semver#readme",
|
||||
"license": "ISC",
|
||||
"main": "semver.js",
|
||||
@@ -91,5 +92,5 @@
|
||||
"scripts": {
|
||||
"test": "tap test/*.js --cov -J"
|
||||
},
|
||||
"version": "5.4.1"
|
||||
"version": "5.5.0"
|
||||
}
|
||||
|
||||
+2
-2
@@ -3,10 +3,10 @@ logical-or ::= ( ' ' ) * '||' ( ' ' ) *
|
||||
range ::= hyphen | simple ( ' ' simple ) * | ''
|
||||
hyphen ::= partial ' - ' partial
|
||||
simple ::= primitive | partial | tilde | caret
|
||||
primitive ::= ( '<' | '>' | '>=' | '<=' | '=' | ) partial
|
||||
primitive ::= ( '<' | '>' | '>=' | '<=' | '=' ) partial
|
||||
partial ::= xr ( '.' xr ( '.' xr qualifier ? )? )?
|
||||
xr ::= 'x' | 'X' | '*' | nr
|
||||
nr ::= '0' | ['1'-'9'] ( ['0'-'9'] ) *
|
||||
nr ::= '0' | [1-9] ( [0-9] ) *
|
||||
tilde ::= '~' partial
|
||||
caret ::= '^' partial
|
||||
qualifier ::= ( '-' pre )? ( '+' build )?
|
||||
|
||||
+28
@@ -21,6 +21,9 @@ exports.SEMVER_SPEC_VERSION = '2.0.0';
|
||||
var MAX_LENGTH = 256;
|
||||
var MAX_SAFE_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
|
||||
|
||||
// Max safe segment length for coercion.
|
||||
var MAX_SAFE_COMPONENT_LENGTH = 16;
|
||||
|
||||
// The actual regexps go on exports.re
|
||||
var re = exports.re = [];
|
||||
var src = exports.src = [];
|
||||
@@ -156,6 +159,15 @@ src[XRANGE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAIN] + '$';
|
||||
var XRANGELOOSE = R++;
|
||||
src[XRANGELOOSE] = '^' + src[GTLT] + '\\s*' + src[XRANGEPLAINLOOSE] + '$';
|
||||
|
||||
// Coercion.
|
||||
// Extract anything that could conceivably be a part of a valid semver
|
||||
var COERCE = R++;
|
||||
src[COERCE] = '(?:^|[^\\d])' +
|
||||
'(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '})' +
|
||||
'(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
|
||||
'(?:\\.(\\d{1,' + MAX_SAFE_COMPONENT_LENGTH + '}))?' +
|
||||
'(?:$|[^\\d])';
|
||||
|
||||
// Tilde ranges.
|
||||
// Meaning is "reasonably at or greater than"
|
||||
var LONETILDE = R++;
|
||||
@@ -1294,3 +1306,19 @@ function intersects(r1, r2, loose) {
|
||||
r2 = new Range(r2, loose)
|
||||
return r1.intersects(r2)
|
||||
}
|
||||
|
||||
exports.coerce = coerce;
|
||||
function coerce(version) {
|
||||
if (version instanceof SemVer)
|
||||
return version;
|
||||
|
||||
if (typeof version !== 'string')
|
||||
return null;
|
||||
|
||||
var match = version.match(re[COERCE]);
|
||||
|
||||
if (match == null)
|
||||
return null;
|
||||
|
||||
return parse((match[1] || '0') + '.' + (match[2] || '0') + '.' + (match[3] || '0'));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user