Skip to content

Commit 078f207

Browse files
author
dnolen
committed
CLJS-1374: cljs.js/require doesn't supply good defaults
1 parent 69f94a0 commit 078f207

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/main/cljs/cljs/js.cljs

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -162,16 +162,19 @@
162162
([name cb]
163163
(require name nil cb))
164164
([name opts cb]
165-
(require
166-
{:*compiler* (env/default-compiler-env)
167-
:*data-readers* tags/*cljs-data-readers*
168-
:*load-fn* (or (:load opts) *load-fn*)
169-
:*eval-fn* (or (:eval opts) *eval-fn*)}
170-
name opts cb))
165+
(require nil name opts cb))
171166
([bound-vars name opts cb]
172167
(require bound-vars name nil opts cb))
173168
([bound-vars name reload opts cb]
174-
(let [name (cond-> name (:macro-ns opts) ana/macro-ns-name)]
169+
(let [bound-vars (merge
170+
{:*compiler* (env/default-compiler-env)
171+
:*data-readers* tags/*cljs-data-readers*
172+
:*load-macros* (or (:load-macros opts) true)
173+
:*analyze-deps* (or (:analyze-deps opts) true)
174+
:*load-fn* (or (:load opts) *load-fn*)
175+
:*eval-fn* (or (:eval opts) *eval-fn*)}
176+
bound-vars)
177+
name (cond-> name (:macro-ns opts) ana/macro-ns-name)]
175178
(when (= :reload reload)
176179
(swap! *loaded* disj name))
177180
(when (= :reload-all reload)
@@ -746,6 +749,8 @@
746749
(def fs (js/require "fs"))
747750
(def st (cljs/empty-state))
748751

752+
(set! *target* "nodejs")
753+
749754
(defn node-eval [{:keys [name source]}]
750755
(.runInThisContext vm source (str (munge name) ".js")))
751756

0 commit comments

Comments
 (0)