CB-9036 fixed browserify cordova requires

Author: stevengill

cordova-lib/src/plugman/prepare-browserify.js

@@ -214,16 +214,16 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
                 // Handles clobbers and merges
                 // Writes needed requires to cordovaRequires Array
                 // which gets written to cordova_requires.js which
-                // gets added to the browserify build
+                // gets added to the browserify bundle.
                 var namespace;
                 module.clobbers.forEach(function(child) {
-                    namespace = prepareNamespace(child.target, 'c');
-                    if(cordovaRequires.indexOf(namespace) !== -1) {
+                    namespace = prepareNamespace(child.target, true, scriptPath);
+                    if(cordovaRequires.indexOf(namespace) === -1) {
                         cordovaRequires.push(namespace);
                     }
                 });
                 module.merges.forEach(function(child) {
-                    namespace = prepareNamespace(child.target, 'm');
+                    namespace = prepareNamespace(child.target, false, scriptPath);
                     if(cordovaRequires.indexOf(namespace) === -1) {
                         cordovaRequires.push(namespace);
                     }
@@ -239,17 +239,20 @@ module.exports = function handlePrepare(project_dir, platform, plugins_dir, www_
         events.emit('verbose', 'Writing out cordova_plugins.js...');
         fs.writeFileSync(path.join(wwwDir, 'cordova_plugins.js'), cordova_plugins, 'utf8');  
 
+        //Write out cordova_requires.js. 
         if(cordovaRequires.length > 0) {
             var cordovaRequiresString = cordovaRequires.join('\n');
             events.emit('verbose', 'Writing out cordova_requires.js...');
             fs.writeFileSync(path.join(wwwDir, 'cordova_requires.js'), cordovaRequiresString, 'utf8');
-            //add it to browserify
+            //add it to the browserify bundle
             libraryRelease.add(path.join(wwwDir, 'cordova_requires.js'));
         }
-
+        
+        //run transforms on plugin files
         libraryRelease.transform(requireTr.transform);
 
         scripts.forEach(function(script) {
+            //add every plugin javascript file to browserify bundle
             libraryRelease.add(script);
         });
 

cordova-lib/src/plugman/util/prepare-namespace.js

@@ -20,12 +20,17 @@
 
 var util = require('util');
 
-// FIXME this is extremely guettho
+/**
+ * Used to handle plugin merges and clobbers
+ * @param {string} target - target namespace to clobber or merge with
+ * @param {boolean} doClobber - Determines if clobbers or merges. Clobbers if true.
+ * @param {string} scriptPath - Path to the javascript file
+ */
 module.exports = prepare_namespace;
-function prepare_namespace(target, method) {
+
+function prepare_namespace(target, doClobber, scriptPath) {
     var old = target;
     target = target.replace(/^window(\.)?/, '');
-
     var lastDot = target.lastIndexOf('.');
     var lastName = target.substr(lastDot + 1);
     var props = target.split('.');
@@ -37,24 +42,22 @@ function prepare_namespace(target, method) {
             code += util.format('window.%s = window.%s || {};\n', sub, sub);
         }
     }
-
     props.unshift('window');
     var object = props.slice(0, props.length - 1).join('.');
-    //  code = '\n';
-    if(method === 'c') {
+    if(doClobber === true) {
         return util.format(
-                "%s\nrequire('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', module.exports);",
+                "%s\n;require('cordova/builder').assignOrWrapInDeprecateGetter(%s, '%s', require('%s'));",
                 code,
                 object,
-                lastName
+                lastName,
+                scriptPath
                 );
-    } else if(method === 'm' && old !== '') {
+    } else if(old !== '') {
         return util.format(
-                "%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
+                "%s\n;require('cordova/builder').recursiveMerge(%s, require('%s'));",
                 code,
-                old
+                old,
+                scriptPath
                 );
-    } else {
-        return '// no clobber or merges';
     }
 }