Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/clojure/cljs/cli.clj
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,8 @@ present"
reopts (merge repl-env-options (select-keys opts [:main :output-dir]))
_ (when (or ana/*verbose* (:verbose opts))
(util/debug-prn "REPL env options:" (pr-str reopts)))
renv (apply (target->repl-env (:target options) repl-env) (mapcat identity reopts))]
renv (-> (apply (target->repl-env (:target options) repl-env) (mapcat identity reopts))
(assoc :compiler-opts opts))]
(repl/repl* renv
(assoc opts
::repl/fast-initial-prompt?
Expand Down
9 changes: 7 additions & 2 deletions src/main/clojure/cljs/repl/browser.clj
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@

(defn send-static
[{path :path :as request} conn
{:keys [static-dir output-dir host port gzip?] :or {output-dir "out"} :as opts}]
{:keys [static-dir output-dir host port gzip? compiler-opts] :or {output-dir "out"} :as opts}]
(let [output-dir (when-not (.isAbsolute (io/file output-dir)) output-dir)]
(if (and static-dir (not= "/favicon.ico" path))
(let [path (if (= "/" path) "/index.html" path)
Expand Down Expand Up @@ -224,7 +224,11 @@
clojure.browser.repl/PORT ~port}
(merge (:closure-defines @browser-state))
cljsc/normalize-closure-defines
json/write-str)]
json/write-str)
preloads (when-let [preloads (:preloads compiler-opts)]
(mapv (fn [ns-symb]
(str "document.write('<script>goog.require(\"" (munge ns-symb) "\");</script>');"))
preloads))]
(server/send-and-close conn 200
(str "var CLOSURE_UNCOMPILED_DEFINES = " closure-defines ";\n"
"var CLOSURE_NO_DEPS = true;\n"
Expand All @@ -233,6 +237,7 @@
(when (.exists (io/file output-dir "cljs_deps.js"))
(str "document.write('<script src=\"" output-dir "/cljs_deps.js\"></script>');\n"))
"document.write('<script src=\"" output-dir "/brepl_deps.js\"></script>');\n"
(when preloads (str/join "\n" preloads))
"document.write('<script>goog.require(\"clojure.browser.repl.preload\");</script>');\n")
"text/javascript" "UTF-8"))

Expand Down
Loading