diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2016-05-19 11:37:20 +0300 |
---|---|---|
committer | Kat Marchán <kzm@sykosomatic.org> | 2016-05-19 12:35:59 +0300 |
commit | 5ed4b58409eeb134bca1c96252682fd7600d9906 (patch) | |
tree | 1b6498bd0bb0ddd45b233677932bd2a8dfe08571 /node_modules/which | |
parent | 935a7e359535e13924934811b77924cbad82619a (diff) |
which@1.2.9
Fix for paths startin with ../
Credit: @isaacs
Diffstat (limited to 'node_modules/which')
11 files changed, 33 insertions, 356 deletions
diff --git a/node_modules/which/CHANGELOG.md b/node_modules/which/CHANGELOG.md index 03879364f..830958042 100644 --- a/node_modules/which/CHANGELOG.md +++ b/node_modules/which/CHANGELOG.md @@ -1,6 +1,11 @@ # Changes +## v1.2.9 + +* fix for paths starting with ../ +* Remove unused `is-absolute` module + ## v1.2.8 * bullet items in changelog that contain (but don't start with) # diff --git a/node_modules/which/node_modules/is-absolute/LICENSE b/node_modules/which/node_modules/is-absolute/LICENSE deleted file mode 100644 index 904ab073b..000000000 --- a/node_modules/which/node_modules/is-absolute/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014-2015, Jon Schlinkert.Copyright (c) 2009-2015, TJ Holowaychuk. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/node_modules/which/node_modules/is-absolute/README.md b/node_modules/which/node_modules/is-absolute/README.md deleted file mode 100644 index 768f4b833..000000000 --- a/node_modules/which/node_modules/is-absolute/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# is-absolute [![NPM version](https://badge.fury.io/js/is-absolute.svg)](http://badge.fury.io/js/is-absolute) [![Build Status](https://travis-ci.org/jonschlinkert/is-absolute.svg)](https://travis-ci.org/jonschlinkert/is-absolute) - -> Return true if a file path is absolute. - -Based on the `isAbsolute` utility method in [express](https://github.com/visionmedia/express). - -## Install with [npm](npmjs.org) - -```bash -npm i is-absolute --save -``` - -## Usage - -```js -var isAbsolute = require('is-absolute'); -console.log(isAbsolute('a/b/c.js')); -//=> 'false'; -``` - -## Running tests -Install dev dependencies. - -```bash -npm i -d && npm test -``` - - -## Contributing -Pull requests and stars are always welcome. For bugs and feature requests, [please create an issue](https://github.com/jonschlinkert/is-absolute/issues) - - -## Other projects -* [is-relative](https://github.com/jonschlinkert/is-relative): Returns `true` if the path appears to be relative. -* [is-dotfile](https://github.com/regexps/is-dotfile): Return true if a file path is (or has) a dotfile. -* [is-glob](https://github.com/jonschlinkert/is-glob): Returns `true` if the given string looks like a glob pattern. -* [cwd](https://github.com/jonschlinkert/cwd): Node.js util for easily getting the current working directory of a project based on package.json or the given path. -* [git-config-path](https://github.com/jonschlinkert/git-config-path): Resolve the path to the user's global .gitconfig. - -## Author - -**Jon Schlinkert** - -+ [github/jonschlinkert](https://github.com/jonschlinkert) -+ [twitter/jonschlinkert](http://twitter.com/jonschlinkert) - -## License -Copyright (c) 2014-2015 Jon Schlinkert -Released under the MIT license - -*** - -_This file was generated by [verb-cli](https://github.com/assemble/verb-cli) on March 05, 2015._ diff --git a/node_modules/which/node_modules/is-absolute/index.js b/node_modules/which/node_modules/is-absolute/index.js deleted file mode 100644 index e7a40dd73..000000000 --- a/node_modules/which/node_modules/is-absolute/index.js +++ /dev/null @@ -1,27 +0,0 @@ -/*! - * is-absolute <https://github.com/jonschlinkert/is-absolute> - * - * Copyright (c) 2014-2015, Jon Schlinkert. - * Licensed under the MIT License. - */ - -'use strict'; - -var isRelative = require('is-relative'); - -module.exports = function isAbsolute(filepath) { - if ('/' === filepath[0]) { - return true; - } - if (':' === filepath[1] && '\\' === filepath[2]) { - return true; - } - // Microsoft Azure absolute filepath - if ('\\\\' == filepath.substring(0, 2)) { - return true; - } - if (!isRelative(filepath)) { - return true; - } -}; - diff --git a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT b/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT deleted file mode 100644 index b576e8d48..000000000 --- a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/LICENSE-MIT +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Jon Schlinkert - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md b/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md deleted file mode 100644 index 760be8d06..000000000 --- a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# is-relative [![NPM version](https://badge.fury.io/js/is-relative.svg)](http://badge.fury.io/js/is-relative) - -> Returns `true` if the path appears to be relative. - -## Install -### Install with [npm](npmjs.org) - -```bash -npm i is-relative --save -``` - -## Usage -### [isRelative](index.js#L16) - -* `filepath` **{String}**: Path to test. -* `returns`: {Boolean} - -```js -var isRelative = require('is-relative'); -isRelative('README.md'); -//=> true -``` - - -## Author - -**Jon Schlinkert** - -+ [github/jonschlinkert](https://github.com/jonschlinkert) -+ [twitter/jonschlinkert](http://twitter.com/jonschlinkert) - -## License -Copyright (c) 2014 Jon Schlinkert -Released under the MIT license - -*** - -_This file was generated by [verb](https://github.com/assemble/verb) on November 17, 2014._
\ No newline at end of file diff --git a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js b/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js deleted file mode 100644 index ffc760a82..000000000 --- a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/index.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict'; - -/** - * ```js - * var isRelative = require('is-relative'); - * isRelative('README.md'); - * //=> true - * ``` - * - * @name isRelative - * @param {String} `filepath` Path to test. - * @return {Boolean} - * @api public - */ - -module.exports = function isRelative(filepath) { - if (typeof filepath !== 'string') { - throw new Error('isRelative expects a string.'); - } - return !/^([a-z]+:)?[\\\/]/i.test(filepath); -};
\ No newline at end of file diff --git a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json b/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json deleted file mode 100644 index d582081dd..000000000 --- a/node_modules/which/node_modules/is-absolute/node_modules/is-relative/package.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "is-relative", - "description": "Returns `true` if the path appears to be relative.", - "version": "0.1.3", - "homepage": "https://github.com/jonschlinkert/is-relative", - "author": { - "name": "Jon Schlinkert", - "url": "https://github.com/jonschlinkert" - }, - "repository": { - "type": "git", - "url": "git://github.com/jonschlinkert/is-relative.git" - }, - "bugs": { - "url": "https://github.com/jonschlinkert/is-relative/issues" - }, - "licenses": [ - { - "type": "MIT", - "url": "https://github.com/jonschlinkert/is-relative/blob/master/LICENSE-MIT" - } - ], - "keywords": [ - "absolute", - "check", - "file", - "filepath", - "is", - "normalize", - "path", - "path.relative", - "relative", - "resolve", - "slash", - "slashes", - "uri", - "url" - ], - "main": "index.js", - "files": [ - "index.js", - "LICENSE-MIT" - ], - "engines": { - "node": ">=0.10.0" - }, - "scripts": { - "test": "mocha -R spec" - }, - "devDependencies": { - "mocha": "*", - "verb": ">= 0.2.6", - "verb-tag-jscomments": "^0.1.4" - }, - "_id": "is-relative@0.1.3", - "_shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82", - "_from": "is-relative@>=0.1.0 <0.2.0", - "_npmVersion": "1.4.9", - "_npmUser": { - "name": "jonschlinkert", - "email": "github@sellside.com" - }, - "maintainers": [ - { - "name": "jonschlinkert", - "email": "github@sellside.com" - } - ], - "dist": { - "shasum": "905fee8ae86f45b3ec614bc3c15c869df0876e82", - "tarball": "http://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz" - }, - "directories": {}, - "_resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/node_modules/which/node_modules/is-absolute/package.json b/node_modules/which/node_modules/is-absolute/package.json deleted file mode 100644 index 4f954b855..000000000 --- a/node_modules/which/node_modules/is-absolute/package.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "name": "is-absolute", - "description": "Return true if a file path is absolute.", - "version": "0.1.7", - "homepage": "https://github.com/jonschlinkert/is-absolute", - "author": { - "name": "Jon Schlinkert", - "url": "https://github.com/jonschlinkert" - }, - "repository": { - "type": "git", - "url": "git://github.com/jonschlinkert/is-absolute.git" - }, - "bugs": { - "url": "https://github.com/jonschlinkert/is-absolute/issues" - }, - "license": { - "type": "MIT", - "url": "https://github.com/jonschlinkert/is-absolute/blob/master/LICENSE" - }, - "files": [ - "index.js" - ], - "main": "index.js", - "engines": { - "node": ">=0.10.0" - }, - "scripts": { - "test": "mocha" - }, - "dependencies": { - "is-relative": "^0.1.0" - }, - "devDependencies": { - "mocha": "*" - }, - "keywords": [ - "absolute", - "check", - "file", - "filepath", - "is", - "normalize", - "path", - "path.relative", - "relative", - "resolve", - "slash", - "slashes", - "uri", - "url" - ], - "gitHead": "90cca7b671620bf28b778a61fddc8a986a2e1095", - "_id": "is-absolute@0.1.7", - "_shasum": "847491119fccb5fb436217cc737f7faad50f603f", - "_from": "is-absolute@>=0.1.7 <0.2.0", - "_npmVersion": "2.5.1", - "_nodeVersion": "0.12.0", - "_npmUser": { - "name": "jonschlinkert", - "email": "github@sellside.com" - }, - "maintainers": [ - { - "name": "jonschlinkert", - "email": "github@sellside.com" - } - ], - "dist": { - "shasum": "847491119fccb5fb436217cc737f7faad50f603f", - "tarball": "http://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz" - }, - "directories": {}, - "_resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", - "readme": "ERROR: No README data found!" -} diff --git a/node_modules/which/package.json b/node_modules/which/package.json index 021110d45..9f1f7a9fc 100644 --- a/node_modules/which/package.json +++ b/node_modules/which/package.json @@ -1,32 +1,39 @@ { "_args": [ [ - "which@1.2.8", - "/Users/rebecca/code/npm" + { + "name": "which", + "raw": "which@1.2.9", + "rawSpec": "1.2.9", + "scope": null, + "spec": "1.2.9", + "type": "version" + }, + "/Users/zkat/Documents/code/npm" ] ], - "_from": "which@1.2.8", - "_id": "which@1.2.8", + "_from": "which@1.2.9", + "_id": "which@1.2.9", "_inCache": true, "_installable": true, "_location": "/which", - "_nodeVersion": "5.6.0", + "_nodeVersion": "4.4.4", "_npmOperationalInternal": { - "host": "packages-12-west.internal.npmjs.com", - "tmp": "tmp/which-1.2.8.tgz_1462472514341_0.746755798580125" + "host": "packages-16-east.internal.npmjs.com", + "tmp": "tmp/which-1.2.9.tgz_1463603459182_0.9633393425028771" }, "_npmUser": { "email": "i@izs.me", "name": "isaacs" }, - "_npmVersion": "3.8.9", + "_npmVersion": "3.9.1", "_phantomChildren": {}, "_requested": { "name": "which", - "raw": "which@1.2.8", - "rawSpec": "1.2.8", + "raw": "which@1.2.9", + "rawSpec": "1.2.9", "scope": null, - "spec": "1.2.8", + "spec": "1.2.9", "type": "version" }, "_requiredBy": [ @@ -37,11 +44,11 @@ "/tap/nyc/istanbul", "/tap/nyc/spawn-wrap" ], - "_resolved": "https://registry.npmjs.org/which/-/which-1.2.8.tgz", - "_shasum": "37fa9f6eab30e49b8ef6eea24681c5799d52ebd6", + "_resolved": "https://registry.npmjs.org/which/-/which-1.2.9.tgz", + "_shasum": "0b3a0e5c073bc10ca7b9ec13534eeef8a71ab61f", "_shrinkwrap": null, - "_spec": "which@1.2.8", - "_where": "/Users/rebecca/code/npm", + "_spec": "which@1.2.9", + "_where": "/Users/zkat/Documents/code/npm", "author": { "email": "i@izs.me", "name": "Isaac Z. Schlueter", @@ -54,7 +61,6 @@ "url": "https://github.com/isaacs/node-which/issues" }, "dependencies": { - "is-absolute": "^0.1.7", "isexe": "^1.1.1" }, "description": "Like which(1) unix command. Find the first instance of an executable in the PATH.", @@ -65,14 +71,14 @@ }, "directories": {}, "dist": { - "shasum": "37fa9f6eab30e49b8ef6eea24681c5799d52ebd6", - "tarball": "https://registry.npmjs.org/which/-/which-1.2.8.tgz" + "shasum": "0b3a0e5c073bc10ca7b9ec13534eeef8a71ab61f", + "tarball": "https://registry.npmjs.org/which/-/which-1.2.9.tgz" }, "files": [ "which.js", "bin/which" ], - "gitHead": "e4de2c25e9163b1f55323792f0fc5806e948ffc1", + "gitHead": "34aac93a4c4ee9e3c7a49fe09778ca942e636cce", "homepage": "https://github.com/isaacs/node-which#readme", "license": "ISC", "main": "which.js", @@ -94,5 +100,5 @@ "postversion": "npm run changelog && git add CHANGELOG.md && git commit -m 'update changelog - '${npm_package_version}", "test": "tap test/*.js --cov" }, - "version": "1.2.8" + "version": "1.2.9" } diff --git a/node_modules/which/which.js b/node_modules/which/which.js index 4ba14cd02..b61da894f 100644 --- a/node_modules/which/which.js +++ b/node_modules/which/which.js @@ -9,7 +9,6 @@ var path = require('path') var COLON = isWindows ? ';' : ':' var isexe = require('isexe') var fs = require('fs') -var isAbsolute = require('is-absolute') function getNotFoundError (cmd) { var er = new Error('not found: ' + cmd) @@ -75,7 +74,7 @@ function which (cmd, opt, cb) { pathPart = pathPart.slice(1, -1) var p = path.join(pathPart, cmd) - if (!pathPart && (/^\./).test(cmd)) { + if (!pathPart && (/^\.[\\\/]/).test(cmd)) { p = cmd.slice(0, 2) + p } ;(function E (ii, ll) { @@ -109,7 +108,7 @@ function whichSync (cmd, opt) { pathPart = pathPart.slice(1, -1) var p = path.join(pathPart, cmd) - if (!pathPart && (/^\./).test(cmd)) { + if (!pathPart && /^\.[\\\/]/.test(cmd)) { p = cmd.slice(0, 2) + p } for (var j = 0, ll = pathExt.length; j < ll; j ++) { |