Skip to content

CLJS-2820 Compile cljs.loader regardless of whether :modules are used #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2022
Merged

CLJS-2820 Compile cljs.loader regardless of whether :modules are used #169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions src/main/clojure/cljs/closure.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,15 +1247,16 @@
compiled last after all inputs. This is because all inputs must be known and
they must already be sorted in dependency order."
[inputs {:keys [modules] :as opts}]
(when-let [loader (when (seq modules)
(->> inputs
(filter
(fn [input]
(some '#{"cljs.loader" cljs.loader}
(:provides input))))
first))]
(let [module-uris (module-graph/modules->module-uris modules inputs opts)
module-infos (module-graph/modules->module-infos modules)]
(when-let [loader (->> inputs
(filter
(fn [input]
(some '#{"cljs.loader" cljs.loader}
(:provides input))))
first)]
(let [module-uris (when (seq modules)
(module-graph/modules->module-uris modules inputs opts))
module-infos (when (seq modules)
(module-graph/modules->module-infos modules))]
(swap! env/*compiler* ana/add-consts
{'cljs.core/MODULE_INFOS
(merge (const-expr-form @env/*compiler* 'cljs.core/MODULE_INFOS) module-infos)
Expand Down