From fcb3331d695c07473e850bf7f51c51a6c2fbbc17 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 20 Jun 2014 02:26:10 +0400
Subject: [PATCH 1/6] remove special build version for bookmarklet

---
 Makefile.dryice.js                            |  27 ----
 ...{editor_textarea.html => bookmarklet.html} |  69 +++++-----
 lib/ace/ext/textarea.js                       | 118 +++++++-----------
 3 files changed, 79 insertions(+), 135 deletions(-)
 rename build_support/{editor_textarea.html => bookmarklet.html} (62%)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 19ba9192..f0f1f391 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -69,8 +69,6 @@ function main(args) {
             ace();
         } else if (type == "demo") {
             demo();
-        } else if (type == "bm") {
-            bookmarklet();
         } else if (type == "full") {
             demo(ace());
             bookmarklet();
@@ -98,7 +96,6 @@ function main(args) {
     console.log("  minimal      Places necessary Ace files out in build dir; uses configuration flags below [default]");
     console.log("  normal       Runs four Ace builds--minimal, minimal-noconflict, minimal-min, and minimal-noconflict-min");
     console.log("  demo         Runs demo build of Ace");
-    console.log("  bm           Runs bookmarklet build of Ace");
     console.log("  full         all of above");
     console.log("  highlighter  ");
     console.log("args:");
@@ -113,30 +110,6 @@ function main(args) {
         console.log(" output generated in " + type + __dirname + "/" + BUILD_DIR)
 }
 
-function bookmarklet() {
-    var targetDir = BUILD_DIR + "/textarea";
-    copy({
-        source: "build_support/editor_textarea.html",
-        dest:   targetDir + '/editor.html'
-    });
-    copy({
-        source: "build_support/style.css",
-        dest:   targetDir + '/style.css'
-    });
-
-    buildAce({
-        targetDir: targetDir + "/src",
-        ns: "__ace_shadowed__",
-        exportModule: "ace/ext/textarea",
-        compress: false,
-        noconflict: true,
-        suffix: "",
-        name: "ace-bookmarklet",
-        workers: [],
-        keybindings: []
-    });
-}
-
 function ace() {
     console.log('# ace ---------');
 
diff --git a/build_support/editor_textarea.html b/build_support/bookmarklet.html
similarity index 62%
rename from build_support/editor_textarea.html
rename to build_support/bookmarklet.html
index bb691c11..f3d95ee7 100644
--- a/build_support/editor_textarea.html
+++ b/build_support/bookmarklet.html
@@ -20,7 +20,7 @@ function foo() {
     var bar = true;
 }</textarea><br>
         SourceUrl: <br>
-        <input id="srcURL" style="width:300px" value="http://ajaxorg.github.com/ace-builds/textarea/src/"></input><br>
+        <input id="srcURL" style="width:300px" value="http://ajaxorg.github.com/ace-builds/src-noconflict"></input><br>
         <button id="buBuild">Build Link</button> <br> <a href="#"></a>
         <a href="https://github.com/ajaxorg/ace/">
             <div class="fork_on_github" ></div>
@@ -49,63 +49,60 @@ function foo() {
 
 <script>
 
-function inject(callback) {
-    var baseUrl = "src/";
+function inject(options, callback) {
+    var baseUrl = options.baseUrl || "../../src-noconflict";
     
-    var load = window.__ace_loader__ = function(path, module, callback) {
+    var load = function(path, callback) {
         var head = document.getElementsByTagName('head')[0];
         var s = document.createElement('script');
-    
-        s.src = baseUrl + path;
+
+        s.src = baseUrl + "/" + path;
         head.appendChild(s);
-        
-        s.onload = function() {
-            window.__ace_shadowed__.require([module], callback);
+
+        s.onload = s.onreadystatechange = function(_, isAbort) {
+            if (isAbort || !s.readyState || s.readyState == "loaded" || s.readyState == "complete") {
+                s = s.onload = s.onreadystatechange = null;
+                if (!isAbort)
+                    callback();
+            }
         };
     };
 
-    load('ace-bookmarklet.js', "ace/ext/textarea", function() {
-        var ace = window.__ace_shadowed__;
-        
-        ace.options.mode = "javascript";
-        var Event = ace.require("ace/lib/event");
-        var areas = document.getElementsByTagName("textarea");
-        for (var i = 0; i < areas.length; i++) {
-            Event.addListener(areas[i], "click", function(e) {
-                if (e.detail == 3) {
-                    ace.transformTextarea(e.target, load);
-                }
-            });
-        }
-        callback && callback();
+    load("ace.js", function() {
+        ace.config.loadModule("ace/ext/textarea", function() {
+            var event = ace.require("ace/lib/event");
+            var areas = document.getElementsByTagName("textarea");
+            for (var i = 0; i < areas.length; i++) {
+                event.addListener(areas[i], "click", function(e) {
+                    if (e.detail == 3) {
+                        ace.transformTextarea(e.target, options.ace);
+                    }
+                });
+            }
+            callback && callback();
+        });
     });
 }
 
 // Call the inject function to load the ace files.
 var textAce;
-inject(function () {
-    // Transform the textarea on the page into an ace editor.
-    var ace = window.__ace_shadowed__;
+inject({}, function () {
+    // Transform the textarea on the page into an ace editor.    
     var t = document.querySelector("textarea");
-    textAce = ace.transformTextarea(t, window.__ace_loader__);
+    textAce = ace.require("ace/ext/textarea").transformTextarea(t);
     setTimeout(function(){textAce.setDisplaySettings(true)});
 });
 
 
 document.getElementById("buBuild").onclick = function() {
     var injectSrc = inject.toString().split("\n").join("");
-    injectSrc = injectSrc.replace('baseUrl = "src/"', 'baseUrl="' + document.getElementById("srcURL").value + '"');
-
-    var aceOptions = textAce.getOptions();
-    var opt = [];
-    for (var option in aceOptions) {
-        opt.push(option + ":'" + aceOptions[option] + "'");
-    }
-    injectSrc = injectSrc.replace('ace.options.mode = "javascript"', 'ace.options = { ' + opt.join(",") + ' }');
     injectSrc = injectSrc.replace(/\s+/g, " ");
 
+    var options = textAce.getOptions();
+    options.baseUrl = document.getElementById("srcURL").value;
+
     var a = document.querySelector("a");
-    a.href = "javascript:(" + injectSrc + ")()";
+    a.href = "javascript:(" + injectSrc + ")(" + JSON.stringify(options) + ")";
     a.innerHTML = "Ace Bookmarklet Link";
 }
 
diff --git a/lib/ace/ext/textarea.js b/lib/ace/ext/textarea.js
index 86b299e6..c9972488 100644
--- a/lib/ace/ext/textarea.js
+++ b/lib/ace/ext/textarea.js
@@ -155,7 +155,7 @@ function setupContainer(element, getValue) {
     return container;
 }
 
-exports.transformTextarea = function(element, loader) {
+exports.transformTextarea = function(element, options) {
     var session;
     var container = setupContainer(element, function() {
         return session.getValue();
@@ -215,9 +215,8 @@ exports.transformTextarea = function(element, loader) {
     applyStyles(settingDiv, settingDivStyles);
     container.appendChild(settingDiv);
 
+    options = options || exports.defaultOptions;
     // Power up ace on the textarea:
-    var options = {};
-
     var editor = ace.edit(editorDiv);
     session = editor.getSession();
 
@@ -228,10 +227,10 @@ exports.transformTextarea = function(element, loader) {
     container.appendChild(settingOpener);
 
     // Create the API.
-    setupApi(editor, editorDiv, settingDiv, ace, options, loader);
+    setupApi(editor, editorDiv, settingDiv, ace, options, load);
 
     // Create the setting's panel.
-    setupSettingPanel(settingDiv, settingOpener, editor, options);
+    setupSettingPanel(settingDiv, settingOpener, editor);
 
     var state = "";
     event.addListener(settingOpener, "mousemove", function(e) {
@@ -296,37 +295,15 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
     };
 
     editor.$setOption = editor.setOption;
+    editor.$getOption = editor.getOption;
     editor.setOption = function(key, value) {
-        if (options[key] == value) return;
-
         switch (key) {
             case "mode":
-                if (value != "text") {
-                    // Load the required mode file. Files get loaded only once.
-                    loader("mode-" + value + ".js", "ace/mode/" + value, function() {
-                        var aceMode = require("../mode/" + value).Mode;
-                        session.setMode(new aceMode());
-                    });
-                } else {
-                    session.setMode(new (require("../mode/text").Mode));
-                }
+                editor.$setOption("mode", "ace/mode/" + value)
             break;
-
             case "theme":
-                if (value != "textmate") {
-                    // Load the required theme file. Files get loaded only once.
-                    loader("theme-" + value + ".js", "ace/theme/" + value, function() {
-                        editor.setTheme("ace/theme/" + value);
-                    });
-                } else {
-                    editor.setTheme("ace/theme/textmate");
-                }
+                editor.$setOption("theme", "ace/theme/" + value)
             break;
-
-            case "fontSize":
-                editorDiv.style.fontSize = value;
-            break;
-
             case "keybindings":
                 switch (value) {
                     case "vim":
@@ -341,58 +318,55 @@ function setupApi(editor, editorDiv, settingDiv, ace, options, loader) {
             break;
 
             case "softWrap":
-                switch (value) {
-                    case "off":
-                        session.setUseWrapMode(false);
-                        renderer.setPrintMarginColumn(80);
-                    break;
-                    case "40":
-                        session.setUseWrapMode(true);
-                        session.setWrapLimitRange(40, 40);
-                        renderer.setPrintMarginColumn(40);
-                    break;
-                    case "80":
-                        session.setUseWrapMode(true);
-                        session.setWrapLimitRange(80, 80);
-                        renderer.setPrintMarginColumn(80);
-                    break;
-                    case "free":
-                        session.setUseWrapMode(true);
-                        session.setWrapLimitRange(null, null);
-                        renderer.setPrintMarginColumn(80);
-                    break;
-                }
+            case "fontSize":
+                editor.$setOption(key, value);
             break;
             
             default:
                 editor.$setOption(key, toBool(value));
         }
-
-        options[key] = value;
     };
 
     editor.getOption = function(key) {
-        return options[key];
+        switch (key) {
+            case "mode":
+                return editor.$getOption("mode").substr("ace/mode/".length)
+            break;
+
+            case "theme":
+                return editor.$getOption("theme").substr("ace/theme/".length)
+            break;
+
+            case "keybindings":
+                var value = editor.getKeyboardHandler()
+                switch (value && value.$id) {
+                    case "ace/keyboard/vim":
+                        return "vim";
+                    case "ace/keyboard/emacs":
+                        return "emacs";
+                    default:
+                        return "ace";
+                }
+            break;
+
+            default:
+                return editor.$getOption(key);
+        }
     };
 
-    editor.getOptions = function() {
-        return options;
-    };
-
-    editor.setOptions(exports.options);
-
+    editor.setOptions(options);
     return editor;
 }
 
-function setupSettingPanel(settingDiv, settingOpener, editor, options) {
+function setupSettingPanel(settingDiv, settingOpener, editor) {
     var BOOL = null;
 
     var desc = {
         mode:            "Mode:",
-        gutter:          "Display Gutter:",
+        wrap:            "Soft Wrap:",
         theme:           "Theme:",
         fontSize:        "Font Size:",
-        softWrap:        "Soft Wrap:",
+        showGutter:      "Display Gutter:",
         keybindings:     "Keyboard",
         showPrintMargin: "Show Print Margin:",
         useSoftTabs:     "Use Soft Tabs:",
@@ -445,7 +419,7 @@ function setupSettingPanel(settingDiv, settingOpener, editor, options) {
             twilight:         "Twilight",
             vibrant_ink:      "Vibrant Ink"
         },
-        gutter: BOOL,
+        showGutter: BOOL,
         fontSize: {
             "10px": "10px",
             "11px": "11px",
@@ -453,7 +427,7 @@ function setupSettingPanel(settingDiv, settingOpener, editor, options) {
             "14px": "14px",
             "16px": "16px"
         },
-        softWrap: {
+        wrap: {
             off:    "Off",
             40:     "40",
             80:     "80",
@@ -476,7 +450,7 @@ function setupSettingPanel(settingDiv, settingOpener, editor, options) {
         if (!obj) {
             builder.push(
                 "<input type='checkbox' title='", option, "' ",
-                    cValue == "true" ? "checked='true'" : "",
+                    cValue + "" == "true" ? "checked='true'" : "",
                "'></input>"
             );
             return;
@@ -496,10 +470,10 @@ function setupSettingPanel(settingDiv, settingOpener, editor, options) {
         builder.push("</select>");
     }
 
-    for (var option in options) {
+    for (var option in exports.defaultOptions) {
         table.push("<tr><td>", desc[option], "</td>");
         table.push("<td>");
-        renderOption(table, option, optionValues[option], options[option]);
+        renderOption(table, option, optionValues[option], editor.getOption(option));
         table.push("</td></tr>");
     }
     table.push("</table>");
@@ -532,12 +506,12 @@ function setupSettingPanel(settingDiv, settingOpener, editor, options) {
 }
 
 // Default startup options.
-exports.options = {
-    mode:               "text",
+exports.defaultOptions = {
+    mode:               "javascript",
     theme:              "textmate",
-    gutter:             "false",
+    wrap:               "off",
     fontSize:           "12px",
-    softWrap:           "off",
+    showGutter:         "false",
     keybindings:        "ace",
     showPrintMargin:    "false",
     useSoftTabs:        "true",

From d63863ac0cbc2d5387cb44ef3db6cc65c46ece6e Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Wed, 18 Jun 2014 23:37:00 +0400
Subject: [PATCH 2/6] use architect-build for building ace

---
 Makefile.dryice.js        | 888 ++++++++++++++++----------------------
 demo/requirejs+build.html |  20 +-
 package.json              |   2 +-
 3 files changed, 382 insertions(+), 528 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index f0f1f391..8bf54562 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -31,14 +31,13 @@
 
 var fs = require("fs");
 var path = require("path");
-if (!fs.existsSync)
-    fs.existsSync = path.existsSync;
-else
-    path.existsSync = fs.existsSync;
-var copy = require('dryice').copy;
+var copy = require('architect-build/copy');
+var build = require('architect-build/build');
+var async = require("asyncjs");
 
 var ACE_HOME = __dirname;
 var BUILD_DIR = ACE_HOME + "/build";
+var CACHE = {};
 
 function main(args) {
     if (args.indexOf("updateModes") !== -1) {
@@ -49,7 +48,7 @@ function main(args) {
         if (x[0] == "-" && x[1] != "-")
             return "-" + x;
         return x;
-    });
+    }).filter(Boolean);
 
     if (args[2] && (args[2][0] != "-" || args[2].indexOf("h") != -1))
         type = args[2];
@@ -70,26 +69,15 @@ function main(args) {
         } else if (type == "demo") {
             demo();
         } else if (type == "full") {
-            demo(ace());
-            bookmarklet();
+            ace();
+            demo();
         } else if (type == "highlighter") {
-            var project = buildAce({
-                coreOnly: true,
-                exportModule: "ace/ext/static_highlight",
-                requires: ["ace/ext/static_highlight", "ace/theme/textmate"],
-                readFilters: [copy.filter.moduleDefines, function(a) {
-                    console.log(a.substring(0, 2500))
-                    return a
-                }]
-            })
-            copy({
-                source: project.result,
-                filter: getWriteFilters(project.options, "main"),
-                dest:   BUILD_DIR + "/static_highlight.js"
-            });
+            // TODO
         }
     }
+}
 
+function showHelp(type) {
     console.log("--- Ace Dryice Build Tool ---");
     console.log("");
     console.log("Options:");
@@ -106,57 +94,23 @@ function main(args) {
     console.log("  --nc               namespace require");
     console.log("  --s                shrinkwrap (combines all output files into one)");
     console.log("");
-    if (BUILD_DIR)
-        console.log(" output generated in " + type + __dirname + "/" + BUILD_DIR)
+    if (type)
+        console.log("  output for " + type + " generated in " + BUILD_DIR);
 }
 
 function ace() {
-    console.log('# ace ---------');
-
-    // uncompressed
-    var project = buildAce({
-        compress: false,
-        noconflict: false
-    });
-    buildAce({
-        compress: false,
-        noconflict: true
-    });
-
-    // compressed
-    buildAce({
-        compress: true,
-        noconflict: false
-    });
-    buildAce({
-        compress: true,
-        noconflict: true
-    });
-
     console.log('# ace License | Readme | Changelog ---------');
 
-    copy({
-        source: ACE_HOME + "/build_support/editor.html",
-        dest:   BUILD_DIR + "/editor.html"
-    });
-    copy({
-        source: ACE_HOME + "/LICENSE",
-        dest:   BUILD_DIR + "/LICENSE"
-    });
-    copy({
-        source: ACE_HOME + "/ChangeLog.txt",
-        dest:   BUILD_DIR + "/ChangeLog.txt"
-    });
-
-    return project;
+    copy.file(ACE_HOME + "/build_support/editor.html",  BUILD_DIR + "/editor.html");
+    copy.file(ACE_HOME + "/LICENSE", BUILD_DIR + "/LICENSE");
+    copy.file(ACE_HOME + "/ChangeLog.txt", BUILD_DIR + "/ChangeLog.txt");
+    
+    console.log('# ace ---------');
+    for (var i = 0; i < 4; i++)
+        buildAce({compress: i & 2, noconflict: i & 1});
 }
 
-function demo(project) {
-    project = project || buildAce({
-        compress: false,
-        noconflict: false,
-        coreOnly: true
-    });
+function demo() {
     console.log('# kitchen sink ---------');
 
     var version, ref;
@@ -177,88 +131,63 @@ function demo(project) {
             .replace("%version%", version)
             .replace("%commit%", ref)
         );
-    };
+    }
 
     function fixDocPaths(data) {
         return data.replace(/"(demo|build)\//g, "\"");
     }
 
-    copy({
-        source: ACE_HOME + "/kitchen-sink.html",
-        dest:   BUILD_DIR + "/kitchen-sink.html",
-        filter: [changeComments, fixDocPaths]
+    copy(ACE_HOME + "/demo/kitchen-sink", BUILD_DIR + "/kitchen-sink", {
+        shallow: true,
+        replace: [changeComments, fixDocPaths],
+        include: /\.(css|html)$/
     });
-
-    copy({
-        source: ACE_HOME + "/demo/kitchen-sink/styles.css",
-        dest:   BUILD_DIR + "/kitchen-sink/styles.css",
-        filter: [ changeComments ]
-    });
-
-    fs.readdirSync(ACE_HOME +"/demo/kitchen-sink/docs/").forEach(function(x) {
-        copy({
-            source: ACE_HOME +"/demo/kitchen-sink/docs/" + x,
-            dest:   BUILD_DIR + "/kitchen-sink/docs/" + x
-        });
-    });
-
-    var demo = copy.createDataObject();
-
-    project.assumeAllFilesLoaded();
-    copy({
-        source: [{
-            project: cloneProject(project),
-            require: [ "kitchen-sink/demo" ]
-        }],
-        filter: getWriteFilters({filters:[fixDocPaths]}, "demo"),
-        dest: demo
-    });
-
-    copy({
-        source: demo,
-        dest:   BUILD_DIR + "/kitchen-sink/demo.js",
-    });
-
-    copyFileSync(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
     
-    fs.readdirSync(ACE_HOME + "/demo/").forEach(function(x) {        
-        if (/\s|requirejs/.test(x) || !/\.(js|html)$/.test(x))
-            return;        
-        copy({
-            source: ACE_HOME +"/demo/" + x,
-            dest:   BUILD_DIR + "/demo/" + x,
-            filter: [function(source) {
-                if (/\.(js)$/.test(x)) 
-                    return source;
-                var removeRequireJS
-                source = source.replace(/<script src="kitchen-sink\/require.js"[\s\S]+?require\(\[([^\]]+).*/, function(e, m){
-                    removeRequireJS = true;
-                    var scripts = m.split(/,\s*/);
-                    var result = [];
-                    function comment(str) {result.push("<!-- " + str + " -->")};
-                    function script(str) {result.push('<script src="../src/' + str + '.js"></script>')}
-                    scripts.forEach(function(s) {
-                        s = s.replace(/"/g, "");
-                        if (s == "ace/ace") {
-                            comment("load ace")
-                            script("ace")
-                        } else {
-                            var extName = s.match(/[^/]*$/)[0];
-                            comment("load ace " + extName + " extension");
-                            script("ext-" + extName);
-                        }
-                    });
-                    result.push("<script>")
-                    return result.join("\n");
-                });
-                if (removeRequireJS)
-                    source = source.replace(/\s*\}\);?\s*(<\/script>)/, "\n$1");
-                source = source.replace(/"\.\.\/build\//g, function(e) {
-                    console.log(e); return '"../';
-                });
+    copy(ACE_HOME +"/demo/kitchen-sink/docs/", BUILD_DIR + "/kitchen-sink/docs/");
+    
+    copy.file(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
+
+    buildSubmodule({}, {
+        require: ["kitchen-sink/demo"],
+        filters: [fixDocPaths],
+        projectType: "demo"
+    }, BUILD_DIR + "/kitchen-sink/demo");
+
+    copy(ACE_HOME + "/demo/", BUILD_DIR + "/demo/", {
+        shallow: true,
+        exclude: /\s|requirejs/,
+        include: /\.(js|html)$/,
+        replace: function(source) {
+            if (!/^\s*</.test(source))
                 return source;
-            }]
-        });
+            var removeRequireJS;
+            source = source.replace(/<script src="kitchen-sink\/require.js"[\s\S]+?require\(\[([^\]]+).*/, function(e, m) {
+                removeRequireJS = true;
+                var scripts = m.split(/,\s*/);
+                var result = [];
+                function comment(str) {result.push("<!-- " + str + " -->")}
+                function script(str) {result.push('<script src="../src/' + str + '.js"></script>')}
+                scripts.forEach(function(s) {
+                    s = s.replace(/"/g, "");
+                    if (s == "ace/ace") {
+                        comment("load ace");
+                        script("ace");
+                    } else {
+                        var extName = s.match(/[^/]*$/)[0];
+                        comment("load ace " + extName + " extension");
+                        script("ext-" + extName);
+                    }
+                });
+                result.push("<script>");
+                return result.join("\n");
+            });
+            if (removeRequireJS)
+                source = source.replace(/\s*\}\);?\s*(<\/script>)/, "\n$1");
+            source = source.replace(/"\.\.\/build\//g, function(e) {
+                console.log(e); return '"../';
+            });
+            return source;
+        }
     });
 }
 
@@ -270,7 +199,7 @@ function jsFileList(path, filter) {
     return fs.readdirSync(path).map(function(x) {
         if (x.slice(-3) == ".js" && !filter.test(x) && !/\s/.test(x))
             return x.slice(0, -3);
-    }).filter(function(x){ return !!x });
+    }).filter(Boolean);
 }
 
 function workers(path) {
@@ -279,387 +208,266 @@ function workers(path) {
             return x.slice(0, -7);
     }).filter(function(x) { return !!x; });
 }
+
 function modeList() {
-    return jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour|completions/)
+    return jsFileList("lib/ace/mode", /_highlight_rules|_test|_worker|xml_util|_outdent|behaviour|completions/);
 }
 
-function addSuffix(options) {
-    if (options.suffix == null) {
-        options.suffix = "";
-        if (options.compress)
-            options.suffix += "-min";
-        if (options.noconflict)
-            options.suffix += "-noconflict";
-    }
-}
-
-function getWriteFilters(options, projectType, main) {
-    var filters = [
-        copy.filter.moduleDefines,
-        removeUseStrict,
-        removeLicenceComments,
-        inlineTextModules
-    ];
-
-    if (options.filters)
-        filters = filters.concat(options.filters);
-
-    if (options.noconflict)
-        filters.push(namespace(options.ns));
-       
-    if (options.exportModule && projectType == "main" || projectType == "ext") {
-        filters.push(exportAce(options.ns, options.exportModule,
-            options.noconflict ? options.ns : "", projectType == "ext" && main));
-    }
-    
-    if (options.compress)
-        filters.push(copy.filter.uglifyjs);
-    
-    // copy.filter.uglifyjs.options.ascii_only = true; doesn't work with some uglify.js versions
-    filters.push(function(text) {
-        var text = text.replace(/[\x00-\x08\x0b\x0c\x0e\x19\x80-\uffff]/g, function(c) {
-            c = c.charCodeAt(0).toString(16);
-            if (c.length == 1)
-                return "\\x0" + c;
-            if (c.length == 2)
-                return "\\x" + c;
-            if (c.length == 3)
-                return "\\u0" + c;
-            return "\\u" + c;
-        });
-        return text; 
-    });
-    
-    return filters;
-}
-
-var buildAce = function(options) {
-    var aceProject = {
-        roots: [ACE_HOME + '/lib', ACE_HOME + '/demo'],
-        textPluginPattern: /^ace\/requirejs\/text!/
-    };
-
-    var defaults = {
-        targetDir: BUILD_DIR + "/src",
-        ns: "ace",
-        exportModule: "ace/ace",
-        requires: null,
-        compress: false,
-        noconflict: false,
-        suffix: null,
-        name: "ace",
-        modes: modeList(),
-        themes: jsFileList("lib/ace/theme"),
-        extensions: jsFileList("lib/ace/ext"),
-        workers: workers("lib/ace/mode"),
-        keybindings: ["vim", "emacs"],
-        readFilters: [copy.filter.moduleDefines]
-    };
-
-    for(var key in defaults)
-        if (!options.hasOwnProperty(key))
-            options[key] = defaults[key];
-
-    addSuffix(options);
-
-    if (!options.requires)
-        options.requires = [options.exportModule];
-
-    var targetDir = options.targetDir + options.suffix;
-    var name = options.name;
-
-    var project = copy.createCommonJsProject(aceProject);
-    project.options = options;
-    var ace = copy.createDataObject();
-    copy({
-        source: [ACE_HOME + "/build_support/mini_require.js"],
-        dest: ace
-    });
-    copy({
-        source: [{
-            project: project,
-            require: options.requires
-        }],
-        filter: options.readFilters,
-        dest: ace
-    });
-
-    if (options.coreOnly) {
-        project.result = ace;
-        return project;
-    }
-    copy({
-        source: ace,
-        filter: getWriteFilters(options, "main"),
-        dest:   targetDir + '/' + name + ".js"
-    });
-
-    console.log('# ace extensions ---------');
-
-    project.assumeAllFilesLoaded();
-    options.extensions.forEach(function(ext) {
-        console.log("extensions " + ext);
-        copy({
-            source: [{
-                project: cloneProject(project),
-                require: [ 'ace/ext/' + ext ]
-            }],
-            filter: getWriteFilters(options, "ext", 'ace/ext/' + ext),
-            dest:   targetDir + "/ext-" + ext + ".js"
-        });
-    });
-
-    console.log('# ace modes ---------');
-
-    project.assumeAllFilesLoaded();
-    options.modes.forEach(function(mode) {
-        console.log("mode " + mode);
-        addSnippetFile(mode, project, targetDir, options);
-        copy({
-            source: [{
-                project: cloneProject(project),
-                require: [ 'ace/mode/' + mode ]
-            }],
-            filter: getWriteFilters(options, "mode"),
-            dest:   targetDir + "/mode-" + mode + ".js"
-        });
-    });
-
-    console.log('# ace themes ---------');
-
-    project.assumeAllFilesLoaded();
-    delete project.ignoredModules["ace/theme/textmate"];
-    delete project.ignoredModules["ace/requirejs/text!ace/theme/textmate.css"];
-    
-    options.themes.forEach(function(theme) {
-        console.log("theme " + theme);
-        copy({
-            source: [{
-                project: cloneProject(project),
-                require: ["ace/theme/" + theme]
-            }],
-            filter: getWriteFilters(options, "theme"),
-            dest:   targetDir + "/theme-" + theme.replace("_theme", "") + ".js"
-        });
-    });
-    
-    // generateThemesModule(options.themes);
-
-    console.log('# ace key bindings ---------');
-
-    // copy key bindings
-    project.assumeAllFilesLoaded();
-    options.keybindings.forEach(function(keybinding) {
-        copy({
-            source: [{
-                project: cloneProject(project),
-                require: [ 'ace/keyboard/' + keybinding ]
-            }],
-            filter: getWriteFilters(options, "keybinding"),
-            dest: targetDir + "/keybinding-" + keybinding + ".js"
-        });
-    });
-
-    console.log('# ace worker ---------');
-
-    options.workers.forEach(function(mode) {
-        console.log("worker for " + mode + " mode");
-        var worker = copy.createDataObject();
-        var workerProject = copy.createCommonJsProject({
-            roots: [ ACE_HOME + '/lib' ],
-            textPluginPattern: /^ace\/requirejs\/text!/
-        });
-        copy({
-            source: [{
-                project: workerProject,
-                require: [
-                    'ace/worker/worker',
-                    'ace/mode/' + mode + '_worker'
-                ]
-            }],
-            filter: getWriteFilters(options, "worker"),
-            dest: worker
-        });
-        copy({
-            source: [
-                worker
-            ],
-            filter: options.compress ? [copy.filter.uglifyjs] : [],
-            dest: targetDir + "/worker-" + mode + ".js"
-        });
-    });
-
-
-    if (options.shrinkwrap) {
-        console.log('# combining files into one ---------');
-        copy({
-          source: { root:targetDir, exclude:/(^|\\|\/)worker\-[^\\\/]*\.js$/ },
-          dest: BUILD_DIR + '/ace-min.js'
-        });
-    }
-
-    return project;
-};
-
-// silence annoying messages from dryice
-var buildAce = function(fn) {
-    return function() {
-        var log = console.log
-        console.log = function() {
-            if (typeof arguments[0] == "string" && /Ignoring requirement/.test(arguments[0]))
-                return;
-            log.apply(console, arguments);
-        }
-        var ret = fn.apply(null, arguments);
-        console.log = log;
-        return ret;
-    }
-}(buildAce);
-
-var addSnippetFile = function(modeName, project, targetDir, options) {
-    var snippetFilePath = ACE_HOME + "/lib/ace/snippets/" + modeName;
-    if (!fs.existsSync(snippetFilePath + ".js")) {
-        copy({
-            source: ACE_HOME + "/tool/snippets.tmpl.js",
-            dest:   snippetFilePath + ".js",
-            filter: [
-                function(t) {return t.replace(/%modeName%/g, modeName);}
-            ]
-        });
-    }
-    if (!fs.existsSync(snippetFilePath + ".snippets")) {
-        fs.writeFileSync(snippetFilePath + ".snippets", "")
-    }
-    copy({
-        source: [{
-            project: cloneProject(project),
-            require: [ 'ace/snippets/' + modeName ]
-        }],
-        filter: getWriteFilters(options, "mode"),
-        dest:   targetDir + "/snippets/" + modeName + ".js"
-    });
-}
-
-var textModules = {}
-var detectTextModules = function(input, source) {
-    if (!source)
-        throw new Error('Missing filename for text module');
-
-    if (typeof input !== 'string')
-        input = input.toString();
-
-    var module = source.isLocation ? source.path : source;
-
-    input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
-    if (/\.css$/.test(module)) {
-        // remove unnecessary whitespace from css
-        input = input.replace(/\n\s+/g, "\n");
-        input = '"' + input.replace(/\r?\n/g, '\\\n') + '"';
-    } else {
-        // but don't break other files!
-        input = '"' + input.replace(/\r?\n/g, '\\n\\\n') + '"';
-    }
-    textModules[module] = input;
-
-    return "";
-};
-detectTextModules.onRead = true;
-copy.filter.addDefines = detectTextModules;
-
-function inlineTextModules(text) {
-    var deps = [];
-    return text.replace(/, *['"]ace\/requirejs\/text!(.*?)['"]| require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, dep, call) {
-        if (dep) {
-            deps.push(dep);
-            return "";
-        } else if (call) {
-            deps.some(function(d) {
-                if (d.split("/").pop() == call.split("/").pop()) {
-                    dep = d;
-                    return true;
-                }
-            });
-
-            call = textModules[dep];
+function buildAceModule(opts, callback) {
+    // calling buildAceModuleInternal many times in parallel is slow, so we use queue
+    if (!buildAceModule.queue) {
+        buildAceModule.queue = [];
+        buildAceModule.dequeue = function() {
+            if (buildAceModule.running) return;
+            var call = buildAceModule.queue.shift();
             if (call)
-                return " " + call;
+                buildAceModuleInternal.apply(null, call);
+            buildAceModule.running = call;
+        };
+    }
+    
+    buildAceModule.queue.push([opts, function(err, result) {
+        callback && callback(err, result);
+        buildAceModule.running = null;
+        buildAceModule.dequeue();
+    }]);
+
+    if (!buildAceModule.running) {
+        buildAceModule.dequeue();
+    } else {
+        process.nextTick(buildAceModule.dequeue);
+    }
+}
+
+function buildAceModuleInternal(opts, callback) {
+    var cache = opts.cache == undefined ? CACHE : opts.cache;
+    var key = opts.require + "|" + opts.compress + "|" + opts.projectType;
+    if (cache && cache.configs && cache.configs[key])
+        return write(null, cache.configs[key]);
+        
+    var pathConfig = {
+        paths: {
+            ace: ACE_HOME + "/lib/ace",
+            "kitchen-sink": ACE_HOME + "/demo/kitchen-sink",
+            build_support:  ACE_HOME + "/build_support",
+        },
+        root: ACE_HOME
+    };
+        
+    function write(err, result) {
+        if (opts.compress)
+            result.code = compress(result.code);
+        
+        if (cache && key) {
+            cache.configs = cache.configs || Object.create(null);
+            cache.configs[key] = result;
+            result.sources = result.sources.map(function(pkg) {
+                return {deps: pkg.deps};
+            });
         }
+        
+        if (!opts.outputFile)
+            return callback(err, result);
+            
+        var targetDir =  BUILD_DIR + "/src";
+        if (opts.compress)
+            targetDir += "-min";
+        if (opts.noconflict)
+            targetDir += "-noconflict";
+        
+        var to = /^([\\/]|\w:)/.test(opts.outputFile)
+            ? opts.outputFile
+            : path.join(opts.outputFolder || targetDir, opts.outputFile);
+    
+        var filters = [];
+
+        var ns = opts.ns || "ace";
+        if (opts.filters)
+            filters = filters.concat(opts.filters);
+    
+        if (opts.noconflict)
+            filters.push(namespace(ns));
+        var projectType = opts.projectType;
+        if (projectType == "main" || projectType == "ext") {
+            filters.push(exportAce(ns, opts.require[0],
+                opts.noconflict ? ns : "", projectType == "ext"));
+        }
+
+        var code = result.code;
+        filters.forEach(function(f) { code = f(code); });
+        
+        build.writeToFile({code: code}, {
+            outputFolder: path.dirname(to),
+            outputFile: path.basename(to),
+        }, function() {});
+        
+        callback && callback(err, result);
+    }
+    
+    build(opts.require, {
+        cache: cache,
+        quiet: opts.quiet,
+        pathConfig: pathConfig,
+        additional: opts.additional,
+        enableBrowser: true,
+        keepDepArrays: "all",
+        noArchitect: true,
+        compress: false,
+        ignore: opts.ignore || [],
+        withRequire: false,
+        basepath: ACE_HOME,
+        afterRead: [optimizeTextModules]
+    }, write);
+}
+
+function buildCore(options, extra, callback) {
+    options = extend(extra, options);
+    options.additional = [{
+        id: "build_support/mini_require", 
+        order: -1000,
+        literal: true
+    }];
+    options.require =["ace/ace"];
+    options.projectType = "main";
+    options.ns = "ace";
+    buildAceModule(options, callback);
+}
+
+function buildSubmodule(options, extra, file, callback) {
+    options = extend(extra, options);
+    getLoadedFileList(options, function(coreFiles) {
+        options.outputFile = file + ".js";
+        options.ignore = coreFiles;
+        options.quiet = true;
+        buildAceModule(options, callback);
     });
 }
 
-var CommonJsProject = copy.createCommonJsProject({roots:[]}).constructor;
-CommonJsProject.prototype.getCurrentModules = function() {
-    function isDep(child, parent) {
-        if (!modules[parent])
-            return false;
-        var deps = modules[parent].deps;
-        if (deps[child]) return true;
-        return Object.keys(deps).some(function(x) {
-            return isDep(child, x)
+function buildAce(options) {
+    var snippetFiles = jsFileList("lib/ace/snippets");
+    var modeNames = modeList();
+    async.forEach([
+        buildCore.bind(null, options, {outputFile: "ace.js"}),
+        // modes
+        async.forEach.bind(null, modeNames, function(name, next) {
+            buildSubmodule(options, {
+                projectType: "mode",
+                require: ["ace/mode/" + name]
+            }, "mode-" + name, next);
+        }),
+        // snippets
+        async.forEach.bind(null, modeNames, function(name, next) {
+            if (snippetFiles.indexOf(name + ".js") == -1)
+                addSnippetFile(name);
+            
+            buildSubmodule(options, {
+                require: ["ace/snippets/" + name],
+            }, "snippets/" + name, next);
+        }),
+        // themes
+        async.forEach.bind(null, jsFileList("lib/ace/theme"), function(name, next) {
+            buildSubmodule(options, {
+                projectType: "theme",
+                require: ["ace/theme/" + name]
+            }, "theme-" +  name.replace("_theme", ""), next);
+        }),
+        // keybindings
+        async.forEach.bind(null, ["vim", "emacs"], function(name, next) {
+            buildSubmodule(options, {
+                projectType: "keybinding",
+                require: ["ace/keyboard/" + name ]
+            }, "keybinding-" + name, next);
+        }),
+        // extensions
+        async.forEach.bind(null, jsFileList("lib/ace/ext"), function(name, next) {
+            buildSubmodule(options, {
+                projectType: "ext",
+                require: ["ace/ext/" + name]
+            }, "ext-" + name, next);
+        }),
+        // workers
+        async.forEach.bind(null, workers("lib/ace/mode"), function(name, next) {
+            buildSubmodule(options, {
+                projectType: "worker",
+                require: ["ace/mode/" + name + "_worker"],
+                additional: [{
+                    id: "ace/worker/worker",
+                    loaderModule: true,
+                    order: -1000
+                }],
+            }, "worker-" + name, next);
+        }),
+    ], function(f, next) { f(next); });
+}
+
+function getLoadedFileList(options, callback, result) {
+    if (!result) {
+        return buildCore({}, {}, function(e, result) {
+            getLoadedFileList(options, callback, result);
         });
     }
-    var depMap = {}, modules = this.currentModules;
-    return Object.keys(this.currentModules).map(function(moduleName) {
-        module = modules[moduleName];
-        module.id = moduleName;
-        module.isSpecial = !/define\(\'[^']*',/.test(module.source);
-        return module;
-    }).sort(function(a, b) {
-        if (a.isSpecial) return -1;
-        if (b.isSpecial) return 1;
-        if (isDep(a.id, b.id)) return -1;
-        if (isDep(b.id, a.id)) return 1;
-        return Object.keys(a.deps).length - Object.keys(b.deps).length || a.id.localeCompare(b.id)
+    var deps = Object.create(null);
+    result.sources.forEach(function(pkg) {
+        pkg.deps && pkg.deps.forEach(function(p) {
+            if (!deps[p]) deps[p] = 1;
+        });
     });
-};
-
-// TODO: replace with project.clone once it is fixed in dryice
-function cloneProject(project) {
-    var clone = copy.createCommonJsProject({
-        roots: project.roots,
-        ignores: project.ignoreRequires,
-        textPluginPattern: project.textPluginPattern
-    });
-
-    Object.keys(project.currentModules).forEach(function(module) {
-        clone.currentModules[module] = project.currentModules[module];
-    });
-
-    Object.keys(project.ignoredModules).forEach(function(module) {
-        clone.ignoredModules[module] = project.ignoredModules[module];
-    });
-
-    return clone;
+    delete deps["ace/theme/textmate"];
+    callback(Object.keys(deps));
 }
 
-function copyFileSync(srcFile, destFile) {
-    var BUF_LENGTH = 64*1024;
-    var buf = new Buffer(BUF_LENGTH);
-    var bytesRead = BUF_LENGTH;
-    var pos = 0;
-    var fdr = fs.openSync(srcFile, 'r');
-    var fdw = fs.openSync(destFile, 'w');
-
-    while (bytesRead === BUF_LENGTH) {
-        bytesRead = fs.readSync(fdr, buf, 0, BUF_LENGTH, pos);
-        fs.writeSync(fdw, buf, 0, bytesRead);
-        pos += bytesRead;
+function optimizeTextModules(sources) {
+    var textModules = {};
+    return sources.filter(function(pkg) {
+        if (!pkg.id) {
+            return true;
+        }
+        else if (pkg.id.indexOf("text!") > -1) {
+            detectTextModules(pkg);
+            return false;
+        }
+        else {
+            pkg.source = rewriteTextImports(pkg.source, pkg.deps);
+            return true;
+        }
+    }).map(function(pkg) {
+        if (pkg && pkg.deps) {
+            pkg.deps = pkg.deps && pkg.deps.filter(function(p) {
+                return p.indexOf("text!") == -1;
+            });
+        }
+        return pkg;
+    });
+    
+    function rewriteTextImports(text, deps) {
+        return text.replace(/ require\(['"](?:ace|[.\/]+)\/requirejs\/text!(.*?)['"]\)/g, function(_, call) {
+            if (call) {
+                var dep;
+                deps.some(function(d) {
+                    if (d.split("/").pop() == call.split("/").pop()) {
+                        dep = d;
+                        return true;
+                    }
+                });
+    
+                call = textModules[dep];
+                if (call)
+                    return " " + call;
+            }
+        });
+    }
+    function detectTextModules(pkg) {
+        var input = pkg.source.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+        if (/\.css$/.test(pkg.id)) {
+            // remove unnecessary whitespace from css
+            input = input.replace(/\n\s+/g, "\n");
+            input = '"' + input.replace(/\r?\n/g, '\\\n') + '"';
+        } else {
+            // but don't break other files!
+            input = '"' + input.replace(/\r?\n/g, '\\n\\\n') + '"';
+        }
+        textModules[pkg.id] = input;
     }
-
-    fs.closeSync(fdr);
-    fs.closeSync(fdw);
-}
-
-function quoteString(str) {
-    return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"';
-}
-
-function removeUseStrict(text) {
-    return text.replace(/['"]use strict['"];/g, "");
-}
-
-function removeLicenceComments(text) {
-    return text.replace(/(?:(;)|\n)\s*\/\*[\d\D]*?\*\/|\n\s*\/\/.*/g, "$1");
 }
 
 function namespace(ns) {
@@ -667,44 +475,48 @@ function namespace(ns) {
         text = text
             .toString()
             .replace('var ACE_NAMESPACE = "";', 'var ACE_NAMESPACE = "' + ns +'";')
+            // .replace(/(\.define)|([,;\n]|^\s*?)define\(/g, function(_, a, b) {
+            //     return a || b + ns + ".define(";
             .replace(/(\.define)|\bdefine\(/g, function(_, a) {
-                return a || ns + ".define("
+                return a || ns + ".define(";
             });
 
         return text;
     };
 }
 
-function exportAce(ns, module, requireBase, extModule) {
+function exportAce(ns, modules, requireBase, extModules) {
     requireBase = requireBase || "window";
-    module = module || "ace/ace";
     return function(text) {
+        /*globals REQUIRE_NS, MODULES, NS*/
         var template = function() {
             (function() {
-                REQUIRE_NS.require(["MODULE"], function(a) {
+                REQUIRE_NS.require(MODULES, function(a) {
                     a && a.config.init(true);
                     if (!window.NS)
                         window.NS = a;
                     for (var key in a) if (a.hasOwnProperty(key))
-                        NS[key] = a[key];
+                        window.NS[key] = a[key];
                 });
             })();
         };
         
-        if (extModule) {
-            module = extModule;
+        if (extModules) {
             template = function() {
                 (function() {
-                    REQUIRE_NS.require(["MODULE"], function() {});
+                    REQUIRE_NS.require(MODULES, function() {});
                 })();
             };
         }
         
         text = text.replace(/function init\(packaged\) {/, "init(true);$&\n");
         
+        if (typeof modules == "string")
+            modules = [modules];
+            
         return (text + ";" + template
             .toString()
-            .replace(/MODULE/g, module)
+            .replace(/MODULES/g, JSON.stringify(modules))
             .replace(/REQUIRE_NS/g, requireBase)
             .replace(/NS/g, ns)
             .slice(13, -1)
@@ -714,14 +526,14 @@ function exportAce(ns, module, requireBase, extModule) {
 
 function updateModes() {
     modeList().forEach(function(m) {
-        var filepath = __dirname + "/lib/ace/mode/" + m + ".js"
+        var filepath = __dirname + "/lib/ace/mode/" + m + ".js";
         var source = fs.readFileSync(filepath, "utf8");
         if (!/this.\$id\s*=\s*"/.test(source))
             source = source.replace(/\n([ \t]*)(\}\).call\(\w*Mode.prototype\))/, '\n$1    this.$id = "";\n$1$2');
         
         source = source.replace(/(this.\$id\s*=\s*)"[^"]*"/,  '$1"ace/mode/' + m + '"');
-        fs.writeFileSync(filepath, source, "utf8")
-    })
+        fs.writeFileSync(filepath, source, "utf8");
+    });
 }
 
 function generateThemesModule(themes) {
@@ -733,6 +545,42 @@ function generateThemesModule(themes) {
     fs.writeFileSync(__dirname + '/lib/ace/ext/themelist_utils/themes.js', themelist, 'utf8');
 }
 
+function addSnippetFile(modeName) {
+    var snippetFilePath = ACE_HOME + "/lib/ace/snippets/" + modeName;
+    if (!fs.existsSync(snippetFilePath + ".js")) {
+        copy.file(ACE_HOME + "/tool/snippets.tmpl.js", snippetFilePath + ".js", function(t) {
+            return t.replace(/%modeName%/g, modeName);
+        });
+    }
+    if (!fs.existsSync(snippetFilePath + ".snippets")) {
+        fs.writeFileSync(snippetFilePath + ".snippets", "");
+    }
+}
+
+function compress(text) {
+    return asciify(require("dryice").copy.filter.uglifyjs(text));
+    // copy.filter.uglifyjs.options.ascii_only = true; doesn't work with some uglify.js versions
+    function asciify(text) {
+        return text.replace(/[\x00-\x08\x0b\x0c\x0e\x19\x80-\uffff]/g, function(c) {
+            c = c.charCodeAt(0).toString(16);
+            if (c.length == 1)
+                return "\\x0" + c;
+            if (c.length == 2)
+                return "\\x" + c;
+            if (c.length == 3)
+                return "\\u0" + c;
+            return "\\u" + c;
+        });
+    }
+}
+
+function extend(base, extra) {
+    Object.keys(extra).forEach(function(k) {
+        base[k] = extra[k];
+    });
+    return base;
+}
+
 if (!module.parent)
     main(process.argv);
 else
diff --git a/demo/requirejs+build.html b/demo/requirejs+build.html
index 4a494063..72d50dbc 100644
--- a/demo/requirejs+build.html
+++ b/demo/requirejs+build.html
@@ -29,14 +29,20 @@
 }</pre>
 
 <script src="../demo/kitchen-sink/require.js"></script>
-<script src="../build/src/ace.js" charset="utf-8"></script>
 <script>
-    var editor = ace.edit("editor");
-    editor.setTheme("ace/theme/twilight");
-    editor.session.setMode("ace/mode/javascript");
-    require(["ace/requirejs/text!src/ace"], function(e){
-        editor.setValue(e);
-    })
+    require.config({paths: {ace: "../build/src"}})
+    define('testace', ['ace/ace'],
+        function(ace, langtools) {
+            console.log("This is the testace module");
+            var editor = ace.edit("editor");
+            editor.setTheme("ace/theme/twilight");
+            editor.session.setMode("ace/mode/javascript");
+            require(["ace/requirejs/text!src/ace"], function(e){
+                editor.setValue(e);
+            })
+        }
+    );
+    require(['testace'])
 </script>
 
 </body>
diff --git a/package.json b/package.json
index cbabb3a0..58aabdf9 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
         "asyncjs": "0.0.x",
         "jsdom": "0.2.x",
         "amd-loader": "~0.0.4",
-        "dryice": "0.4.10"
+        "dryice": "0.4.11"
     },
     "mappings": {
         "ace": "."

From b42108a2c993b684036620e606201f6989ff91b4 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 20 Jun 2014 10:37:23 +0400
Subject: [PATCH 3/6] remove unnecessary use of async

---
 Makefile.dryice.js | 104 ++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 53 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 8bf54562..5f5d69bc 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -33,7 +33,6 @@ var fs = require("fs");
 var path = require("path");
 var copy = require('architect-build/copy');
 var build = require('architect-build/build');
-var async = require("asyncjs");
 
 var ACE_HOME = __dirname;
 var BUILD_DIR = ACE_HOME + "/build";
@@ -346,58 +345,57 @@ function buildSubmodule(options, extra, file, callback) {
 function buildAce(options) {
     var snippetFiles = jsFileList("lib/ace/snippets");
     var modeNames = modeList();
-    async.forEach([
-        buildCore.bind(null, options, {outputFile: "ace.js"}),
-        // modes
-        async.forEach.bind(null, modeNames, function(name, next) {
-            buildSubmodule(options, {
-                projectType: "mode",
-                require: ["ace/mode/" + name]
-            }, "mode-" + name, next);
-        }),
-        // snippets
-        async.forEach.bind(null, modeNames, function(name, next) {
-            if (snippetFiles.indexOf(name + ".js") == -1)
-                addSnippetFile(name);
-            
-            buildSubmodule(options, {
-                require: ["ace/snippets/" + name],
-            }, "snippets/" + name, next);
-        }),
-        // themes
-        async.forEach.bind(null, jsFileList("lib/ace/theme"), function(name, next) {
-            buildSubmodule(options, {
-                projectType: "theme",
-                require: ["ace/theme/" + name]
-            }, "theme-" +  name.replace("_theme", ""), next);
-        }),
-        // keybindings
-        async.forEach.bind(null, ["vim", "emacs"], function(name, next) {
-            buildSubmodule(options, {
-                projectType: "keybinding",
-                require: ["ace/keyboard/" + name ]
-            }, "keybinding-" + name, next);
-        }),
-        // extensions
-        async.forEach.bind(null, jsFileList("lib/ace/ext"), function(name, next) {
-            buildSubmodule(options, {
-                projectType: "ext",
-                require: ["ace/ext/" + name]
-            }, "ext-" + name, next);
-        }),
-        // workers
-        async.forEach.bind(null, workers("lib/ace/mode"), function(name, next) {
-            buildSubmodule(options, {
-                projectType: "worker",
-                require: ["ace/mode/" + name + "_worker"],
-                additional: [{
-                    id: "ace/worker/worker",
-                    loaderModule: true,
-                    order: -1000
-                }],
-            }, "worker-" + name, next);
-        }),
-    ], function(f, next) { f(next); });
+
+    buildCore(options, {outputFile: "ace.js"}),
+    // modes
+    modeNames.forEach(function(name) {
+        buildSubmodule(options, {
+            projectType: "mode",
+            require: ["ace/mode/" + name]
+        }, "mode-" + name);
+    });
+    // snippets
+    modeNames.forEach(function(name) {
+        if (snippetFiles.indexOf(name + ".js") == -1)
+            addSnippetFile(name);
+        
+        buildSubmodule(options, {
+            require: ["ace/snippets/" + name],
+        }, "snippets/" + name);
+    });
+    // themes
+    jsFileList("lib/ace/theme").forEach(function(name) {
+        buildSubmodule(options, {
+            projectType: "theme",
+            require: ["ace/theme/" + name]
+        }, "theme-" +  name.replace("_theme", ""));
+    });
+    // keybindings
+    ["vim", "emacs"].forEach(function(name) {
+        buildSubmodule(options, {
+            projectType: "keybinding",
+            require: ["ace/keyboard/" + name ]
+        }, "keybinding-" + name);
+    });
+    // extensions
+    jsFileList("lib/ace/ext").forEach(function(name) {
+        buildSubmodule(options, {
+            projectType: "ext",
+            require: ["ace/ext/" + name]
+        }, "ext-" + name);
+    });
+    // workers
+    workers("lib/ace/mode").forEach(function(name) {
+        buildSubmodule(options, {
+            projectType: "worker",
+            require: ["ace/mode/" + name + "_worker"],
+            additional: [{
+                id: "ace/worker/worker",
+                loaderModule: true,
+                order: -1000
+            }],
+        }, "worker-" + name);
+    });
 }
 
 function getLoadedFileList(options, callback, result) {

From e52884761d447c85e6a597732abfcfae4874e00a Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 20 Jun 2014 10:38:05 +0400
Subject: [PATCH 4/6] keep demo/kitchein-sink folders location in the build

---
 Makefile.dryice.js | 15 +++++----------
 kitchen-sink.html  | 10 ++--------
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 5f5d69bc..a0982577 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -132,25 +132,20 @@ function demo() {
         );
     }
 
-    function fixDocPaths(data) {
-        return data.replace(/"(demo|build)\//g, "\"");
-    }
-
-    copy(ACE_HOME + "/demo/kitchen-sink", BUILD_DIR + "/kitchen-sink", {
+    copy(ACE_HOME + "/demo/kitchen-sink", BUILD_DIR + "/demo/kitchen-sink", {
         shallow: true,
-        replace: [changeComments, fixDocPaths],
+        replace: [changeComments],
         include: /\.(css|html)$/
     });
     
-    copy(ACE_HOME +"/demo/kitchen-sink/docs/", BUILD_DIR + "/kitchen-sink/docs/");
+    copy(ACE_HOME +"/demo/kitchen-sink/docs/", BUILD_DIR + "/demo/kitchen-sink/docs/");
     
-    copy.file(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
+    copy.file(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/demo/kitchen-sink/logo.png");
 
     buildSubmodule({}, {
         require: ["kitchen-sink/demo"],
-        filters: [fixDocPaths],
         projectType: "demo"
-    }, BUILD_DIR + "/kitchen-sink/demo");
+    }, BUILD_DIR + "/demo/kitchen-sink/demo");
 
     copy(ACE_HOME + "/demo/", BUILD_DIR + "/demo/", {
         shallow: true,
diff --git a/kitchen-sink.html b/kitchen-sink.html
index f55cfa14..d32b98b5 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -11,16 +11,10 @@
       commit  %commit%
     -->
 
-    <!--DEVEL-->
-      <link rel="stylesheet" href="demo/kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
-      <script async="true" src="https://use.edgefonts.net/source-code-pro.js"></script>
-    <!--DEVEL-->
+    <link rel="stylesheet" href="demo/kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
+    <script async="true" src="https://use.edgefonts.net/source-code-pro.js"></script>
 
     <link href="./doc/site/images/favicon.ico" rel="icon" type="image/x-icon">
-    <!--PACKAGE
-      <link rel="stylesheet" href="kitchen-sink/styles.css" type="text/css" media="screen" charset="utf-8">
-      <script async="true" src="https://use.edgefonts.net/source-code-pro.js"></script>
-    PACKAGE-->
 </head>
 <body>
 <div id="optionsPanel" style="position:absolute;height:100%;width:260px">

From e5b2eed5c58425c3ae3db35da9328320a57582f2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 20 Jun 2014 20:54:08 +0400
Subject: [PATCH 5/6] add architect build to package.json

---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58aabdf9..31a4dec9 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,8 @@
         "asyncjs": "0.0.x",
         "jsdom": "0.2.x",
         "amd-loader": "~0.0.4",
-        "dryice": "0.4.11"
+        "dryice": "0.4.11",
+        "architect-build": "https://github.com/c9/architect-build/tarball/42723e152bb"
     },
     "mappings": {
         "ace": "."

From 67143599981cadec7b9898d0fdd028f73ff8d7ba Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Sat, 21 Jun 2014 00:45:50 +0400
Subject: [PATCH 6/6] tweak

---
 Makefile           |  1 -
 Makefile.dryice.js | 61 +++++++++++++++++-----------------------------
 kitchen-sink.html  |  2 +-
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/Makefile b/Makefile
index 95dcf964..29cf0495 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,6 @@ pre_build:
 build: pre_build
 	./Makefile.dryice.js normal
 	./Makefile.dryice.js demo
-	./Makefile.dryice.js bm
 
 # Minimal build: call Makefile.dryice.js only if our sources changed
 basic: build/src/ace.js
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index a0982577..2bc36f8b 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -112,14 +112,11 @@ function ace() {
 function demo() {
     console.log('# kitchen sink ---------');
 
-    var version, ref;
+    var version = "", ref = "";
     try {
         version = JSON.parse(fs.readFileSync(ACE_HOME + "/package.json")).version;
         ref = fs.readFileSync(ACE_HOME + "/.git-ref").toString();
-    } catch(e) {
-        ref = "";
-        version = "";
-    }
+    } catch(e) {}
 
     function changeComments(data) {
         return (data
@@ -131,16 +128,12 @@ function demo() {
             .replace("%commit%", ref)
         );
     }
-
-    copy(ACE_HOME + "/demo/kitchen-sink", BUILD_DIR + "/demo/kitchen-sink", {
-        shallow: true,
-        replace: [changeComments],
-        include: /\.(css|html)$/
-    });
     
     copy(ACE_HOME +"/demo/kitchen-sink/docs/", BUILD_DIR + "/demo/kitchen-sink/docs/");
     
     copy.file(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/demo/kitchen-sink/logo.png");
+    copy.file(ACE_HOME + "/demo/kitchen-sink/styles.css", BUILD_DIR + "/demo/kitchen-sink/styles.css");
+    copy.file(ACE_HOME + "/kitchen-sink.html", BUILD_DIR + "/kitchen-sink.html", changeComments);
 
     buildSubmodule({}, {
         require: ["kitchen-sink/demo"],
@@ -214,9 +207,9 @@ function buildAceModule(opts, callback) {
         buildAceModule.dequeue = function() {
             if (buildAceModule.running) return;
             var call = buildAceModule.queue.shift();
+            buildAceModule.running = call;
             if (call)
                 buildAceModuleInternal.apply(null, call);
-            buildAceModule.running = call;
         };
     }
     
@@ -235,7 +228,7 @@ function buildAceModule(opts, callback) {
 
 function buildAceModuleInternal(opts, callback) {
     var cache = opts.cache == undefined ? CACHE : opts.cache;
-    var key = opts.require + "|" + opts.compress + "|" + opts.projectType;
+    var key = opts.require + "|" + opts.projectType;
     if (cache && cache.configs && cache.configs[key])
         return write(null, cache.configs[key]);
         
@@ -249,19 +242,23 @@ function buildAceModuleInternal(opts, callback) {
     };
         
     function write(err, result) {
-        if (opts.compress)
-            result.code = compress(result.code);
-        
-        if (cache && key) {
+        if (cache && key && !(cache.configs && cache.configs[key])) {
             cache.configs = cache.configs || Object.create(null);
             cache.configs[key] = result;
             result.sources = result.sources.map(function(pkg) {
                 return {deps: pkg.deps};
             });
-        }
+        } 
         
         if (!opts.outputFile)
             return callback(err, result);
+        
+        var code = result.code;
+        if (opts.compress) {
+            if (!result.codeMin)
+                result.codeMin = compress(result.code);
+            code = result.codeMin;
+        }
             
         var targetDir =  BUILD_DIR + "/src";
         if (opts.compress)
@@ -287,7 +284,6 @@ function buildAceModuleInternal(opts, callback) {
                 opts.noconflict ? ns : "", projectType == "ext"));
         }
 
-        var code = result.code;
         filters.forEach(function(f) { code = f(code); });
         
         build.writeToFile({code: code}, {
@@ -331,7 +327,7 @@ function buildSubmodule(options, extra, file, callback) {
     options = extend(extra, options);
     getLoadedFileList(options, function(coreFiles) {
         options.outputFile = file + ".js";
-        options.ignore = coreFiles;
+        options.ignore = options.ignore || coreFiles;
         options.quiet = true;
         buildAceModule(options, callback);
     });
@@ -384,9 +380,10 @@ function buildAce(options) {
         buildSubmodule(options, {
             projectType: "worker",
             require: ["ace/mode/" + name + "_worker"],
+            ignore: [],
             additional: [{
                 id: "ace/worker/worker",
-                loaderModule: true,
+                transforms: [],
                 order: -1000
             }],
         }, "worker-" + name);
@@ -467,9 +464,7 @@ function namespace(ns) {
     return function(text) {
         text = text
             .toString()
-            .replace('var ACE_NAMESPACE = "";', 'var ACE_NAMESPACE = "' + ns +'";')
-            // .replace(/(\.define)|([,;\n]|^\s*?)define\(/g, function(_, a, b) {
-            //     return a || b + ns + ".define(";
+            .replace(/ACE_NAMESPACE\s*=\s*""/, 'ACE_NAMESPACE = "' + ns +'"')
             .replace(/(\.define)|\bdefine\(/g, function(_, a) {
                 return a || ns + ".define(";
             });
@@ -551,20 +546,10 @@ function addSnippetFile(modeName) {
 }
 
 function compress(text) {
-    return asciify(require("dryice").copy.filter.uglifyjs(text));
-    // copy.filter.uglifyjs.options.ascii_only = true; doesn't work with some uglify.js versions
-    function asciify(text) {
-        return text.replace(/[\x00-\x08\x0b\x0c\x0e\x19\x80-\uffff]/g, function(c) {
-            c = c.charCodeAt(0).toString(16);
-            if (c.length == 1)
-                return "\\x0" + c;
-            if (c.length == 2)
-                return "\\x" + c;
-            if (c.length == 3)
-                return "\\u0" + c;
-            return "\\u" + c;
-        });
-    }
+    var ujs = require("dryice").copy.filter.uglifyjs;
+    ujs.options.mangle_toplevel = {except: ["ACE_NAMESPACE", "requirejs"]};
+    ujs.options.beautify = {ascii_only: true, inline_script: true}
+    return ujs(text);
 }
 
 function extend(base, extra) {
diff --git a/kitchen-sink.html b/kitchen-sink.html
index d32b98b5..65fe2a2a 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -281,7 +281,7 @@
   <script src="src/ace.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
   <script src="src/keybinding-vim.js"></script>
   <script src="src/keybinding-emacs.js"></script>
-  <script src="kitchen-sink/demo.js"></script>
+  <script src="demo/kitchen-sink/demo.js"></script>
   <script type="text/javascript" charset="utf-8">
     require("kitchen-sink/demo");
   </script>