Skip to content

bootstrap wasn't updated for cljs.compiler/emit-global-export change #299

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
swannodette merged 1 commit into from
Nov 30, 2025
+5 −7
Merged

bootstrap wasn't updated for cljs.compiler/emit-global-export change #299

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
12 changes: 5 additions & 7 deletions src/main/cljs/cljs/js.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,14 +651,14 @@
(.append sb "null;")))

(defn- global-exports-side-effects
[bound-vars sb deps ns-name emit-nil-result?]
[bound-vars sb deps ns-name opts]
(let [{:keys [js-dependency-index]} @(:*compiler* bound-vars)]
(doseq [dep deps]
(let [{:keys [global-exports]} (get js-dependency-index (name dep))]
(.append sb
(with-out-str
(comp/emit-global-export ns-name global-exports dep)))))
(when (and (seq deps) emit-nil-result?)
(comp/emit-global-export ns-name global-exports dep opts)))))
(when (and (seq deps) (:def-emits-var opts))
(.append sb "null;"))))

(defn- trampoline-safe
Expand Down Expand Up @@ -835,8 +835,7 @@
(node-side-effects bound-vars sb node-deps ns-name (:def-emits-var opts)))
(global-exports-side-effects bound-vars sb
(filter ana/dep-has-global-exports? (:deps ast))
ns-name
(:def-emits-var opts))
ns-name opts)
(cb (try
{:ns ns-name :value ((:*eval-fn* bound-vars) {:source (.toString sb)})}
(catch :default cause
Expand Down Expand Up @@ -1102,8 +1101,7 @@
(node-side-effects bound-vars sb node-deps ns-name (:def-emits-var opts)))
(global-exports-side-effects bound-vars sb
(filter ana/dep-has-global-exports? (:deps ast))
ns-name
(:def-emits-var opts))
ns-name opts)
(trampoline compile-loop ns'))))))
(do
(env/with-compiler-env (assoc @(:*compiler* bound-vars) :options opts)
Expand Down
Loading