wip

Author: swannodette

src/main/clojure/cljs/build/api.clj

@@ -193,7 +193,10 @@
      (if-not (nil? env/*compiler*)
        env/*compiler*
        (env/default-compiler-env
-         (closure/add-externs-sources opts)))))
+         ;; need to dissoc :foreign-libs since we won't know what overriding
+         ;; foreign libspecs are referring to until after add-implicit-options
+         ;; - David
+         (closure/add-externs-sources (dissoc opts :foreign-libs))))))
   ([source opts compiler-env]
    (doseq [[unknown-opt suggested-opt] (util/unknown-opts (set (keys opts)) closure/known-opts)]
      (when suggested-opt

src/main/clojure/cljs/closure.clj

@@ -2432,7 +2432,10 @@
       (if-not (nil? env/*compiler*)
         env/*compiler*
         (env/default-compiler-env
-          (add-externs-sources opts)))))
+          ;; need to dissoc :foreign-libs since we won't know what overriding
+          ;; foreign libspecs are referring to until after add-implicit-options
+          ;; - David
+          (add-externs-sources (dissoc opts :foreign-libs))))))
   ([source opts compiler-env]
      (env/with-compiler-env compiler-env
        ;; we want to warn about NPM dep conflicts before installing the modules

src/main/clojure/cljs/js_deps.cljc

@@ -130,6 +130,11 @@ case."
   (-requires [this] "A list of namespaces that this JavaScript requires.")
   (-source [this] [this opts] "The JavaScript source string."))
 
+(defn get-file [libspec index]
+  (or (:file libspec)
+      (some (fn [provide] (get-in index [provide :file]))
+        (:provides libspec))))
+
 (defn build-index
   "Index a list of dependencies by namespace and file name. There can
   be zero or more namespaces provided per file. Upstream foreign libraies
@@ -159,7 +164,11 @@ case."
                          index provides)
                        index)]
         (if (:foreign dep)
-          (update-in index' [(:file dep)] merge dep)
+          (if-let [file (get-file dep index)]
+            (update-in index' [file] merge dep)
+            (throw
+              (Exception.
+                (str "No :file provided for foreign libspec " (pr-str dep)))))
           (assoc index' (:file dep) dep))))
     {} deps))