Merge browserify bundles to one file

Using the same convention as used for concat bundles, to prefix bundles
(i.e. tests in this case) to not be included in public assets dir

lib/build/files/browserify_concat_bundles.js

@@ -1,15 +0,0 @@
-// These bundles are expected to be used together with existing non-browerified code.
-// Define step here and add the "dest" value to a bundle defined in ./js_files.js
-module.exports = {
-  test_specs_for_browserify_modules: {
-    src: [
-      'lib/build/source-map-support.js',
-
-      // Add specs for browserify module code here:
-      'lib/assets/test/spec/cartodb/new_*/**/*.spec.js',
-      'lib/assets/test/spec/cartodb/account/**/*.spec.js',
-      'lib/assets/test/spec/cartodb/editor/**/*.spec.js'
-    ],
-    dest: '<%= browserify_modules.tests.dest %>'
-  }
-};

lib/build/files/browserify_files.js

@@ -47,5 +47,16 @@ module.exports = {
     src: [
       'lib/assets/javascripts/cartodb/editor.js'
     ]
+  },
+  _test_specs_for_browserify_modules: {
+    src: [
+      'lib/build/source-map-support.js',
+
+      // Add specs for browserify module code here:
+      'lib/assets/test/spec/cartodb/new_*/**/*.spec.js',
+      'lib/assets/test/spec/cartodb/account/**/*.spec.js',
+      'lib/assets/test/spec/cartodb/editor/**/*.spec.js'
+    ],
+    dest: '<%= browserify_modules.tests.dest %>'
   }
 };

lib/build/tasks/browserify.js

@@ -1,44 +1,37 @@
-// Using proposed solution for alias mappings from official docs, see https://github.com/jmreidy/grunt-browserify#alias
-var entryBundles = require('../files/browserify_entry_bundles');
-var concatBundles = require('../files/browserify_concat_bundles');
+var bundles = require('../files/browserify_files');
 
 module.exports = {
   task: function() {
     var cfg = {};
-    [
-      entryBundles,
-      concatBundles
-    ].forEach(function(bundles) {
-      for (var name in bundles) {
-        var bundle = bundles[name];
+    for (var name in bundles) {
+      var bundle = bundles[name];
 
-        var options = {
-          transform: [],
+      var options = {
+        transform: [],
 
-          // enables watchify when grunt is run with a watch task, e.g. `grunt dev`
-          // must be evaluated lazily (using template var) to allow override by setConfig task.
-          watch:     '<%= env.browserify_watch %>',
-
-          browserifyOptions: {
-            // if true will include source maps
-            // must be evaluated lazily (using template var) to allow override by setConfig task.
-            debug: '<%= env.browserify_debug %>'
-          }
-        };
+        // enables watchify when grunt is run with a watch task, e.g. `grunt dev`
+        // must be evaluated lazily (using template var) to allow override by setConfig task.
+        watch: '<%= env.browserify_watch %>',
 
-        if (bundle.options) {
-          if (bundle.options.transform) {
-            options.transform = options.transform.concat(bundle.options.transform);
-          }
+        browserifyOptions: {
+          // if true will include source maps
+          // must be evaluated lazily (using template var) to allow override by setConfig task.
+          debug: '<%= env.browserify_debug %>'
         }
+      };
 
-        cfg[name] = {
-          options: options,
-          src: bundle.src,
-          dest: bundle.dest || '<%= assets_dir %>/javascripts/' + name +'.js'
+      if (bundle.options) {
+        if (bundle.options.transform) {
+          options.transform = options.transform.concat(bundle.options.transform);
         }
       }
-    });
+
+      cfg[name] = {
+        options: options,
+        src: bundle.src,
+        dest: bundle.dest || ('<%= assets_dir %>/javascripts/' + name + '.js')
+      }
+    }
 
     return cfg;
   }

lib/build/tasks/connect.js

@@ -1,7 +1,3 @@
-// Using proposed solution for alias mappings from official docs, see https://github.com/jmreidy/grunt-browserify#alias
-var entryBundles = require('../files/browserify_entry_bundles');
-var concatBundles = require('../files/browserify_concat_bundles');
-
 module.exports = {
   task: function() {
     return {

lib/build/tasks/uglify.js

@@ -1,5 +1,5 @@
-var js_files = require('../files/js_files');
-var browserifyBundles = require('../files/browserify_entry_bundles');
+var jsBundles = require('../files/js_files');
+var browserifyBundles = require('../files/browserify_files');
 
 module.exports = {
   task: function() {
@@ -15,8 +15,8 @@ module.exports = {
     }
 
     // Bundle definitions, concat'ed and uglified in one go
-    for (var bundleName in js_files) {
-      var src = js_files[bundleName];
+    for (var bundleName in jsBundles) {
+      var src = jsBundles[bundleName];
       if (bundleName[0] !== '_' && bundleName !== 'all') {
         js['<%= assets_dir %>/javascripts/' + bundleName + '.js'] = src;
       }