diff --git a/plugins/c9.ide.ace.emmet/emmet.js b/plugins/c9.ide.ace.emmet/emmet.js
index 8b1a9701..2be6e73b 100644
--- a/plugins/c9.ide.ace.emmet/emmet.js
+++ b/plugins/c9.ide.ace.emmet/emmet.js
@@ -12,7 +12,12 @@ define(function(require, exports, module) {
var menus = imports.menus;
var emmetExt = require("ace/ext/emmet");
- emmetExt.setCore("lib/emmet/emmet");
+ emmetExt.load = function(callback) {
+ require(["lib/emmet/emmet"], function(m) {
+ emmetExt.setCore(m);
+ callback && callback();
+ });
+ };
emmetExt.updateCommands = function() {};
/***** Initialization *****/
diff --git a/plugins/c9.static/build.js b/plugins/c9.static/build.js
index dff22a5a..31f44e83 100644
--- a/plugins/c9.static/build.js
+++ b/plugins/c9.static/build.js
@@ -225,7 +225,7 @@ function main(options, imports, register) {
compress: compress,
filter: [],
ignore: [],
- additional: compileForNode || [{
+ additional: compileForNode ? [] : [{
id: module,
noDeps: true
}],
diff --git a/plugins/c9.static/cdn.cli.js b/plugins/c9.static/cdn.cli.js
index 4625ff8c..178bc1b7 100644
--- a/plugins/c9.static/cdn.cli.js
+++ b/plugins/c9.static/cdn.cli.js
@@ -11,6 +11,8 @@ define(function(require, exports, module) {
var path = require("path");
var mkdirp = require("mkdirp");
var async = require("async");
+
+ var moduleDeps = require("architect-build/module-deps");
var root = path.join(build.cacheDir, build.version);
@@ -58,7 +60,7 @@ define(function(require, exports, module) {
sources: result.sources,
config: [],
}, skin, pathConfig, save(["skin", config, skin + ".css"], next));
- })(err, result)
+ })(err, result);
}, function(configName, data) {
var pluginPaths = data.map(function(p) {
return typeof p == "string" ? p : p.packagePath;
@@ -139,6 +141,22 @@ define(function(require, exports, module) {
nameParts[0] += "/" + options.compressOutputDirPrefix;
writeFile(nameParts, code, done);
}
+
+ if (result.sources) {
+ pending++;
+ async.forEach(result.sources, function(pkg, next) {
+ var deps = moduleDeps.getSubmodules(pkg.source, pkg.id);
+ if (pkg.submodules)
+ deps = deps.concat(pkg.submodules);
+ if (!deps.length)
+ return next();
+
+ async.forEach(deps, function(moduleName, next) {
+ console.log(moduleName, pkg.id);
+ build.buildModule(moduleName, pathConfig, save(["modules", moduleName + ".js"], next));
+ }, next);
+ }, done);
+ }
};
}
diff --git a/plugins/c9.vfs.standalone/www/test.html b/plugins/c9.vfs.standalone/www/test.html
index 54905b9b..9e0c2cfb 100644
--- a/plugins/c9.vfs.standalone/www/test.html
+++ b/plugins/c9.vfs.standalone/www/test.html
@@ -10,15 +10,15 @@
font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
padding: 60px 50px;
}
-
+
+
+
+
-
-
-