Merge pull request #862 from ajaxorg/fix/requirejs_conflict

Fix/requirejs conflict

Makefile.dryice.js

@@ -43,7 +43,7 @@ if (!fs.existsSync)
 var copy = require('dryice').copy;
 
 var ACE_HOME = __dirname;
-var BUILD_DIR = "build";
+var BUILD_DIR = ACE_HOME + "/build";
 
 function main(args) {
     var type = "minimal";
@@ -146,16 +146,16 @@ function ace() {
     console.log('# ace License | Readme | Changelog ---------');
 
     copy({
-        source: "build_support/editor.html",
+        source: ACE_HOME + "/build_support/editor.html",
-        dest:   "build/editor.html"
+        dest:   BUILD_DIR + "/editor.html"
     });
     copy({
         source: ACE_HOME + "/LICENSE",
-        dest:   "build/LICENSE"
+        dest:   BUILD_DIR + "/LICENSE"
     });
     copy({
         source: ACE_HOME + "/ChangeLog.txt",
-        dest:   "build/ChangeLog.txt"
+        dest:   BUILD_DIR + "/ChangeLog.txt"
     });
 }
 
@@ -164,13 +164,14 @@ function demo() {
 
     var version, ref;
     try {
-        version = JSON.parse(fs.readFileSync(__dirname + "/package.json")).version;
+        version = JSON.parse(fs.readFileSync(ACE_HOME + "/package.json")).version;
-        ref = fs.readFileSync(__dirname + "/.git-ref").toString();
+        ref = fs.readFileSync(ACE_HOME + "/.git-ref").toString();
     } catch(e) {
         ref = "";
         version = "";
     }
-    var changeComments = function(data) {
+
+    function changeComments(data) {
         return (data
             .replace(/<!\-\-DEVEL[\d\D]*?DEVEL\-\->/g, "")
             .replace(/PACKAGE\-\->|<!\-\-PACKAGE/g, "")
@@ -179,10 +180,14 @@ function demo() {
             .replace("%version%", version)
             .replace("%commit%", ref)
         );
+    };
+    
+    function fixDocPaths(data) {
+        return data.replace(/"(demo|build)\//g, "\"");
     }
 
     copy({
-        source: "kitchen-sink.html",
+        source: ACE_HOME + "/kitchen-sink.html",
         dest:   BUILD_DIR + "/kitchen-sink.html",
         filter: [changeComments,  function(data) {
             return data.replace(/"(demo|build)\//g, "\"");
@@ -190,30 +195,28 @@ function demo() {
     });
 
     copy({
-        source: "demo/kitchen-sink/styles.css",
+        source: ACE_HOME + "/demo/kitchen-sink/styles.css",
         dest:   BUILD_DIR + "/kitchen-sink/styles.css",
         filter: [ changeComments ]
     });
 
-    fs.readdirSync("demo/kitchen-sink/docs/").forEach(function(x) {
+    fs.readdirSync(ACE_HOME +"/demo/kitchen-sink/docs/").forEach(function(x) {
         copy({
-            source: "demo/kitchen-sink/docs/" + x,
+            source: ACE_HOME +"/demo/kitchen-sink/docs/" + x,
             dest:   BUILD_DIR + "/kitchen-sink/docs/" + x
         });
     });
 
     var demo = copy.createDataObject();
     copy({
-        source: "demo/kitchen-sink/demo.js",
+        source: ACE_HOME + "/demo/kitchen-sink/demo.js",
         dest: demo,
-        filter: [changeComments, function(data) {
+        filter: [changeComments, fixDocPaths, function(data) {
-            return data.replace(/"(demo|build)\//g, "\"");
-        }, function(data) {
             return data.replace("define(", "define('kitchen-sink/demo',");
         }]
     });
     copy({
-        source: "lib/ace/split.js",
+        source: ACE_HOME + "/lib/ace/split.js",
         dest: demo,
         filter: [changeComments, function(data) {
             return data.replace("define(", "define('ace/split',");
@@ -224,7 +227,7 @@ function demo() {
         dest:   BUILD_DIR + "/kitchen-sink/demo.js",
     });
 
-    copyFileSync("demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
+    copyFileSync(ACE_HOME + "/demo/kitchen-sink/logo.png", BUILD_DIR + "/kitchen-sink/logo.png");
 }
 
 function buildAce(options) {
@@ -233,6 +236,14 @@ function buildAce(options) {
         textPluginPattern: /^ace\/requirejs\/text!/
     };
 
+    var modeNames = fs.readdirSync(ACE_HOME + "/lib/ace/mode").map(function(x) {
+        if (x.slice(-3) == ".js" && !/_highlight_rules|_test|_worker|xml_util|_outdent|behaviour/.test(x))
+            return x.slice(0, -3);
+    }).filter(function(x) { return !!x; });
+    var themeNames = fs.readdirSync(ACE_HOME + "/lib/ace/theme").map(function(x){
+        return x.slice(-3) == ".js" && x.slice(0, -3);
+    }).filter(function(x){ return !!x; });
+
     var defaults = {
         targetDir: BUILD_DIR + "/src",
         ns: "ace",
@@ -242,13 +253,8 @@ function buildAce(options) {
         noconflict: false,
         suffix: null,
         name: "ace",
-        modes: fs.readdirSync("lib/ace/mode").map(function(x) {
+        modes: modeNames,
-                if (x.slice(-3) == ".js" && !/_highlight_rules|_test|_worker|xml_util|_outdent|behaviour/.test(x))
+        themes: themeNames,
-                    return x.slice(0, -3);
-            }).filter(function(x){return !!x}),
-        themes: fs.readdirSync("lib/ace/theme").map(function(x){
-                return x.slice(-3) == ".js" && x.slice(0, -3)
-            }).filter(function(x){return !!x}),
         workers: ["javascript", "coffee", "css", "json", "xquery"],
         keybindings: ["vim", "emacs"]
     };
@@ -271,7 +277,6 @@ function buildAce(options) {
 
     var filters = [
         copy.filter.moduleDefines,
-        filterTextPlugin,
         removeUseStrict,
         removeLicenceCmments
     ];
@@ -293,7 +298,7 @@ function buildAce(options) {
     var project = copy.createCommonJsProject(aceProject);
     var ace = copy.createDataObject();
     copy({
-        source: ["build_support/mini_require.js"],
+        source: [ACE_HOME + "/build_support/mini_require.js"],
         dest: ace
     });
     copy({
@@ -340,7 +345,7 @@ function buildAce(options) {
             dest:   targetDir + "/theme-" + theme + ".js"
         });*/
         // use this instead, to not create separate modules for js and css
-        var themePath = "lib/ace/theme/" + theme
+        var themePath = ACE_HOME + "/lib/ace/theme/" + theme
         var js = fs.readFileSync(themePath + ".js", "utf8");
         js = js.replace("define(", "define('ace/theme/" + theme + "', ['require', 'exports', 'module', 'ace/lib/dom'], ");
         
@@ -372,7 +377,6 @@ function buildAce(options) {
     
     filters = [
         copy.filter.moduleDefines,
-        filterTextPlugin,
         removeUseStrict,
         removeLicenceCmments
     ];
@@ -427,6 +431,22 @@ function cloneProject(project) {
 
     return clone;
 }
+
+copy.filter.addDefines = function(input, source) {
+    if (!source)
+        throw new Error('Missing filename for moduleDefines');
+
+    if (typeof input !== 'string')
+        input = input.toString();
+
+    var module = source.isLocation ? source.path : source;
+
+    input = input.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+    input = '"' + input.replace(/\n/g, '\\n\\\n') + '"';
+
+    return 'define("ace/requirejs/text!' + module + '", [], ' + input + ');\n\n';
+};
+
 function copyFileSync(srcFile, destFile) {
     var BUF_LENGTH = 64*1024,
         buf = new Buffer(BUF_LENGTH),
@@ -453,16 +473,12 @@ function quoteString(str) {
     return '"' + str.replace(/\\/, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\\n") + '"';
 }
 
-function filterTextPlugin(text) {
-    return text.replace(/(['"])ace\/requirejs\/text\!/g, "$1text!");
-}
-
 function removeUseStrict(text) {
     return text.replace(/['"]use strict['"];/g, "");
 }
 
 function removeLicenceCmments(text) {
-    return text.replace(/(;)\s*\/\*[\d\D]*?\*\//g, "$1");
+    return text.replace(/(;)\s*\/\*[\d\D]*?\*\//g, "$1").replace(/\n\/\/ vim.*\n(\/\/.*\n)+/g, "");
 }
 
 function namespace(ns) {

build

@@ -1 +1 @@
-Subproject commit 8f508c64856878dc43cb9d0aeb028ca34ede6f5c
+Subproject commit b5354412bfeb461b7d8020423562451a81da2c85

build_support/mini_require.js

@@ -49,6 +49,26 @@ var global = (function() {
     return this;
 })();
 
+// take care of the case when requirejs is used and we just need to patch it a little bit
+if (!ACE_NAMESPACE && typeof requirejs !== "undefined") {
+
+    var define = global.define;
+    global.define = function(id, deps, callback) {
+        if (typeof callback !== "function")
+            return define.apply(this, arguments);
+
+        return define(id, deps, function(require, exports, module) {
+            if (deps[2] == "module")
+                module.packaged = true;
+            return callback.apply(this, arguments);
+        });
+    };
+    global.define.packaged = true;
+
+    return;
+}
+
+
 var _define = function(module, deps, payload) {
     if (typeof module !== 'string') {
         if (_define.original)
@@ -160,29 +180,9 @@ var lookup = function(parentId, moduleName) {
 };
 
 function exportAce(ns) {
-
-    if (typeof requirejs !== "undefined") {
-
-        var define = global.define;
-        global.define = function(id, deps, callback) {
-            if (typeof callback !== "function")
-                return define.apply(this, arguments);
-
-            return define(id, deps, function(require, exports, module) {
-                if (deps[2] == "module")
-                    module.packaged = true;
-                return callback.apply(this, arguments);
-            });
-        };
-        global.define.packaged = true;
-
-        return;
-    }
-
     var require = function(module, callback) {
         return _require("", module, callback);
     };    
-    require.packaged = true;
 
     var root = global;
     if (ns) {
@@ -191,17 +191,26 @@ function exportAce(ns) {
         root = global[ns];
     }
 
-    if (root.define)
+    if (!root.define || !root.define.packaged) {
         _define.original = root.define;
-
         root.define = _define;
+        root.define.packaged = true;
+    }
 
-    if (root.require)
+    if (!root.require || !root.require.packaged) {
         _require.original = root.require;
-
         root.require = require;
+        root.require.packaged = true;
+    }
 }
 
 exportAce(ACE_NAMESPACE);
 
 })();
+
+define('ace/requirejs/text', ['require', 'exports', 'module'], function(require, exports, module) {
+    // this won't be called it is needed only for included text modules
+    exports.load = function (name, req, onLoad, config) {
+        require("ace/lib/net").get(req.toUrl(name), onLoad);
+    };
+});

install.js

@@ -39,22 +39,11 @@
 
 var buildAce = require("./Makefile.dryice").buildAce;
 
-
-var ACE_HOME = __dirname;
-
 try {
-    var aceProject = {
+	buildAce({
-        roots: [
-            ACE_HOME + '/lib',
-            ACE_HOME + '/demo'
-        ],
-        textPluginPattern: /^ace\/requirejs\/text!/
-    };
-	buildAce(aceProject, {
 		compress: false,
 		noconflict: false,
 		suffix: "",
-		compat: true,
 		name: "ace"
 	});
 } catch (e) {