diff options
| author | Forrest L Norvell <forrest@npmjs.com> | 2015-06-19 03:24:06 -0700 |
|---|---|---|
| committer | Jeremiah Senkpiel <fishrock123@rocketmail.com> | 2015-06-19 11:17:49 -0700 |
| commit | 6a359b1ce9d89d0f1093fe1193ffe14ebd312571 (patch) | |
| tree | acee19166d5e2b3d5940536fb57085beeb6a6bdb /deps/npm/node_modules/rimraf | |
| parent | c5353d7c626d7cfc5847fecffb04a6f1552a4c3e (diff) | |
| download | android-node-v8-6a359b1ce9d89d0f1093fe1193ffe14ebd312571.tar.gz android-node-v8-6a359b1ce9d89d0f1093fe1193ffe14ebd312571.tar.bz2 android-node-v8-6a359b1ce9d89d0f1093fe1193ffe14ebd312571.zip | |
deps: upgrade to npm 2.11.3
PR-URL: https://github.com/nodejs/io.js/pull/2018
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Diffstat (limited to 'deps/npm/node_modules/rimraf')
| -rw-r--r-- | deps/npm/node_modules/rimraf/package.json | 24 | ||||
| -rw-r--r-- | deps/npm/node_modules/rimraf/rimraf.js | 5 |
2 files changed, 17 insertions, 12 deletions
diff --git a/deps/npm/node_modules/rimraf/package.json b/deps/npm/node_modules/rimraf/package.json index aabb562a7a..b0ec171e08 100644 --- a/deps/npm/node_modules/rimraf/package.json +++ b/deps/npm/node_modules/rimraf/package.json @@ -1,6 +1,6 @@ { "name": "rimraf", - "version": "2.3.4", + "version": "2.4.0", "main": "rimraf.js", "description": "A deep deletion module for node (like `rm -rf`)", "author": { @@ -14,7 +14,7 @@ "url": "git://github.com/isaacs/rimraf.git" }, "scripts": { - "test": "cd test && bash run.sh" + "test": "tap test/*.js" }, "bin": { "rimraf": "./bin.js" @@ -28,23 +28,27 @@ "LICENSE", "README.md" ], - "gitHead": "2a6cc45bbbdd8da5fd703d8af62843565f7dea57", + "devDependencies": { + "mkdirp": "^0.5.1", + "tap": "^1.2.0" + }, + "gitHead": "2128f0b9ade05a81394dd21a383fa309dd9eca94", "bugs": { "url": "https://github.com/isaacs/rimraf/issues" }, "homepage": "https://github.com/isaacs/rimraf#readme", - "_id": "rimraf@2.3.4", - "_shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a", - "_from": "rimraf@>=2.3.4 <2.4.0", - "_npmVersion": "2.10.0", + "_id": "rimraf@2.4.0", + "_shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864", + "_from": "rimraf@latest", + "_npmVersion": "2.10.1", "_nodeVersion": "2.0.1", "_npmUser": { "name": "isaacs", "email": "isaacs@npmjs.com" }, "dist": { - "shasum": "82d9bc1b2fcf31e205ac7b28138a025d08e9159a", - "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz" + "shasum": "40ba0416037d8511ecb50f6b07cf8d18e658a864", + "tarball": "http://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz" }, "maintainers": [ { @@ -53,6 +57,6 @@ } ], "directories": {}, - "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.3.4.tgz", + "_resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.0.tgz", "readme": "ERROR: No README data found!" } diff --git a/deps/npm/node_modules/rimraf/rimraf.js b/deps/npm/node_modules/rimraf/rimraf.js index 7f684e4b59..447705ac97 100644 --- a/deps/npm/node_modules/rimraf/rimraf.js +++ b/deps/npm/node_modules/rimraf/rimraf.js @@ -35,6 +35,7 @@ function defaults (options) { options.maxBusyTries = options.maxBusyTries || 3 options.emfileWait = options.emfileWait || 1000 + options.disableGlob = options.disableGlob || false } function rimraf (p, options, cb) { @@ -55,7 +56,7 @@ function rimraf (p, options, cb) { var errState = null var n = 0 - if (!glob.hasMagic(p)) + if (options.disableGlob || !glob.hasMagic(p)) return afterGlob(null, [p]) fs.lstat(p, function (er, stat) { @@ -262,7 +263,7 @@ function rimrafSync (p, options) { var results - if (!glob.hasMagic(p)) { + if (options.disableGlob || !glob.hasMagic(p)) { results = [p] } else { try { |