Skip to content

Commit 478eb80

Browse files
committed
CLJS-1365: cljs.js: :context :expr propagates down into ns loading
1 parent 8b70d75 commit 478eb80

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/cljs/cljs/js.cljs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
(-> (:*cljs-dep-set* bound-vars) meta :dep-path)))
230230
(if (seq deps)
231231
(let [dep (first deps)]
232-
(require bound-vars dep opts
232+
(require bound-vars dep (dissoc opts :context)
233233
(fn [res]
234234
(if-not (:error res)
235235
(load-deps bound-vars ana-env lib (next deps) opts cb)
@@ -283,7 +283,10 @@
283283
k (or (k reload)
284284
(get-in reloads [k nsym])
285285
(and (= nsym name) (:*reload-macros* bound-vars) :reload))]
286-
(require bound-vars nsym k (assoc opts :macros-ns true)
286+
(require bound-vars nsym k
287+
(-> opts
288+
(assoc :macros-ns true)
289+
(dissoc :context))
287290
(fn [res]
288291
(if-not (:error res)
289292
(load-macros bound-vars k (next macros) reload reloads opts cb)

0 commit comments

Comments
 (0)