Add support for package defaults in uninstall and deactivate

2 files changed, 19 insertions, 11 deletions

diff --git a/lib/deactivate.js b/lib/deactivate.js
index 9b9c9df54..0af8c782b 100644
--- a/lib/deactivate.js
+++ b/lib/deactivate.js
@@ -9,6 +9,7 @@ var mkdir = require("./utils/mkdir-p")
   , lifecycle = require("./utils/lifecycle")
   , readJson = require("./utils/read-json")
   , asyncMap = require("./utils/async-map")
+  , loadPackageDefaults = require("./utils/load-package-defaults")
 
 module.exports = deactivate
 
@@ -59,11 +60,14 @@ function preDeactivate (pkg, cb) {
       data.version = version
       data._id = data.name+"-"+data.version
       npm.set(data)
-      chain
-        ( [lifecycle, data, "predeactivate"]
-        , [lifecycle, data, "deactivate"]
-        , function (er) { cb(er, data) }
-        )
+      loadPackageDefaults(data, function (er, data) {
+        if (er) return cb(er)
+        chain
+          ( [lifecycle, data, "predeactivate"]
+          , [lifecycle, data, "deactivate"]
+          , function (er) { cb(er, data) }
+          )
+      })
     })
   })
 }
diff --git a/lib/uninstall.js b/lib/uninstall.js
index 7d614e781..72741ebcb 100644
--- a/lib/uninstall.js
+++ b/lib/uninstall.js
@@ -17,6 +17,7 @@ var rm = require("./utils/rm-rf")
   , readInstalled = require("./utils/read-installed")
   , mkdir = require("./utils/mkdir-p")
   , asyncMap = require("./utils/async-map")
+  , loadPackageDefaults = require("./utils/load-package-defaults")
 
 function uninstall (args, cb) {
 
@@ -54,12 +55,15 @@ function unpackArgs (rawArgs, cb) {
       readJson( jsonFile
               , arg[1]
               , function (er, data) {
-                  if (er) return cb(er)
-                  data.version = arg[1]
-                  data._id = data.name+"-"+data.version
-                  argData.push(data)
-                  argData[data._id] = data
-                  R(args.pop())
+                if (er) return cb(er)
+                  loadPackageDefaults(data, function (er, data) {
+                    if (er) return cb(er)
+                    data.version = arg[1]
+                    data._id = data.name+"-"+data.version
+                    argData.push(data)
+                    argData[data._id] = data
+                    R(args.pop())
+                  })
                 }
               )
     })(args.pop())