Skip to content

Commit df70c1a

Browse files
authored
bootstrap wasn't updated for cljs.compiler/emit-global-export change (#299)
1 parent 9a55107 commit df70c1a

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

src/main/cljs/cljs/js.cljs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,14 @@
651651
(.append sb "null;")))
652652

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

664664
(defn- trampoline-safe
@@ -835,8 +835,7 @@
835835
(node-side-effects bound-vars sb node-deps ns-name (:def-emits-var opts)))
836836
(global-exports-side-effects bound-vars sb
837837
(filter ana/dep-has-global-exports? (:deps ast))
838-
ns-name
839-
(:def-emits-var opts))
838+
ns-name opts)
840839
(cb (try
841840
{:ns ns-name :value ((:*eval-fn* bound-vars) {:source (.toString sb)})}
842841
(catch :default cause
@@ -1102,8 +1101,7 @@
11021101
(node-side-effects bound-vars sb node-deps ns-name (:def-emits-var opts)))
11031102
(global-exports-side-effects bound-vars sb
11041103
(filter ana/dep-has-global-exports? (:deps ast))
1105-
ns-name
1106-
(:def-emits-var opts))
1104+
ns-name opts)
11071105
(trampoline compile-loop ns'))))))
11081106
(do
11091107
(env/with-compiler-env (assoc @(:*compiler* bound-vars) :options opts)

0 commit comments

Comments
 (0)