diff options
author | isaacs <i@izs.me> | 2014-01-20 03:51:08 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2014-01-20 03:51:08 +0400 |
commit | 909cccf0614d07e74783f5a15ec16fbfe628a5cc (patch) | |
tree | 649489058efc6aa9c69d4edbb7896eeefb93f01f /node_modules/read-package-json | |
parent | a3891b6692bb02b212bed91f718d52e0fbcaf4e0 (diff) |
read-package-json@1.1.6
Diffstat (limited to 'node_modules/read-package-json')
-rw-r--r-- | node_modules/read-package-json/package.json | 10 | ||||
-rw-r--r-- | node_modules/read-package-json/read-json.js | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/node_modules/read-package-json/package.json b/node_modules/read-package-json/package.json index d1fa33cae..f1e40ddc1 100644 --- a/node_modules/read-package-json/package.json +++ b/node_modules/read-package-json/package.json @@ -1,6 +1,6 @@ { "name": "read-package-json", - "version": "1.1.5", + "version": "1.1.6", "author": { "name": "Isaac Z. Schlueter", "email": "i@izs.me", @@ -34,6 +34,10 @@ "url": "https://github.com/isaacs/read-package-json/issues" }, "homepage": "https://github.com/isaacs/read-package-json", - "_id": "read-package-json@1.1.5", - "_from": "read-package-json@latest" + "_id": "read-package-json@1.1.6", + "dist": { + "shasum": "a851dbbaca48ff78a87f890f0a9fdf43b1759d5a" + }, + "_from": "read-package-json@1.1.6", + "_resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-1.1.6.tgz" } diff --git a/node_modules/read-package-json/read-json.js b/node_modules/read-package-json/read-json.js index db4072303..5f69c0dcf 100644 --- a/node_modules/read-package-json/read-json.js +++ b/node_modules/read-package-json/read-json.js @@ -111,6 +111,7 @@ function extras (file, data, log_, strict_, cb_) { else if (typeof arguments[i] === 'function') log = arguments[i] } + if (!log) log = function () {}; cb = arguments[i] var set = readJson.extraSet var n = set.length @@ -134,6 +135,9 @@ function scriptpath (file, data, cb) { } function scriptpath_(key) { s = this[key] + // This is never allowed, and only causes problems + if (typeof s !== 'string') + return delete this[key] var spre = /^(\.[\/\\])?node_modules[\/\\].bin[\\\/]/ if (s.match(spre)) this[key] = this[key].replace(spre, '') @@ -332,9 +336,10 @@ function final (file, data, log, strict, cb) { } function makePackageId (data) { - return cleanString(data.name) + "@" + cleanString(data.version) + var name = cleanString(data.name) + var ver = cleanString(data.version) + return name + "@" + ver } - function cleanString(str) { return (!str || typeof(str) !== "string") ? "" : str.trim() } |