CLJS-2645: cljs.main: failure with :closure-defines and non-Nashorn in :none mode

Author: mfikes

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

@@ -171,6 +171,7 @@
           (= path (cond->> "/main.js" output-dir (str "/" output-dir )))
           (let [closure-defines (-> `{clojure.browser.repl/HOST ~host
                                       clojure.browser.repl/PORT ~port}
+                                  (merge (:closure-defines @browser-state))
                                   cljsc/normalize-closure-defines
                                   json/write-str)]
             (server/send-and-close conn 200
@@ -302,7 +303,8 @@
               (cljsc/create-client-js-file
                 {:optimizations :simple
                  :output-dir working-dir}
-                (io/file working-dir "brepl_client.js")))))
+                (io/file working-dir "brepl_client.js"))
+              :closure-defines (:closure-defines opts))))
         ;; TODO: this could be cleaner if compiling forms resulted in a
         ;; :output-to file with the result of compiling those forms - David
         (when (and output-dir (not (.exists (io/file output-dir "clojure" "browser" "repl" "preload.js"))))

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

@@ -196,7 +196,10 @@
                (when (or (not (contains? *loaded-libs* name)) reload)
                  (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
                  (js/CLOSURE_IMPORT_SCRIPT
-                   (unchecked-get (.. js/goog -dependencies_ -nameToPath) name))))))))))
+                   (unchecked-get (.. js/goog -dependencies_ -nameToPath) name)))))))
+      (node-eval repl-env
+        (str "goog.global.CLOSURE_UNCOMPILED_DEFINES = "
+          (json/write-str (:closure-defines opts)) ";")))))
 
 (defrecord NodeEnv [host port path socket proc]
   repl/IReplEnvOptions

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

@@ -10,6 +10,7 @@
   (:refer-clojure :exclude [load-file])
   (:require [clojure.string :as string]
             [clojure.java.io :as io]
+            [clojure.data.json :as json]
             [cljs.compiler :as comp]
             [cljs.closure :as closure]
             [cljs.analyzer :as ana]
@@ -154,7 +155,12 @@
              (when (or (not (contains? *loaded-libs* name)) reload)
                (set! *loaded-libs* (conj (or *loaded-libs* #{}) name))
                (js/CLOSURE_IMPORT_SCRIPT
-                 (goog.object/get (.. js/goog -dependencies_ -nameToPath) name)))))))))
+                 (goog.object/get (.. js/goog -dependencies_ -nameToPath) name)))))))
+
+    ;; set closure-defines
+    (rhino-eval repl-env "CLOSURE_UNCOMPILED_DEFINES" 1
+      (str "goog.global.CLOSURE_UNCOMPILED_DEFINES = "
+        (json/write-str (:closure-defines opts)) ";"))))
 
 ;; Catching errors and rethrowing in Rhino swallows the original trace
 ;; https://groups.google.com/d/msg/mozilla.dev.tech.js-engine.rhino/inMyVKhPq6M/cY39hX20_z8J

src/test/cljs_cli/cljs_cli/test.clj

@@ -60,3 +60,11 @@
                                  (shell/sh "node" (str (io/file dir "out" "main.js"))))))
         (-> (cljs-main "-t" "node" "-o" "out/main.js" "-O" "advanced" "-c" "foo.core")
           (output-is))))))
+
+(deftest test-cljs-2645
+  (with-sources {"src/foo/core.cljs"
+                 "(ns foo.core) (goog-define configurable \"default-value\") (defn -main [& args] (println configurable))"}
+    (-> (cljs-main "-m" "foo.core")
+      (output-is "default-value"))
+    (-> (cljs-main "-co" "{:closure-defines {foo.core/configurable \"configured-value\"}}" "-m" "foo.core")
+      (output-is "configured-value"))))