override dependencies set registry jspm by default

jspm · Jan 13, 2015 · 8d80d85 · 8d80d85
1 parent 826a7bb
commit 8d80d85
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -33,14 +33,19 @@ exports.derivePackageConfig = function(pjson, override) {
 
   // apply the jspm internal overrides first
   if (pjson.jspm) {
-    if (pjson.jspm.dependencies && !pjson.registry && !pjson.jspm.registry)
-      pjson.jspm.registry = 'jspm';
     extend(dpjson, pjson.jspm);
+
+    if (pjson.jspm.dependencies)
+      dpjson.registry = dpjson.registry || 'jspm';
   }
 
-  if (override)
+  if (override) {
     extend(dpjson, override);
 
+    if (override.dependencies)
+      dpjson.registry = dpjson.registry || 'jspm';
+  }
+
   // finally set the derived package.json as the "jspm" property on the package.json
   return dpjson;
 }