mirror of
https://github.com/apache/cordova-android.git
synced 2026-05-30 00:00:04 +08:00
updated cordoova-common to 1.4.0
This commit is contained in:
+2
-9
@@ -2,7 +2,7 @@
|
||||
|
||||
A minimal matching utility.
|
||||
|
||||
[](http://travis-ci.org/isaacs/minimatch)
|
||||
[](http://travis-ci.org/isaacs/minimatch)
|
||||
|
||||
|
||||
This is the matching library used internally by npm.
|
||||
@@ -37,7 +37,7 @@ See:
|
||||
|
||||
## Minimatch Class
|
||||
|
||||
Create a minimatch object by instanting the `minimatch.Minimatch` class.
|
||||
Create a minimatch object by instantiating the `minimatch.Minimatch` class.
|
||||
|
||||
```javascript
|
||||
var Minimatch = require("minimatch").Minimatch
|
||||
@@ -82,13 +82,6 @@ var mm = new Minimatch(pattern, options)
|
||||
|
||||
All other methods are internal, and will be called as necessary.
|
||||
|
||||
## Functions
|
||||
|
||||
The top-level exported function has a `cache` property, which is an LRU
|
||||
cache set to store 100 items. So, calling these methods repeatedly
|
||||
with the same pattern and options will use the same Minimatch object,
|
||||
saving the cost of parsing it multiple times.
|
||||
|
||||
### minimatch(path, pattern, options)
|
||||
|
||||
Main export. Tests a path against the pattern using the options.
|
||||
|
||||
+15
-3
@@ -235,7 +235,7 @@ function braceExpand (pattern, options) {
|
||||
? this.pattern : pattern
|
||||
|
||||
if (typeof pattern === 'undefined') {
|
||||
throw new Error('undefined pattern')
|
||||
throw new TypeError('undefined pattern')
|
||||
}
|
||||
|
||||
if (options.nobrace ||
|
||||
@@ -261,6 +261,10 @@ function braceExpand (pattern, options) {
|
||||
Minimatch.prototype.parse = parse
|
||||
var SUBPARSE = {}
|
||||
function parse (pattern, isSub) {
|
||||
if (pattern.length > 1024 * 64) {
|
||||
throw new TypeError('pattern is too long')
|
||||
}
|
||||
|
||||
var options = this.options
|
||||
|
||||
// shortcuts
|
||||
@@ -518,7 +522,7 @@ function parse (pattern, isSub) {
|
||||
for (pl = patternListStack.pop(); pl; pl = patternListStack.pop()) {
|
||||
var tail = re.slice(pl.reStart + 3)
|
||||
// maybe some even number of \, then maybe 1 \, followed by a |
|
||||
tail = tail.replace(/((?:\\{2})*)(\\?)\|/g, function (_, $1, $2) {
|
||||
tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, function (_, $1, $2) {
|
||||
if (!$2) {
|
||||
// the | isn't already escaped, so escape it.
|
||||
$2 = '\\'
|
||||
@@ -615,7 +619,15 @@ function parse (pattern, isSub) {
|
||||
}
|
||||
|
||||
var flags = options.nocase ? 'i' : ''
|
||||
var regExp = new RegExp('^' + re + '$', flags)
|
||||
try {
|
||||
var regExp = new RegExp('^' + re + '$', flags)
|
||||
} catch (er) {
|
||||
// If it was an invalid regular expression, then it can't match
|
||||
// anything. This trick looks for a character after the end of
|
||||
// the string, which is of course impossible, except in multi-line
|
||||
// mode, but it's not a /m regex.
|
||||
return new RegExp('$.')
|
||||
}
|
||||
|
||||
regExp._glob = pattern
|
||||
regExp._src = re
|
||||
|
||||
+34
-21
@@ -1,27 +1,40 @@
|
||||
{
|
||||
"_args": [
|
||||
[
|
||||
"minimatch@^3.0.0",
|
||||
"D:\\Cordova\\cordova-android\\node_modules\\cordova-common"
|
||||
{
|
||||
"raw": "minimatch@^3.0.0",
|
||||
"scope": null,
|
||||
"escapedName": "minimatch",
|
||||
"name": "minimatch",
|
||||
"rawSpec": "^3.0.0",
|
||||
"spec": ">=3.0.0 <4.0.0",
|
||||
"type": "range"
|
||||
},
|
||||
"/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common"
|
||||
]
|
||||
],
|
||||
"_from": "minimatch@>=3.0.0 <4.0.0",
|
||||
"_id": "minimatch@3.0.0",
|
||||
"_id": "minimatch@3.0.2",
|
||||
"_inCache": true,
|
||||
"_installable": true,
|
||||
"_location": "/minimatch",
|
||||
"_nodeVersion": "4.0.0",
|
||||
"_npmUser": {
|
||||
"email": "isaacs@npmjs.com",
|
||||
"name": "isaacs"
|
||||
"_nodeVersion": "4.4.4",
|
||||
"_npmOperationalInternal": {
|
||||
"host": "packages-16-east.internal.npmjs.com",
|
||||
"tmp": "tmp/minimatch-3.0.2.tgz_1466194379770_0.11417287751100957"
|
||||
},
|
||||
"_npmVersion": "3.3.2",
|
||||
"_npmUser": {
|
||||
"name": "isaacs",
|
||||
"email": "i@izs.me"
|
||||
},
|
||||
"_npmVersion": "3.9.1",
|
||||
"_phantomChildren": {},
|
||||
"_requested": {
|
||||
"name": "minimatch",
|
||||
"raw": "minimatch@^3.0.0",
|
||||
"rawSpec": "^3.0.0",
|
||||
"scope": null,
|
||||
"escapedName": "minimatch",
|
||||
"name": "minimatch",
|
||||
"rawSpec": "^3.0.0",
|
||||
"spec": ">=3.0.0 <4.0.0",
|
||||
"type": "range"
|
||||
},
|
||||
@@ -29,14 +42,14 @@
|
||||
"/cordova-common",
|
||||
"/glob"
|
||||
],
|
||||
"_resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz",
|
||||
"_shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
|
||||
"_resolved": "http://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz",
|
||||
"_shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
|
||||
"_shrinkwrap": null,
|
||||
"_spec": "minimatch@^3.0.0",
|
||||
"_where": "D:\\Cordova\\cordova-android\\node_modules\\cordova-common",
|
||||
"_where": "/Users/steveng/repo/cordova/cordova-android/node_modules/cordova-common",
|
||||
"author": {
|
||||
"email": "i@izs.me",
|
||||
"name": "Isaac Z. Schlueter",
|
||||
"email": "i@izs.me",
|
||||
"url": "http://blog.izs.me"
|
||||
},
|
||||
"bugs": {
|
||||
@@ -48,12 +61,12 @@
|
||||
"description": "a glob matcher in javascript",
|
||||
"devDependencies": {
|
||||
"standard": "^3.7.2",
|
||||
"tap": "^1.2.0"
|
||||
"tap": "^5.6.0"
|
||||
},
|
||||
"directories": {},
|
||||
"dist": {
|
||||
"shasum": "5236157a51e4f004c177fb3c527ff7dd78f0ef83",
|
||||
"tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
|
||||
"shasum": "0f398a7300ea441e9c348c83d98ab8c9dbf9c40a",
|
||||
"tarball": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
|
||||
},
|
||||
"engines": {
|
||||
"node": "*"
|
||||
@@ -61,14 +74,14 @@
|
||||
"files": [
|
||||
"minimatch.js"
|
||||
],
|
||||
"gitHead": "270dbea567f0af6918cb18103e98c612aa717a20",
|
||||
"gitHead": "81edb7c763abd31ba981c87ec5e835f178786be0",
|
||||
"homepage": "https://github.com/isaacs/minimatch#readme",
|
||||
"license": "ISC",
|
||||
"main": "minimatch.js",
|
||||
"maintainers": [
|
||||
{
|
||||
"email": "i@izs.me",
|
||||
"name": "isaacs"
|
||||
"name": "isaacs",
|
||||
"email": "i@izs.me"
|
||||
}
|
||||
],
|
||||
"name": "minimatch",
|
||||
@@ -82,5 +95,5 @@
|
||||
"posttest": "standard minimatch.js test/*.js",
|
||||
"test": "tap test/*.js"
|
||||
},
|
||||
"version": "3.0.0"
|
||||
"version": "3.0.2"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user