switch bundle? to return true if we see :nodejs-rt false only, :nodejs-rt

option is meaningless by itself anyway

tweak main file gen

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -1670,8 +1670,7 @@
      (map preload-str syms))))
 
 (defn bundle? [opts]
-  (and (= :nodejs (:target opts))
-       (false? (:nodejs-rt opts))))
+  (false? (:nodejs-rt opts)))
 
 (defn export-dep [dep]
   (str "\""dep "\": require('" dep "')" ))
@@ -1742,28 +1741,30 @@
                     (when-let [main (:main opts)]
                       [main])))))
 
-            (str (when (or (not module) (= :cljs-base (:module-name opts)))
-                   (str (when (bundle? opts)
-                          "import {npmDeps} from \"./npm_deps.js\";")
-                        "var CLOSURE_UNCOMPILED_DEFINES = " closure-defines ";\n"
-                        "var CLOSURE_NO_DEPS = true;\n"
-                        "if(typeof goog == \"undefined\") document.write('<script src=\"" asset-path "/goog/base.js\"></script>');\n"
-                        "document.write('<script src=\"" asset-path "/goog/deps.js\"></script>');\n"
-                        "document.write('<script src=\"" asset-path "/cljs_deps.js\"></script>');\n"
-                        "document.write('<script>if (typeof goog == \"undefined\") console.warn(\"ClojureScript could not load :main, did you forget to specify :asset-path?\");</script>');\n"
-                        (when (bundle? opts)
-                          "window.require = function(lib) {\n"
-                          "   return npmDeps[lib];\n"
-                          "}")
-                     (apply str (preloads (:preloads opts) :browser))))
+            (str
+              (when (bundle? opts)
+                "import {npmDeps} from \"./npm_deps.js\";\n")
+              (when (or (not module) (= :cljs-base (:module-name opts)))
+                (str
+                  "var CLOSURE_UNCOMPILED_DEFINES = " closure-defines ";\n"
+                  "var CLOSURE_NO_DEPS = true;\n"
+                  "if(typeof goog == \"undefined\") document.write('<script src=\"" asset-path "/goog/base.js\"></script>');\n"
+                  "document.write('<script src=\"" asset-path "/goog/deps.js\"></script>');\n"
+                  "document.write('<script src=\"" asset-path "/cljs_deps.js\"></script>');\n"
+                  "document.write('<script>if (typeof goog == \"undefined\") console.warn(\"ClojureScript could not load :main, did you forget to specify :asset-path?\");</script>');\n"
+                  (apply str (preloads (:preloads opts) :browser))))
               (apply str
                 (map (fn [entry]
                        (when-not (= "goog" entry)
                          (str "document.write('<script>goog.require(\"" (comp/munge entry) "\");</script>');\n")))
                   (if-let [entries (when module (:entries module))]
                     entries
                     (when-let [main (:main opts)]
-                      [main])))))))))))
+                      [main]))))
+              (when (bundle? opts)
+                "window.require = function(lib) {\n"
+                "   return npmDeps[lib];\n"
+                "}\n"))))))))
 
 (defn fingerprinted-modules [modules fingerprint-info]
   (into {}