Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorForrest L Norvell <forrest@npmjs.com>2014-09-30 06:31:50 +0400
committerForrest L Norvell <forrest@npmjs.com>2014-09-30 06:31:50 +0400
commita1aa20e44bb8285c6be1e7fa63b9da920e3a70ed (patch)
tree48407365f83ad64a87f24f42d89f1dac30829dec /node_modules/normalize-package-data
parenta1f5fe1005043ce20a06e8b17a3e201aa3215357 (diff)
normalize-package-data@1.0.3
Don't prune bundledDependencies (closes #6282).
Diffstat (limited to 'node_modules/normalize-package-data')
-rw-r--r--node_modules/normalize-package-data/README.md6
-rw-r--r--node_modules/normalize-package-data/lib/fixer.js7
-rw-r--r--node_modules/normalize-package-data/lib/warning_messages.json3
-rw-r--r--node_modules/normalize-package-data/package.json19
-rw-r--r--node_modules/normalize-package-data/test/dependencies.js3
5 files changed, 24 insertions, 14 deletions
diff --git a/node_modules/normalize-package-data/README.md b/node_modules/normalize-package-data/README.md
index bdcc8b04d..1429e4042 100644
--- a/node_modules/normalize-package-data/README.md
+++ b/node_modules/normalize-package-data/README.md
@@ -16,7 +16,7 @@ Basic usage is really simple. You call the function that normalize-package-data
```javascript
normalizeData = require('normalize-package-data')
-packageData = fs.readfileSync("package.json")
+packageData = fs.readFileSync("package.json")
normalizeData(packageData)
// packageData is now normalized
```
@@ -27,7 +27,7 @@ You may activate strict validation by passing true as the second argument.
```javascript
normalizeData = require('normalize-package-data')
-packageData = fs.readfileSync("package.json")
+packageData = fs.readFileSync("package.json")
warnFn = function(msg) { console.error(msg) }
normalizeData(packageData, true)
// packageData is now normalized
@@ -41,7 +41,7 @@ Optionally, you may pass a "warning" function. It gets called whenever the `norm
```javascript
normalizeData = require('normalize-package-data')
-packageData = fs.readfileSync("package.json")
+packageData = fs.readFileSync("package.json")
warnFn = function(msg) { console.error(msg) }
normalizeData(packageData, warnFn)
// packageData is now normalized. Any number of warnings may have been logged.
diff --git a/node_modules/normalize-package-data/lib/fixer.js b/node_modules/normalize-package-data/lib/fixer.js
index 72836002f..14c0abc8e 100644
--- a/node_modules/normalize-package-data/lib/fixer.js
+++ b/node_modules/normalize-package-data/lib/fixer.js
@@ -111,6 +111,13 @@ var fixer = module.exports = {
this.warn("nonStringBundleDependency", bd)
return false
} else {
+ if (!data.dependencies) {
+ data.dependencies = {}
+ }
+ if (!data.dependencies.hasOwnProperty(bd)) {
+ this.warn("nonDependencyBundleDependency", bd)
+ data.dependencies[bd] = "*"
+ }
return true
}
}, this)
diff --git a/node_modules/normalize-package-data/lib/warning_messages.json b/node_modules/normalize-package-data/lib/warning_messages.json
index 9605f5cc6..1877fe5de 100644
--- a/node_modules/normalize-package-data/lib/warning_messages.json
+++ b/node_modules/normalize-package-data/lib/warning_messages.json
@@ -8,6 +8,7 @@
,"invalidFilename": "Invalid filename in 'files' list: %s"
,"nonArrayBundleDependencies": "Invalid 'bundleDependencies' list. Must be array of package names"
,"nonStringBundleDependency": "Invalid bundleDependencies member: %s"
+ ,"nonDependencyBundleDependency": "Non-dependency in bundleDependencies: %s"
,"nonObjectDependencies": "%s field must be an object"
,"nonStringDependency": "Invalid dependency: %s %s"
,"deprecatedArrayDependencies": "specifying %s as array is deprecated"
@@ -25,4 +26,4 @@
,"nonUrlHomepage": "homepage field must be a string url. Deleted."
,"missingProtocolHomepage": "homepage field must start with a protocol."
,"typo": "%s should probably be %s."
-} \ No newline at end of file
+}
diff --git a/node_modules/normalize-package-data/package.json b/node_modules/normalize-package-data/package.json
index 0471bcd6e..6da54694c 100644
--- a/node_modules/normalize-package-data/package.json
+++ b/node_modules/normalize-package-data/package.json
@@ -1,6 +1,6 @@
{
"name": "normalize-package-data",
- "version": "1.0.2",
+ "version": "1.0.3",
"author": {
"name": "Meryn Stol",
"email": "merynstol@gmail.com"
@@ -38,15 +38,16 @@
"email": "rok@kowalski.gd"
}
],
- "gitHead": "05fafb91466ac634fa7d591d0796d64b0b432dc0",
+ "gitHead": "8c30091c83b1a41e113757148c4543ef61ff863d",
"bugs": {
"url": "https://github.com/meryn/normalize-package-data/issues"
},
"homepage": "https://github.com/meryn/normalize-package-data",
- "_id": "normalize-package-data@1.0.2",
- "_shasum": "32a902ad3cad3286f1106b9b9550062f44ee2118",
- "_from": "normalize-package-data@>=1.0.1-0 <1.1.0-0",
- "_npmVersion": "2.0.0-beta.3",
+ "_id": "normalize-package-data@1.0.3",
+ "_shasum": "8be955b8907af975f1a4584ea8bb9b41492312f5",
+ "_from": "normalize-package-data@>=1.0.3 <1.1.0",
+ "_npmVersion": "2.1.0",
+ "_nodeVersion": "0.10.31",
"_npmUser": {
"name": "isaacs",
"email": "i@izs.me"
@@ -66,9 +67,9 @@
}
],
"dist": {
- "shasum": "32a902ad3cad3286f1106b9b9550062f44ee2118",
- "tarball": "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.2.tgz"
+ "shasum": "8be955b8907af975f1a4584ea8bb9b41492312f5",
+ "tarball": "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.2.tgz"
+ "_resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz"
}
diff --git a/node_modules/normalize-package-data/test/dependencies.js b/node_modules/normalize-package-data/test/dependencies.js
index dda24dc4f..3e493ab02 100644
--- a/node_modules/normalize-package-data/test/dependencies.js
+++ b/node_modules/normalize-package-data/test/dependencies.js
@@ -37,7 +37,8 @@ tap.test("warn if bundleDependencies array contains anything else but strings",
var wanted1 = safeFormat(warningMessages.nonStringBundleDependency, 123)
var wanted2 = safeFormat(warningMessages.nonStringBundleDependency, {foo:"bar"})
+ var wanted2 = safeFormat(warningMessages.nonDependencyBundleDependency, "abc")
t.ok(~warnings.indexOf(wanted1), wanted1)
t.ok(~warnings.indexOf(wanted2), wanted2)
t.end()
-}) \ No newline at end of file
+})