Improving speed

Gruntfile.js

@@ -201,7 +201,7 @@
 
       // configure copy app to only run on changed file
       var files = grunt.config.get('copy.app.files');
-      for (var i = 0; i < files.length; ++i) {
+      for (var i = 0, l = files.length; i < l; ++i) {
         var cfg = grunt.config.get('copy.app.files.' + i);
         if (filepath.indexOf(cfg.cwd) !== -1) {
           grunt.config('copy.app.files.' + i + '.src', filepath.replace(cfg.cwd, ''));
@@ -212,7 +212,7 @@
 
       // configure copy js_core_cartodb3 to only run on changed file
       var files = grunt.config.get('copy.js_core_cartodb3.files');
-      for (var i = 0; i < files.length; ++i) {
+      for (var i = 0, l = files.length; i < l; ++i) {
         var cfg = grunt.config.get('copy.js_core_cartodb3.files.' + i);
         if (filepath.indexOf(cfg.cwd) !== -1) {
           grunt.config('copy.js_core_cartodb3.files.' + i + '.src', filepath.replace(cfg.cwd, ''));
@@ -223,7 +223,7 @@
 
       // configure copy js_client_cartodb3 to only run on changed file
       var files = grunt.config.get('copy.js_client_cartodb3.files');
-      for (var i = 0; i < files.length; ++i) {
+      for (var i = 0, l = files.length; i < l; ++i) {
         var cfg = grunt.config.get('copy.js_client_cartodb3.files.' + i);
         if (filepath.indexOf(cfg.cwd) !== -1) {
           grunt.config('copy.js_client_cartodb3.files.' + i + '.src', filepath.replace(cfg.cwd, ''));

lib/build/tasks/copy.js

@@ -311,5 +311,4 @@
         }]
       }
     };
-
   };

lib/build/tasks/watch.js

@@ -3,29 +3,11 @@
    *  Watch/listen for assets
    */
 
-exports.task = function() {
-  var js_files = require('../files/js_files');
-  var js = [];
-  for(var f in js_files) {
-    js = js.concat(js_files[f]);
-  }
-
-  // watch cdb files
-  js.push(['lib/assets/javascripts/cdb/src/**/*.js']);
-
+exports.task = function () {
   return {
-    js: {
-      files: js,
-      tasks: ['cdb', 'concat:js', 'jst'],
-      options: {
-        spawn: false,
-        atBegin: true
-      }
-    },
     js_core_cartodb3: {
       files: [
-        'lib/assets/core/javascripts/cartodb3/**/*',
-        '!**/node_modules/**'
+        'lib/assets/core/javascripts/cartodb3/**/*'
       ],
       tasks: ['copy:js_core_cartodb3', 'copy:js_client'],
       options: {
@@ -65,8 +47,7 @@ exports.task = function() {
     },
     css: {
       files: [
-        'assets/stylesheets/**/*.css.scss',
-        'app/assets/stylesheets/**/*.css.scss',
+        'app/assets/stylesheets/editor-3/**/*.css.scss',
         'app/assets/client/stylesheets/**/*.css.scss'
       ],
       tasks: ['css'],
@@ -74,20 +55,6 @@ exports.task = function() {
         spawn: false,
         atBegin: false
       }
-    },
-    livereload: {
-      files: [
-        'public/assets/<%= pkg.version %>/stylesheets/*.css',
-        'public/assets/<%= pkg.version %>/javascripts/*.js',
-
-        // makes any open specrunner to re-run tests on test bundles generated by browserify
-        '.grunt/browserify_modules_tests.js',
-        '.grunt/cartodb3-specs.js'
-      ],
-      options: {
-        livereload: false
-      }
     }
   };
-
 };

package.json

@@ -60,7 +60,7 @@
     "grunt-contrib-jst": "git://github.com/javisantana/grunt-contrib-jst.git#master",
     "grunt-contrib-sass": "0.9.2",
     "grunt-contrib-uglify": "0.9.x",
-    "grunt-contrib-watch": "0.6.1",
+    "grunt-contrib-watch": "1.0.0",
     "grunt-exorcise": "2.1.0",
     "grunt-mustache": "0.1.7",
     "grunt-postcss": "0.5.5",
@@ -73,7 +73,7 @@
     "semistandard": "7.0.4",
     "source-map-support": "0.4.0",
     "uglify-js": "2.4.x",
-    "watchify": "3.1.1"
+    "watchify": "3.7.0"
   },
   "browserify": {
     "transform": [