fix :js-properties getting replaced

thheller · Apr 22, 2018 · 7dbec07 · 7dbec07
1 parent b8f8d31
commit 7dbec07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/main/shadow/build/api.clj b/src/main/shadow/build/api.clj
@@ -96,6 +96,11 @@
        :js-options
        default-js-options
 
+       ;; string property names collected while compiling JS
+       ;; will be used to generate externs for closure
+       :js-properties
+       #{}
+
        :last-progress-ref
        (atom (System/currentTimeMillis))
 

diff --git a/src/main/shadow/build/closure.clj b/src/main/shadow/build/closure.clj
@@ -1817,13 +1817,12 @@
                            (update :live-js-deps conj ns)
                            (update :required set/union actual-requires)))))
                  {:required required-js-names
-                  :js-properties #{}
                   :live-js-deps #{}
                   :dead-js-deps #{}}))]
 
-      (assoc state
-        ::shadow-js-cache cache-index-updated
-        :js-properties js-properties
-        :dead-js-deps dead-js-deps
-        :live-js-deps live-js-deps)
+      (-> state
+          (update :js-properties set/union js-properties)
+          (assoc ::shadow-js-cache cache-index-updated
+                 :dead-js-deps dead-js-deps
+                 :live-js-deps live-js-deps))
       )))