Skip to content

Commit adc7dea

Browse files
anmonteiroswannodette
authored andcommitted
CLJS-2330: Don't set "browser" field for Closure if target is :nodejs
1 parent 694a623 commit adc7dea

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/main/clojure/cljs/build/api.clj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,12 @@
277277
the module-deps package on the supplied JavaScript entry points. Assumes
278278
that the `@cljs-oss/module-deps` NPM package is either locally or globally
279279
installed."
280-
[entries]
281-
(closure/node-inputs entries))
280+
([entries]
281+
(node-inputs entries
282+
(when-not (nil? env/*compiler*)
283+
(:options @env/*compiler*))))
284+
([entries opts]
285+
(closure/node-inputs entries opts)))
282286

283287
(comment
284288
(node-inputs

src/main/clojure/cljs/closure.clj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1665,6 +1665,8 @@
16651665
(= module-type :amd)) js-modules)))
16661666
(.setLanguageIn (lang-key->lang-mode :ecmascript6))
16671667
(.setLanguageOut (lang-key->lang-mode (:language-out opts :ecmascript3))))
1668+
_ (when (= (:target opts) :nodejs)
1669+
(.setPackageJsonEntryNames options ^List '("module", "main")))
16681670
closure-compiler (doto (make-closure-compiler)
16691671
(.init externs source-files options))
16701672
_ (.parse closure-compiler)

0 commit comments

Comments
 (0)