Fix #995 Optional Dependencies

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/utils/read-json.js b/lib/utils/read-json.js
index ffd447d32..388d6727e 100644
--- a/lib/utils/read-json.js
+++ b/lib/utils/read-json.js
@@ -362,11 +362,23 @@ function processObject (opts, cb) { return function (er, json) {
     delete json["dev-dependencies"]
   }
 
-  ;["dependencies", "devDependencies"].forEach(function (d) {
-    json[d] = json.hasOwnProperty(d) ? depObjectify(json[d], d, json._id) : {}
+  ; [ "dependencies"
+    , "devDependencies"
+    , "optionalDependencies"
+    ].forEach(function (d) {
+      json[d] = json.hasOwnProperty(d)
+              ? depObjectify(json[d], d, json._id)
+              : {}
+    })
+
+  // always merge optionals into deps
+  Object.keys(json.optionalDependencies).forEach(function (d) {
+    json.dependencies[d] = json.optionalDependencies[d]
   })
 
-  if (opts.dev || npm.config.get("dev") || npm.config.get("npat")) {
+  if (opts.dev
+      || npm.config.get("dev")
+      || npm.config.get("npat")) {
     // log.warn(json._id, "Adding devdeps")
     Object.keys(json.devDependencies || {}).forEach(function (d) {
       json.dependencies[d] = json.devDependencies[d]