Skip to content

Commit d04287d

Browse files
author
dnolen
committed
do not rely on Closure to load deps, do it ourselves. do not load
goog/base.js twice
1 parent 345041b commit d04287d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/clojure/cljs/closure.clj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1520,13 +1520,16 @@
15201520
{:output-to (:output-to module)}))
15211521
(str (when (or (not module) (= :cljs-base (:module-name opts)))
15221522
(str "var CLOSURE_UNCOMPILED_DEFINES = " closure-defines ";\n"
1523+
"var CLOSURE_NO_DEPS = true;\n"
15231524
"if(typeof goog == \"undefined\") document.write('<script src=\"" asset-path "/goog/base.js\"></script>');\n"
1525+
"document.write('<script src=\"" asset-path "/goog/deps.js\"></script>');\n"
15241526
"document.write('<script src=\"" asset-path "/cljs_deps.js\"></script>');\n"
15251527
"document.write('<script>if (typeof goog == \"undefined\") console.warn(\"ClojureScript could not load :main, did you forget to specify :asset-path?\");</script>');\n"
15261528
(apply str (preloads (:preloads opts) :browser))))
15271529
(apply str
15281530
(map (fn [entry]
1529-
(str "document.write('<script>goog.require(\"" (comp/munge entry)"\");</script>');\n"))
1531+
(when-not (= "goog" entry)
1532+
(str "document.write('<script>goog.require(\"" (comp/munge entry) "\");</script>');\n")))
15301533
(if-let [entries (when module (:entries module))]
15311534
entries
15321535
(when-let [main (:main opts)]

0 commit comments

Comments
 (0)