8000 Remove duplicate dependencies instead of calling distinct. · clojure/clojurescript@916a07c · GitHub
[go: up one dir, main page]

Skip to content

Commit 916a07c

Browse files
author
Brenton Ashworth
committed
Remove duplicate dependencies instead of calling distinct.
inputs, required-cljs and required-js are now disjoint sets of distinct elements. This means they can be concatinated and the result is a set of distinct elements.
1 parent 335a1f6 commit 916a07c

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/clj/cljs/closure.clj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -591,15 +591,15 @@
591591
plus all dependencies in dependency order."
592592
[opts & inputs]
593593
(let [requires (mapcat -requires inputs)
594-
required-cljs (cljs-dependencies opts requires)
594+
required-cljs (remove (set inputs) (cljs-dependencies opts requires))
595595
required-js (js-dependencies opts (set (concat (mapcat -requires required-cljs) requires)))]
596-
(distinct (concat (map #(-> (javascript-file (:foreign %)
597-
(or (:url %) (io/resource (:file %)))
598-
(:provides %)
599-
(:requires %))
600-
(assoc :group (:group %))) required-js)
601-
required-cljs
602-
inputs))))
596+
(concat (map #(-> (javascript-file (:foreign %)
597+
(or (:url %) (io/resource (:file %)))
598+
(:provides %)
599+
(:requires %))
600+
(assoc :group (:group %))) required-js)
601+
required-cljs
602+
inputs)))
603603

604604
(comment
605605
;; add dependencies to literal js

0 commit comments

Comments
 (0)
0