Skip to content

Commit a46eea2

Browse files
author
dnolen
committed
don't limit :preloads to ClojureScript sources
1 parent d187ad7 commit a46eea2

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/main/clojure/cljs/closure.clj

+5-4
Original file line numberDiff line numberDiff line change
@@ -881,8 +881,9 @@
881881
"Given list of IJavaScript objects, add foreign-deps, constants-table, and
882882
preloads IJavaScript objects to the list."
883883
[inputs opts]
884-
(let [requires (set (mapcat deps/-requires inputs))
885-
required-js (js-dependencies opts requires)]
884+
(let [requires (set (mapcat deps/-requires inputs))
885+
required-js (js-dependencies opts requires)
886+
cenv @env/*compiler*]
886887
(concat
887888
(map
888889
(fn [{:keys [foreign url file provides requires] :as js-map}]
@@ -891,12 +892,12 @@
891892
(javascript-file foreign url provides requires)
892893
js-map)))
893894
required-js)
894-
[(when (-> @env/*compiler* :options :emit-constants)
895+
[(when (-> cenv :options :emit-constants)
895896
(let [url (deps/to-url (str (util/output-directory opts) "/constants_table.js"))]
896897
(javascript-file nil url url ["constants-table"] ["cljs.core"] nil nil)))]
897898
(remove nil?
898899
(map (fn [preload]
899-
(if-let [uri (:uri (cljs-source-for-namespace preload))]
900+
(if-let [uri (:uri (source-for-namespace preload cenv))]
900901
(-compile uri opts)
901902
(util/debug-prn "WARNING: preloads namespace" preload "does not exist")))
902903
(:preloads opts)))

0 commit comments

Comments
 (0)