move deps into node_modules and make better use

fjakobs · fjakobs · commit 2ecef49e39f8 · 2011-11-02T13:15:04.000+01:00
of npm
diff --git a/.gitignore b/.gitignore
@@ -13,11 +13,14 @@
 
 # A handy place to put stuff that git should ignore:
 /ignore/
-support/async/
-support/node-htmlparser/
-support/node-o3-xml/
-support/requirejs/
+node_modules/htmlparser/
+node_modules/amd-loader/
+node_modules/asyncjs/
+node_modules/jsdom/
+node_modules/libxml/
+node_modules/mime/
+node_modules/uglify-js/
+node_modules/.bin/
+
 
-/node_modules
-support/node-o3-xml-v4/
 .git-ref
diff --git a/.gitmodules b/.gitmodules
@@ -1,12 +1,12 @@
-[submodule "node_modules/cockpit"]
-	path = node_modules/cockpit
-	url = git://github.com/ajaxorg/cockpit.git
-[submodule "node_modules/pilot"]
-	path = node_modules/pilot
-	url = git://github.com/ajaxorg/pilot.git
-[submodule "node_modules/dryice"]
-	path = node_modules/dryice
-	url = git://github.com/ajaxorg/dryice.git
 [submodule "doc/wiki"]
 	path = doc/wiki
 	url = git://github.com/ajaxorg/ace.wiki.git
+[submodule "node_modules/dryice"]
+	path = node_modules/dryice
+	url = git://github.com/ajaxorg/dryice.git
+[submodule "node_modules/pilot"]
+	path = node_modules/pilot
+	url = git://github.com/ajaxorg/pilot.git
+[submodule "node_modules/cockpit"]
+	path = node_modules/cockpit
+	url = git://github.com/ajaxorg/cockpit.git
diff --git a/Makefile.dryice.js b/Makefile.dryice.js
@@ -82,14 +82,14 @@ if (!target) {
 
 console.log("using targetDir '", targetDir, "'");
 
-var copy = require('./support/dryice/lib/dryice').copy;
+var copy = require('dryice').copy;
 
 var aceHome = __dirname;
 
 console.log('# ace ---------');
 
 var aceProject = [
-    aceHome + '/support/pilot/lib',
+    aceHome + '/node_modules/pilot/lib',
     aceHome + '/lib',
     aceHome
 ];
@@ -274,7 +274,7 @@ console.log('# ace worker ---------');
     console.log("worker for " + mode + " mode");
     var worker = copy.createDataObject();
     var workerProject = copy.createCommonJsProject([
-        aceHome + '/support/pilot/lib',
+        aceHome + '/node_modules/pilot/lib',
         aceHome + '/lib'
     ]);
     copy({
diff --git a/kitchen-sink.html b/kitchen-sink.html
@@ -191,8 +191,8 @@
           paths: {
               demo: "..",
               ace: "../../lib/ace",
-              cockpit: "../../support/cockpit/lib/cockpit",
-              pilot: "../../support/pilot/lib/pilot"
+              cockpit: "../../node_modules/cockpit/lib/cockpit",
+              pilot: "../../node_modules/pilot/lib/pilot"
           }
       };
   </script>
diff --git a/lib/ace/test/all.js b/lib/ace/test/all.js
@@ -38,4 +38,4 @@
 require("../../../support/paths");
 
 var test = require("asyncjs").test;
-test.walkTestCases(__dirname + "/..").exec()
+test.walkTestCases(__dirname + "/..").exec();
diff --git a/package.json b/package.json
@@ -10,23 +10,19 @@
         "type" : "git",
          "url" : "http://github.com/ajaxorg/ace.git"
     },
-    "overlay": {
-        "teleport": {
-            "directories": {
-                "lib": "lib/ace",
-                "dependencies": {
-                    "cockpit": ">=0.1.1",
-                    "pilot": ">=0.1.1"
-                }
-            }
-        }
-    },
     "dependencies": {
-        "asyncjs": ">=0.0.2",
-        "jsdom": ">=0.1.23",
-        "htmlparser": ">=1.7.2",
         "mime": ">=1.2.1"
     },
+    "devDependencies": {
+        "asyncjs": "0.0.x",
+        "uglify-js": "1.1.x",
+        "jsdom": "0.1.x",
+        "htmlparser": "1.7.x",
+        "mime": "1.2.x",
+        "amd-loader": "0.0.x",
+        "libxml": "0.0.x"
+    },
+    
     "licenses": [{
         "type": "MPL",
         "url": "http://www.mozilla.org/MPL/"
diff --git a/support/paths.js b/support/paths.js
diff --git a/support/requireJS-node.js b/support/requireJS-node.js
diff --git a/tool/tmtheme.js b/tool/tmtheme.js
@@ -1,4 +1,4 @@
-var xml = require("../support/node-o3-xml-v4/lib/o3-xml");
+var xml = require("libxml");
 var fs = require("fs");
 
 function plistToJson(el) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var xml = require("../support/node-o3-xml-v4/lib/o3-xml");`
	`1`	`+var xml = require("libxml");`
`2`	`2`	`var fs = require("fs");`
`3`	`3`
`4`	`4`	`function plistToJson(el) {`