Merge a21be26f4e into 9916d0e547

index.js

@@ -0,0 +1 @@
+module.exports = require("./tools/node")

package.json

@@ -21,5 +21,6 @@
     "bin": {
         "uglifyjs" : "bin/uglifyjs"
     },
+    "main": "./tools/node",
     "scripts": {"test": "node test/run-tests.js"}
 }

test/run-tests.js

@@ -1,6 +1,8 @@
 #! /usr/bin/env node
 
-var U = require("../tools/node");
+// Test the two requires
+["../tools/node", "../"].forEach(function(requireFile) {
+  var U = require(requireFile);
   var path = require("path");
   var fs = require("fs");
   var assert = require("assert");
@@ -168,3 +170,4 @@ function evaluate(code) {
           code = make_code(code);
       return new Function("return(" + code + ")")();
   }
+});