Reorganization for publishing as NPM module and adding Browserify sup…

…port
timdown · Aug 21, 2014 · 4f940b7 · 4f940b7
1 parent 527a167
commit 4f940b7
Show file tree

Hide file tree

Showing 57 changed files with 6,396 additions and 12,119 deletions.
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/rangy_github.iml b/.idea/rangy_github.iml
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,10 @@
+roadmap.txt
+/.idea
+/build
+/builder
+/demos
+/fiddlings
+/lib
+/spec
+/src
+/test
diff --git a/builder/build.js b/builder/build.js
@@ -15,7 +15,7 @@ var buildSpec = {
     gitBranch: "master"
 };
 
-var buildDir = "build/";
+var buildDir = "dist/";
 
 var gitDir = buildDir + "repository/", srcDir = gitDir + "src/js/";
 var zipDir;
@@ -41,6 +41,7 @@ function concat(fileList, destPath) {
     fs.writeFileSync(destPath, out.join("\n"), FILE_ENCODING);
 }
 
+/*
 function copyFileSync(srcFile, destFile) {
     var BUF_LENGTH, buff, bytesRead, fdr, fdw, pos;
     BUF_LENGTH = 64 * 1024;
@@ -57,6 +58,43 @@ function copyFileSync(srcFile, destFile) {
     fs.closeSync(fdr);
     return fs.closeSync(fdw);
 }
+*/
+
+function copyFileSync(srcFile, destFile, preserveTimestamps) {
+    var contents = fs.readFileSync(srcFile);
+    fs.writeFileSync(destFile, contents);
+    var stat = fs.lstatSync(srcFile);
+    fs.chmodSync(destFile, stat.mode);
+    if (preserveTimestamps) {
+        fs.utimesSync(destFile, stat.atime, stat.mtime)
+    }
+}
+
+function copyFilesRecursive(srcDir, destDir) {
+    if (fs.existsSync(destDir)) {
+        if (!fs.statSync(destDir).isDirectory()) {
+            throw new Error("Destination exists and is not a directory");
+        }
+    } else {
+        fs.mkdirSync(destDir, fs.statSync(srcDir).mode);
+    }
+
+    var files = fs.readdirSync(srcDir);
+
+    Array.prototype.forEach.call(files, function(fileName) {
+        var srcFilePath = path.join(srcDir, fileName);
+        var destFilePath = path.join(destDir, fileName);
+        var srcFileInfo = fs.lstatSync(srcFilePath);
+
+        if (srcFileInfo.isDirectory()) {
+            copyFilesRecursive(srcFilePath, destFilePath);
+        } else if (srcFileInfo.isSymbolicLink()) {
+            throw new Error("Symbolic links are not supported");
+        } else {
+            copyFileSync(srcFilePath, destFilePath);
+        }
+    });
+}
 
 function deleteBuildDir() {
     // Delete the old build directory
@@ -140,11 +178,9 @@ function copyModuleScripts() {
                 '    if (typeof define == "function" && define.amd) {',
                 '        // AMD. Register as an anonymous module with a dependency on Rangy.',
                 '        define(' + dependencies + ', factory);',
-                '        /*',
-                '         } else if (typeof exports == "object") {',
+                '    } else if (typeof module != "undefined" && typeof exports == "object") {',
                 '         // Node/CommonJS style for Browserify',
                 '         module.exports = factory;',
-                '         */',
                 '    } else {',
                 '        // No AMD or CommonJS support so we use the rangy global variable',
                 '        factory(global.rangy);',
@@ -339,6 +375,10 @@ var tarGz = createArchiver("tar.gz", function() {
     });
 });
 
+function copyToLib() {
+    copyFilesRecursive(uncompressedBuildDir, "lib/");
+}
+
 /*--------------------------------------------------------------------------------------------------------------------*/
 
 // Start the build
@@ -356,7 +396,8 @@ var actions = [
     lint,
     minify,
     zip,
-    tarGz
+    tarGz,
+    copyToLib
 ];
 
 

diff --git a/demos/bold.html b/demos/bold.html
@@ -14,7 +14,7 @@
             color: red;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/demos/bookmark.html b/demos/bookmark.html
@@ -3,7 +3,7 @@
 <head>
     <title>Rangy Core Demo</title>
     <link href="demo.css" rel="stylesheet" type="text/css">
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/demos/commands.html b/demos/commands.html
@@ -21,7 +21,7 @@
             margin-right: 5px;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript">
         var appender = new log4javascript.PopUpAppender();
         log4javascript.getRootLogger().addAppender(appender);

diff --git a/demos/commands_new.html b/demos/commands_new.html
@@ -21,7 +21,7 @@
             margin-right: 5px;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript">
         var appender = new log4javascript.PopUpAppender();
         log4javascript.getRootLogger().addAppender(appender);

diff --git a/demos/events.html b/demos/events.html
@@ -29,7 +29,7 @@
             font-weight: bold;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
 
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>

diff --git a/demos/highlighter-old.html b/demos/highlighter-old.html
@@ -12,7 +12,7 @@
             background-color: limegreen;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/demos/highlighter.html b/demos/highlighter.html
@@ -16,7 +16,7 @@
             border: dotted orange 1px;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript_stub.js"></script>
+    <script type="text/javascript" src="../external/log4javascript_stub.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/demos/position.html b/demos/position.html
@@ -34,7 +34,7 @@
         }
 
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/demos/position2.html b/demos/position2.html
@@ -34,7 +34,7 @@
         }
 
     </style>
-    <script type="text/javascript" src="../lib/log4javascript.js"></script>
+    <script type="text/javascript" src="../external/log4javascript.js"></script>
     <script type="text/javascript">
         var appender = new log4javascript.PopUpAppender();
         log4javascript.getRootLogger().addAppender(appender);

diff --git a/demos/scopedhighlights.html b/demos/scopedhighlights.html
@@ -8,7 +8,7 @@
             background-color: yellow;
         }
     </style>
-    <script type="text/javascript" src="../lib/log4javascript_stub.js"></script>
+    <script type="text/javascript" src="../external/log4javascript_stub.js"></script>
     <script type="text/javascript" src="../src/js/core/core.js"></script>
     <script type="text/javascript" src="../src/js/core/dom.js"></script>
     <script type="text/javascript" src="../src/js/core/domrange.js"></script>

diff --git a/lib/jshashtable.js → external/jshashtable.js b/lib/jshashtable.js → external/jshashtable.js