use relative module ids to please node.js

Makefile.dryice.js

@@ -91,7 +91,7 @@ console.log('# ace ---------');
 var aceProject = {
     roots: [
         aceHome + '/lib',
-        aceHome
+        aceHome + '/demo'
     ],
     textPluginPattern: /^ace\/requirejs\/text!/
 }
@@ -354,29 +354,12 @@ function demo() {
         source: [
             copy.source.commonjs({
                 project: project,
-                require: [ "demo/kitchen-sink/demo" ]
+                require: [ "kitchen-sink/demo" ]
             })
         ],
         filter: [ copy.filter.moduleDefines ],
         dest: demo
     });
-    copy({
-        source: {
-            root: project,
-            include: /demo\/kitchen-sink\/docs\/.*$/,
-        },
-        filter: [ copy.filter.addDefines ],
-        dest: demo
-    });
-    copy({
-        source: {
-            root: project,
-            include: /ace\/.*\.css$/,
-        },
-        filter: [ copy.filter.addDefines ],
-        dest: demo
-    });
-
     copy({
         source: demo,
         filter: [ filterTextPlugin ],

kitchen-sink.html

@@ -201,7 +201,7 @@
 <!--PACKAGE
   <script src="demo/kitchen-sink/kitchen-sink-uncompressed.js" data-ace-base="src" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
-    require("demo/kitchen-sink/demo");
+    require("kitchen-sink/demo");
   </script>
 <!--PACKAGE-->
 

lib/ace/ace.js

@@ -37,15 +37,15 @@
 
 define(function(require, exports, module) {
 
-    require("ace/lib/fixoldbrowsers");
+    require("./lib/fixoldbrowsers");
 
-    var Dom = require("ace/lib/dom");
-    var Event = require("ace/lib/event");
+    var Dom = require("./lib/dom");
+    var Event = require("./lib/event");
 
-    var Editor = require("ace/editor").Editor;
-    var EditSession = require("ace/edit_session").EditSession;
-    var UndoManager = require("ace/undomanager").UndoManager;
-    var Renderer = require("ace/virtual_renderer").VirtualRenderer;
+    var Editor = require("./editor").Editor;
+    var EditSession = require("./edit_session").EditSession;
+    var UndoManager = require("./undomanager").UndoManager;
+    var Renderer = require("./virtual_renderer").VirtualRenderer;
 
     exports.edit = function(el) {
         if (typeof(el) == "string") {
@@ -56,7 +56,7 @@ define(function(require, exports, module) {
         doc.setUndoManager(new UndoManager());
         el.innerHTML = '';
 
-        var editor = new Editor(new Renderer(el, require("ace/theme/textmate")));
+        var editor = new Editor(new Renderer(el, require("./theme/textmate")));
         editor.setSession(doc);
 
         var env = {};

lib/ace/anchor.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("ace/lib/oop");
-var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
 
 /**
  * An Anchor is a floating pointer in the document. Whenever text is inserted or

lib/ace/anchor_test.js

@@ -36,15 +36,15 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
+    require("amd-loader");
 }
 
 define(function(require, exports, module) {
     
-var Document = require("ace/document").Document;
-var Anchor = require("ace/anchor").Anchor;
-var Range = require("ace/range").Range;
-var assert = require("ace/test/assertions");
+var Document = require("./document").Document;
+var Anchor = require("./anchor").Anchor;
+var Range = require("./range").Range;
+var assert = require("./test/assertions");
 
 module.exports = {
 

lib/ace/background_tokenizer.js

@@ -37,8 +37,8 @@
 
 define(function(require, exports, module) {
 
-var oop = require("ace/lib/oop");
-var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
 
 var BackgroundTokenizer = function(tokenizer, editor) {
     this.running = false;    

lib/ace/commands/command_manager.js

@@ -1,7 +1,7 @@
 define(function(require, exports, module) {
 
-var keyUtil = require("ace/lib/keys");
-var useragent = require("ace/lib/useragent");
+var keyUtil = require("../lib/keys");
+var useragent = require("../lib/useragent");
 
 var CommandManager = function(commands) {
     this.commands = {};

lib/ace/commands/default_commands.js

@@ -40,7 +40,7 @@
 
 define(function(require, exports, module) {
 
-var lang = require("ace/lib/lang");
+var lang = require("../lib/lang");
 
 function bindKey(win, mac) {
     return {

lib/ace/document.js

@@ -37,10 +37,10 @@
 
 define(function(require, exports, module) {
 
-var oop = require("ace/lib/oop");
-var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
-var Range = require("ace/range").Range;
-var Anchor = require("ace/anchor").Anchor;
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
 
 var Document = function(text) {
     this.$lines = [];

lib/ace/document_test.js

@@ -37,15 +37,15 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
     
-var Document = require("ace/document").Document;
-var Range = require("ace/range").Range;
-var assert = require("ace/test/assertions");
+var Document = require("./document").Document;
+var Range = require("./range").Range;
+var assert = require("./test/assertions");
 
 module.exports = {
 

lib/ace/edit_session.js

@@ -40,14 +40,14 @@
 
 define(function(require, exports, module) {
 
-var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
-var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
-var Selection = require("ace/selection").Selection;
-var TextMode = require("ace/mode/text").Mode;
-var Range = require("ace/range").Range;
-var Document = require("ace/document").Document;
-var BackgroundTokenizer = require("ace/background_tokenizer").BackgroundTokenizer;
+var oop = require("./lib/oop");
+var lang = require("./lib/lang");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Selection = require("./selection").Selection;
+var TextMode = require("./mode/text").Mode;
+var Range = require("./range").Range;
+var Document = require("./document").Document;
+var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer;
 
 var EditSession = function(text, mode) {
     this.$modified = true;
@@ -1735,7 +1735,7 @@ var EditSession = function(text, mode) {
 
 }).call(EditSession.prototype);
 
-require("ace/edit_session/folding").Folding.call(EditSession.prototype);
+require("./edit_session/folding").Folding.call(EditSession.prototype);
 
 exports.EditSession = EditSession;
 });

lib/ace/edit_session/fold_line.js

@@ -38,7 +38,7 @@
 
 define(function(require, exports, module) {
 
-var Range = require("ace/range").Range;
+var Range = require("../range").Range;
 
 /**
  * If the an array is passed in, the folds are expected to be sorted already.

lib/ace/edit_session/folding.js

@@ -38,9 +38,9 @@
 
 define(function(require, exports, module) {
 
-var Range = require("ace/range").Range;
-var FoldLine = require("ace/edit_session/fold_line").FoldLine;
-var Fold = require("ace/edit_session/fold").Fold;
+var Range = require("../range").Range;
+var FoldLine = require("./fold_line").FoldLine;
+var Fold = require("./fold").Fold;
 
 function Folding() {
     /**

lib/ace/edit_session_test.js

@@ -37,19 +37,19 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
 
-var lang = require("ace/lib/lang");
-var EditSession = require("ace/edit_session").EditSession;
-var Editor = require("ace/editor").Editor;
-var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-var Range = require("ace/range").Range;
-var assert = require("ace/test/assertions");
+var lang = require("./lib/lang");
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var UndoManager = require("./undomanager").UndoManager;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var Range = require("./range").Range;
+var assert = require("./test/assertions");
 
 function createFoldTestSession() {
     var lines = [

lib/ace/editor.js

@@ -40,22 +40,22 @@
 
 define(function(require, exports, module) {
 
-require("ace/lib/fixoldbrowsers");
+require("./lib/fixoldbrowsers");
 
-var oop = require("ace/lib/oop");
-var event = require("ace/lib/event");
-var lang = require("ace/lib/lang");
-var useragent = require("ace/lib/useragent");
-var TextInput = require("ace/keyboard/textinput").TextInput;
-var MouseHandler = require("ace/mouse/mouse_handler").MouseHandler;
-//var TouchHandler = require("ace/touch_handler").TouchHandler;
-var KeyBinding = require("ace/keyboard/keybinding").KeyBinding;
-var EditSession = require("ace/edit_session").EditSession;
-var Search = require("ace/search").Search;
-var Range = require("ace/range").Range;
-var EventEmitter = require("ace/lib/event_emitter").EventEmitter;
-var CommandManager = require("ace/commands/command_manager").CommandManager;
-var defaultCommands = require("ace/commands/default_commands").commands;
+var oop = require("./lib/oop");
+var event = require("./lib/event");
+var lang = require("./lib/lang");
+var useragent = require("./lib/useragent");
+var TextInput = require("./keyboard/textinput").TextInput;
+var MouseHandler = require("./mouse/mouse_handler").MouseHandler;
+//var TouchHandler = require("./touch_handler").TouchHandler;
+var KeyBinding = require("./keyboard/keybinding").KeyBinding;
+var EditSession = require("./edit_session").EditSession;
+var Search = require("./search").Search;
+var Range = require("./range").Range;
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var CommandManager = require("./commands/command_manager").CommandManager;
+var defaultCommands = require("./commands/default_commands").commands;
 
 var Editor = function(renderer, session) {
     var container = renderer.getContainerElement();

lib/ace/editor_change_document_test.js

@@ -36,18 +36,18 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var Editor = require("ace/editor").Editor;
-var Text = require("ace/mode/text").Mode;
-var JavaScriptMode = require("ace/mode/javascript").Mode;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-var assert = require("ace/test/assertions");
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var Text = require("./mode/text").Mode;
+var JavaScriptMode = require("./mode/javascript").Mode;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var assert = require("./test/assertions");
 
 module.exports = {
 

lib/ace/editor_highlight_selected_word_test.js

@@ -37,17 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-var TextMode = require("ace/mode/text").Mode;
-var assert = require("ace/test/assertions");
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var TextMode = require("./mode/text").Mode;
+var assert = require("./test/assertions");
 
 var lipsum = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. " +
              "Mauris at arcu mi, eu lobortis mauris. Quisque ut libero eget " +

lib/ace/editor_navigation_test.js

@@ -36,16 +36,16 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var Editor = require("ace/editor").Editor;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-var assert = require("ace/test/assertions");
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var assert = require("./test/assertions");
 
 module.exports = {
     createEditSession : function(rows, cols) {

lib/ace/editor_text_edit_test.js

@@ -36,18 +36,18 @@
  * ***** END LICENSE BLOCK ***** */
 
 if (typeof process !== "undefined") {
-    require("../../support/paths");
-    require("ace/test/mockdom");
+    require("amd-loader");
+    require("./test/mockdom");
 }
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var Editor = require("ace/editor").Editor;
-var JavaScriptMode = require("ace/mode/javascript").Mode;
-var UndoManager = require("ace/undomanager").UndoManager;
-var MockRenderer = require("ace/test/mockrenderer").MockRenderer;
-var assert = require("ace/test/assertions");
+var EditSession = require("./edit_session").EditSession;
+var Editor = require("./editor").Editor;
+var JavaScriptMode = require("./mode/javascript").Mode;
+var UndoManager = require("./undomanager").UndoManager;
+var MockRenderer = require("./test/mockrenderer").MockRenderer;
+var assert = require("./test/assertions");
 
 module.exports = {
     "test: delete line from the middle" : function() {

lib/ace/ext/static_highlight.js

@@ -39,9 +39,9 @@
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var TextLayer = require("ace/layer/text").Text;
-var baseStyles = require("ace/requirejs/text!ace/ext/static.css");
+var EditSession = require("../edit_session").EditSession;
+var TextLayer = require("../layer/text").Text;
+var baseStyles = require("../requirejs/text!./static.css");
 
 /** Transforms a given input code snippet into HTML using the given mode
 *