Skip to content

Commit a15247a

Browse files
plexusswannodette
authored andcommitted
CLJ-3279 Error when :npm-deps is boolean and :install-deps true
Don't assume that :npm-deps is a map/nil, since it can also be boolean.
1 parent 5b6558b commit a15247a

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/clojure/cljs/closure.clj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2585,7 +2585,10 @@
25852585

25862586
(defn maybe-install-node-deps!
25872587
[{:keys [deps-cmd npm-deps verbose] :or {deps-cmd "npm"} :as opts}]
2588-
(let [npm-deps (merge npm-deps (compute-upstream-npm-deps opts))]
2588+
(let [npm-deps (merge (if (map? npm-deps)
2589+
npm-deps
2590+
{})
2591+
(compute-upstream-npm-deps opts))]
25892592
(when-not (empty? npm-deps)
25902593
(let [pkg-json (io/file "package.json")]
25912594
(when (or ana/*verbose* verbose)

0 commit comments

Comments
 (0)