Skip to content

Commit

Permalink
CLJS-3275: compute upstream npm-deps when :npm-deps is not set
Browse files Browse the repository at this point in the history
When :npm-deps is not explicitly configured it should still be able to find
upstream dependencies through deps.cljs.

This also fixes cljs.main --install-deps.
  • Loading branch information
plexus authored and swannodette committed Aug 7, 2020
1 parent b5b099a commit ccde79a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/main/clojure/cljs/closure.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2437,7 +2437,8 @@
(reduce
(fn [m [dep v]]
(cond-> m
(and (map? npm-deps) (not (contains? npm-deps dep)))
(and (or (nil? npm-deps) (map? npm-deps))
(not (contains? npm-deps dep)))
(assoc dep (if (coll? v)
(last (sort v))
v))))
Expand Down

0 comments on commit ccde79a

Please sign in to comment.