From f5cde69fed01ceffcc039dfc344ecd7068d62e93 Mon Sep 17 00:00:00 2001
From: Matthew Arbesfeld <arbesfeld@gmail.com>
Date: Mon, 11 Aug 2014 15:16:52 -0700
Subject: [PATCH] Change cordovaDependencies management in bundler

---
 tools/bundler.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/bundler.js b/tools/bundler.js
index e1778149f9..0f1a2e6ce2 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1484,12 +1484,11 @@ var writeTargetToPath = function (name, target, outputPath, options) {
 
   builder.complete();
 
-  _.extend(options.cordovaDependencies, target.cordovaDependencies);
-
   return {
     name: name,
     arch: target.mostCompatibleArch(),
     path: path.join('programs', name, relControlFilePath),
+    cordovaDependencies: target.cordovaDependencies
   };
 };
 
@@ -1584,14 +1583,15 @@ var writeSiteArchive = function (targets, outputPath, options) {
     });
 
     _.each(targets, function (target, name) {
-      json.programs.push(writeTargetToPath(name, target, builder.buildPath, {
+      var targetJson = writeTargetToPath(name, target, builder.buildPath, {
         includeNodeModulesSymlink: options.includeNodeModulesSymlink,
         builtBy: options.builtBy,
         controlProgram: options.controlProgram,
         releaseName: options.releaseName,
-        getRelativeTargetPath: options.getRelativeTargetPath,
-        cordovaDependencies: json.cordovaDependencies
-      }));
+        getRelativeTargetPath: options.getRelativeTargetPath
+      });
+      json.programs.push(_.omit(targetJson, 'cordovaDependencies'));
+      _.extend(json.cordovaDependencies, targetJson.cordovaDependencies);
     });
 
     // Control file
@@ -1949,8 +1949,7 @@ exports.bundle = function (options) {
       builtBy: builtBy,
       controlProgram: controlProgram,
       releaseName: releaseName,
-      getRelativeTargetPath: getRelativeTargetPath,
-      cordovaDependencies: {}
+      getRelativeTargetPath: getRelativeTargetPath
     };
 
     if (options.hasCachedBundle) {