Add complete client-side addons optimization (not stable)

Author: SamyPesse

addons/manager/models/addon.js

@@ -1,4 +1,4 @@
-define(function() {
+define([], function() {
     var hr = require("hr/hr");
     var addons = require("core/addons");
 

client/models/addon.js

@@ -35,9 +35,10 @@ define([
 
             logging.log("Load", this.get("name"));
             var context = "addon."+this.get("name");
+            var main = this.get("client.main", "client");
 
-            // Require context
-            var addonRequire = require.config({
+            // Require config
+            var addonRequireConfig = {
                 'context': context,
                 'baseUrl': this.url(),
                 'waitSeconds': 200,
@@ -46,12 +47,16 @@ define([
                     "require-tools": "/static/require-tools"
                 },
                 'map': {
-                  '*': {
-                    'css': 'require-tools/css/css',
-                    'less': 'require-tools/less/less'
-                  }
+                    '*': {
+                        'css': 'require-tools/css/css',
+                        'less': 'require-tools/less/less'
+                    }
                 }
-            });
+            };
+            addonRequireConfig.paths[main] = "addon-built";
+
+            // Require context
+            var addonRequire = require.config(addonRequireConfig);
 
             // Ressources
             hr.Resources.addNamespace(context+".templates", {
@@ -60,7 +65,7 @@ define([
             });
 
             // Load main module
-            addonRequire([this.get("client.main", "client")], function() {
+            addonRequire([main], function() {
                 d.resolve();
             });
 

core/cb.addons/main.js

@@ -85,7 +85,7 @@ function setup(options, imports, register, app) {
         var addonPath = path.resolve(addonsPath + '/' + addon.name + '/');
 
         // Path to the require-tools
-        var requiretoolsPath = path.resolve("../../client/build/static/require-tools");
+        var requiretoolsPath = path.resolve(__dirname, "../../client/build/static/require-tools");
 
         // Base main
         var main = addon.client.main;
@@ -94,9 +94,13 @@ function setup(options, imports, register, app) {
         var output = path.resolve(addonPath, "addon-built.js");
 
         var command = "r.js -o baseUrl="+addonPath+" paths.require-tools="+requiretoolsPath+" name="+main+" map.*.css=require-tools/css/css map.*.less=require-tools/less/less out="+output;
-        logger.log("command", command);
-        //return Q(command);
-        return Q.nfcall(exec, command);
+        
+        logger.log("Optimizing", addon.name);
+        return Q.nfcall(exec, command).fail(function(err) {
+            logger.error("error for",addon.name);
+            logger.exception(err, false);
+            return Q.reject(err);
+        });
     };
 
     // Initialize node addons
@@ -115,7 +119,6 @@ function setup(options, imports, register, app) {
         logger.log("Optimize client addons");
         return loadAddonsInfos().then(function(addons) {
             return Q.all(_.map(addons, function(addon) {
-                console.log(addon);
                 if (!isClientside(addon)) return;
                 return optimizeAddon(addon);
             }));