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.
alexisvincent · Aug 13, 2020 · a15247a · a15247a
1 parent 5b6558b
commit a15247a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/clojure/cljs/closure.clj b/src/main/clojure/cljs/closure.clj
@@ -2585,7 +2585,10 @@
 
 (defn maybe-install-node-deps!
   [{:keys [deps-cmd npm-deps verbose] :or {deps-cmd "npm"} :as opts}]
-  (let [npm-deps (merge npm-deps (compute-upstream-npm-deps opts))]
+  (let [npm-deps (merge (if (map? npm-deps)
+                          npm-deps
+                          {})
+                        (compute-upstream-npm-deps opts))]
     (when-not (empty? npm-deps)
       (let [pkg-json (io/file "package.json")]
         (when (or ana/*verbose* verbose)