Skip to content

Commit 61cd0ba

Browse files
committed
Improve boot of addons
1 parent 980ad07 commit 61cd0ba

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

core/cb.addons/main.js

+15-11
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,11 @@ function setup(options, imports, register, app) {
119119
var command = rjs+" -o baseUrl="+addonPath+" paths.require-tools="+requiretoolsPath+" name="+main+" map.*.css=require-tools/css/css map.*.less=require-tools/less/less out="+output;
120120

121121
// Run optimization
122-
logger.log("Optimizing", addon.name, command);
123-
return Q.nfcall(exec, command).fail(function(err) {
122+
logger.log("Optimizing", addon.name);
123+
return Q.nfcall(exec, command).then(function() {
124+
logger.log("Finished", addon.name, "optimization");
125+
return Q(output);
126+
}, function(err) {
124127
logger.error("error for",addon.name);
125128
logger.exception(err, false);
126129
return Q.reject(err);
@@ -287,18 +290,19 @@ function setup(options, imports, register, app) {
287290
logger.exception(err, false);
288291
}).fin(optimzeClientsAddons).then(function() {
289292
return initNodeAddons()
290-
}).fail(function(err) {
293+
}).then(function() {
294+
logger.log("Addons are ready");
295+
register(null, {
296+
'addons': {
297+
'list': loadAddonsInfos,
298+
'install': installAddon,
299+
'uninstall': uninstallAddon
300+
}
301+
});
302+
}, function(err) {
291303
logger.error("Error with external node addons:");
292304
logger.exception(err);
293305
});
294-
295-
register(null, {
296-
'addons': {
297-
'list': loadAddonsInfos,
298-
'install': installAddon,
299-
'uninstall': uninstallAddon
300-
}
301-
});
302306
};
303307

304308
// Exports

core/cb.main/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"logger",
1111
"server",
1212
"workspace",
13-
"watch"
13+
"watch",
14+
"addons"
1415
]
1516
}
1617
}

0 commit comments

Comments
 (0)