refactor Node.js support

Author: swannodette

src/main/cljs/cljs/bootstrap_node.js

@@ -72,7 +72,7 @@ global.CLOSURE_IMPORT_SCRIPT = function(src) {
 
   // Sources are always expressed relative to closure's base.js, but
   // require() is always relative to the current source.
-  require(path.join(".", "..", src));
+  nodeGlobalRequire(path.resolve(__dirname, '..', src));
   return true;
 };
 

src/main/cljs/cljs/nodejs.cljs

@@ -13,8 +13,8 @@
   (:refer-clojure :exclude [require]))
 
 ; Define namespaced references to Node's externed globals:
-(def require (js* "require"))
-(def process (js* "process"))
+; (def require (js* "require")) ;
+; (def process (js* "process"))
 
 (defn enable-util-print! []
   (set! *print-newline* false)

src/main/cljs/cljs/nodejscli.cljs

@@ -17,8 +17,5 @@
   (set! js/goog.global js/global))
 
 ;; Call the user's main function
-(if (or (nil? cljs.core/*main-cli-fn*)
-        (not (fn? cljs.core/*main-cli-fn*)))
-  (throw (js/Error. "cljs.core/*main-cli-fn* not set"))
+(when (fn? cljs.core/*main-cli-fn*)
   (apply cljs.core/*main-cli-fn* (drop 2 (.-argv nodejs/process))))
-

src/main/clojure/cljs/repl/node.clj

@@ -153,7 +153,7 @@
           (string/replace "path.resolve(__dirname, '..', 'base.js')"
             (platform-path (conj rewrite-path "bootstrap" ".." "base.js")))
           (string/replace
-            "path.join(\".\", \"..\", src)"
+            "path.resolve(__dirname, '..', src)"
             (str "path.join(" (platform-path rewrite-path) ", src)"))
           (string/replace
             "var CLJS_ROOT = \".\";"