Merge pull request #4851 from ajaxorg/commonjs

move code to src folder and switch to commonjs

.eslintignore

@@ -9,9 +9,9 @@ lib/ace/mode/xml/*
 lib/ace/mode/xquery/*
 lib/ace/mode/xquery.js
 lib/ace/mode/yaml/*
-lib/ace/test/asyncjs/
-lib/ace/lib/es5-shim.js
-lib/ace/keyboard/vim*.js
+**/test/asyncjs/*
+**/es5-shim.js
+**/vim*.js
 experiments/
 tool/
 doc/

.eslintrc

@@ -1,4 +1,7 @@
 {
+    "parserOptions": {
+        "ecmaVersion": 2015
+    },
     "globals": {
         define: true,
         require: true,

.github/workflows/nodejs.yml

@@ -28,8 +28,8 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm i && npm i eslint istanbul typescript
-    - run: node_modules/.bin/istanbul cover lib/ace/test/all.js
+    - run: npm i
+    - run: npm run cover
     - run: |
         set -x;
         git status;

.gitignore

@@ -23,4 +23,6 @@ jam/
 .git-ref
 npm-debug.log
 deps/
-dist
+dist
+
+lib/ace

Makefile.dryice.js

@@ -40,10 +40,56 @@ var ACE_HOME = __dirname;
 var BUILD_DIR = ACE_HOME + "/build";
 var CACHE = {};
 
+function generateAmdModules() {
+    var root = ACE_HOME + "/";
+    function iterate(dir) {
+        var filenames = fs.readdirSync(root + dir);
+        filenames.forEach(function(name) {
+            var path = dir + name;
+            var stat = fs.statSync(root + path);
+            var newPath = path.replace("src", "lib/ace");
+            if (stat.isDirectory()) {
+                try {
+                    fs.mkdirSync(root + newPath);
+                } catch(e) {}
+                iterate(path + "/");
+            } else if (/\.js/.test(name) && !/worker_client\.js$/.test(name)) {
+                transform(path, newPath);
+            }
+        });
+    }
+    function transform(path, newPath) {
+        var data = fs.readFileSync(root + path, "utf-8");
+        data = compileTypescript(data);
+        fs.writeFileSync(root + newPath, data, "utf-8");
+    }
+    function compileTypescript(code) {
+        var ts = require("typescript");
+        return ts.transpileModule(code, {
+            compilerOptions: {
+                newLine: "lf",
+                downlevelIteration: true,
+                suppressExcessPropertyErrors: true,
+                module: ts.ModuleKind.CommonJS,
+                removeComments: false,
+                sourceMap: false,
+                inlineSourceMap: false,
+                target: "ES5"
+            },
+            fileName: ""
+        }).outputText;
+    }
+
+    iterate("src/");
+}
+
 function main(args) {
     if (args.indexOf("updateModes") !== -1) {
         return updateModes();
     }
+
+    generateAmdModules();
+
     var type = "minimal";
     args = args.map(function(x) {
         if (x[0] == "-" && x[1] != "-")
@@ -594,9 +640,6 @@ function normalizeLineEndings(module) {
 function includeLoader(module) {
     var pattern = '"include loader_build";';
     if (module.source && module.source.indexOf(pattern) != -1) {
-        console.log("=====================================  =====================================");
-        console.log(module);
-        console.log("=====================================  =====================================");
         module.deps.push("ace/loader_build");
         module.source = module.source.replace(pattern, 'require("./loader_build")(exports)');
     }

demo/code_lens.html

@@ -25,7 +25,7 @@
 <script src="kitchen-sink/require.js"></script>
 <script>
 // setup paths
-require.config({paths: { "ace" : "../lib/ace"}});
+require.config({paths: { "ace" : "../src"}});
 // load ace and extensions
 require(["ace/ace", "ace/ext/code_lens"], function(ace, codeLens) {
     var editor = ace.edit("editor");
@@ -110,7 +110,7 @@
                 });
 
             }
-            callback(p);
+            callback(null, p);
         }
     });
 

demo/kitchen-sink/demo.js

@@ -1,35 +1,3 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-define(function(require, exports, module) {
 "use strict";
 
 require("ace/ext/rtl");
@@ -556,5 +524,3 @@ function moveFocus() {
     else
         env.editor.focus();
 }
-
-});

demo/kitchen-sink/dev_util.js

@@ -1,34 +1,3 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
 var ace = require("ace/ace");
 var dom = require("ace/lib/dom");
 var event = require("ace/lib/event");
@@ -427,5 +396,3 @@ exports.log = function(str) {
 };
 
 exports.addGlobals();
-
-});

demo/kitchen-sink/doclist.js

@@ -1,34 +1,3 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
- define(function(require, exports, module) {
 "use strict";
 
 var EditSession = require("ace/edit_session").EditSession;
@@ -218,6 +187,3 @@ module.exports.all = {
     "Huge documents": module.exports.hugeDocs,
     "own source": module.exports.ownSource
 };
-
-});
-

demo/kitchen-sink/docs/javascript.js

@@ -2,4 +2,4 @@ function foo(items, nada) {
     for (var i=0; i<items.length; i++) {
         alert(items[i] + "juhu\n");
     }	// Real Tab.
-}
+}

demo/kitchen-sink/file_drop.js

@@ -1,35 +1,3 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-
 var config = require("ace/config");
 var event = require("ace/lib/event");
 var modelist = require("ace/ext/modelist");
@@ -69,5 +37,3 @@ config.defineOptions(Editor.prototype, "editor", {
         value: true
     }
 });
-
-});

demo/kitchen-sink/inline_editor.js

@@ -1,35 +1,3 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of Ajax.org B.V. nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-define(function(require, exports, module) {
 "use strict";
 
 var LineWidgets = require("ace/line_widgets").LineWidgets;
@@ -99,4 +67,3 @@ require("ace/commands/default_commands").commands.push({
         inlineEditor.setTheme("ace/theme/solarized_light");
     }
 });
-});

demo/kitchen-sink/layout.js

@@ -1,5 +1,3 @@
-
-define(function(require, exports, module) {
 "use strict";
 
 var dom = require("ace/lib/dom");
@@ -125,8 +123,3 @@ exports.singleLineEditor = function(el) {
 
     return editor;
 };
-
-
-
-});
-