make build system worker compatible

Makefile.dryice.js

@@ -91,11 +91,12 @@ copy({
         {
             root: aceHome + '/lib',
             include: /.*\.js$/,
-            exclude: /tests?\/|theme\/|mode\//
+            exclude: /tests?\/|theme\/|mode\/|ace\/worker\/host\.js/
         },
         { base: aceHome + '/lib/', path: 'ace/theme/textmate.js' },
         { base: aceHome + '/lib/', path: 'ace/mode/text.js' },
         { base: aceHome + '/lib/', path: 'ace/mode/javascript.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/javascript_worker.js' },
         { base: aceHome + '/lib/', path: 'ace/mode/text_highlight_rules.js' },
         { base: aceHome + '/lib/', path: 'ace/mode/javascript_highlight_rules.js' },
         { base: aceHome + '/lib/', path: 'ace/mode/doc_comment_highlight_rules.js' },
@@ -121,7 +122,6 @@ copy({
     source: [
         'build_support/mini_require.js',
         pilot,
-        // cockpit,
         ace,
         'build_support/boot.js'
     ],
@@ -146,7 +146,14 @@ copy({
     dest: 'build/ace-uncompressed.js'
 });
 
-
+// Create worker bootstrap code
+copy({
+    source: "lib/ace/worker/host.js",
+    filter: [function(data) {
+        return data + "\nimportScripts('ace-uncompressed.js')";
+    }],
+    dest: 'build/host.js'
+});
 
 
 

build_support/boot.js

@@ -35,41 +35,45 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
+// don't define it in a worker.
-             "pilot/environment" ];
+if (window.document) {
-
+    
-require(deps, function() {
+    var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
-    var catalog = require("pilot/plugin_manager").catalog;
+                 "pilot/environment" ];
-    catalog.registerPlugins([ "pilot/index" ]);
+    
-});
+    require(deps, function() {
-
-var ace = {
-    edit: function(el) {
-        if (typeof(el) == "string") {
-            el = document.getElementById(el);
-        }
-        var env = require("pilot/environment").create();
         var catalog = require("pilot/plugin_manager").catalog;
-        catalog.startupPlugins({ env: env }).then(function() {
+        catalog.registerPlugins([ "pilot/index" ]);
-            var EditSession = require("ace/edit_session").EditSession;
+    });
-            var JavaScriptMode = require("ace/mode/javascript").Mode;
+    
-            var UndoManager = require("ace/undomanager").UndoManager;
+    var ace = {
-            var Editor = require("ace/editor").Editor;
+        edit: function(el) {
-            var Renderer = require("ace/virtual_renderer").VirtualRenderer;
+            if (typeof(el) == "string") {
-            var theme = require("ace/theme/textmate");
+                el = document.getElementById(el);
-
+            }
-            var doc = new EditSession(el.innerHTML);
+            var env = require("pilot/environment").create();
-            el.innerHTML = '';
+            var catalog = require("pilot/plugin_manager").catalog;
-            doc.setMode(new JavaScriptMode());
+            catalog.startupPlugins({ env: env }).then(function() {
-            doc.setUndoManager(new UndoManager());
+                var EditSession = require("ace/edit_session").EditSession;
-            env.document = doc;
+                var JavaScriptMode = require("ace/mode/javascript").Mode;
-            env.editor = new Editor(new Renderer(el, theme));
+                var UndoManager = require("ace/undomanager").UndoManager;
-            env.editor.setSession(doc);
+                var Editor = require("ace/editor").Editor;
-            env.editor.resize();
+                var Renderer = require("ace/virtual_renderer").VirtualRenderer;
-            window.addEventListener("resize", function() {
+                var theme = require("ace/theme/textmate");
+    
+                var doc = new EditSession(el.innerHTML);
+                el.innerHTML = '';
+                doc.setMode(new JavaScriptMode());
+                doc.setUndoManager(new UndoManager());
+                env.document = doc;
+                env.editor = new Editor(new Renderer(el, theme));
+                env.editor.setSession(doc);
                 env.editor.resize();
-            }, false);
+                window.addEventListener("resize", function() {
-            el.env = env;
+                    env.editor.resize();
-        });
+                }, false);
-    }
+                el.env = env;
-};
+            });
+        }
+    };
+}

build_support/mini_require.js

@@ -35,59 +35,64 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-function require(module, callback) {
+// don't define it in a worker. There we have a different implementation
+if (window.document) {
 
-    if (Array.isArray(module)) {
+    window.require = function(module, callback) {
-        var params = [];
+    
-        module.forEach(function(m) {
+        if (Array.isArray(module)) {
-            params.push(require._lookup(m));
+            var params = [];
-        }, this);
+            module.forEach(function(m) {
-
+                params.push(require._lookup(m));
-        if (callback) {
+            }, this);
-            callback.apply(null, params);
+    
+            if (callback) {
+                callback.apply(null, params);
+            }
+        }
+    
+        if (typeof module === 'string') {
+            payload = require._lookup(module);
+            if (callback) {
+                callback();
+            }
+            return payload;
         }
     }
-
+    require.modules = {};
-    if (typeof module === 'string') {
+    require.packaged = true;
-        payload = require._lookup(module);
+    
-        if (callback) {
+    require._lookup = function(moduleName) {
-            callback();
+        var payload = require.modules[moduleName];
+        var module_name = moduleName;
+        if (payload == null) {
+            console.error('Missing module: ' + moduleName);
+            console.trace();
         }
+    
+        if (typeof payload === 'function') {
+            var exports = {};
+            var module = {
+                 id: moduleName,
+                 uri: ''
+            };
+            payload(require, exports, module);
+            payload = exports;
+            // cache the resulting module object for next time
+            require.modules[module_name] = payload;
+        }
+    
         return payload;
+    };
+    
+    window.define = function(module, payload) {
+        if (typeof module !== 'string') {
+            console.error('dropping module because define wasn\'t munged.');
+            console.trace();
+            return;
+        }
+    
+        // console.log('defining module: ' + module + ' as a ' + typeof payload);
+        require.modules[module] = payload;
     }
-}
+}
-require.modules = {};
-
-require._lookup = function(moduleName) {
-    var payload = require.modules[moduleName];
-    var module_name = moduleName;
-    if (payload == null) {
-        console.error('Missing module: ' + moduleName);
-        console.trace();
-    }
-
-    if (typeof payload === 'function') {
-        var exports = {};
-        var module = {
-             id: moduleName,
-             uri: ''
-        };
-        payload(require, exports, module);
-        payload = exports;
-        // cache the resulting module object for next time
-        require.modules[module_name] = payload;
-    }
-
-    return payload;
-};
-
-function define(module, payload) {
-    if (typeof module !== 'string') {
-        console.error('dropping module because define wasn\'t munged.');
-        console.trace();
-        return;
-    }
-
-    // console.log('defining module: ' + module + ' as a ' + typeof payload);
-    require.modules[module] = payload;
-}