CLJS-1235: non-upstream :foreign-libs not copied to :output-dir

cljs.closure:
  - source-for-namespace
    namespaces for js namespaces should not be munged, just call str on ns
    :file may be a string representing a URL. Attempt to parse via URL ctor.

cljs.repl:
  - load-namespace
    filter out the :seed when evaluating dep strings, the :seed is not a valid
    IJavaScript instance

Author: swannodette

src/main/clojure/cljs/closure.clj

@@ -512,11 +512,16 @@
       (let [relpath (str path ".cljc")]
         (if-let [cljc-res (io/resource relpath)]
           {:relative-path relpath :uri cljc-res}
-          (let [relpath (:file (get-in @compiler-env [:js-dependency-index ns-str]))]
-            (if-let [js-res (and relpath (io/resource relpath))]
+          (let [relpath (:file (get-in @compiler-env [:js-dependency-index (str ns)]))]
+            (if-let [js-res (and relpath
+                                 ;; try to parse URL, otherwise just return local
+                                 ;; resource
+                                 (or (try (URL. relpath) (catch Throwable t))
+                                     (io/resource relpath)))]
               {:relative-path relpath :uri js-res}
               (throw
-                (IllegalArgumentException. (str "Namespace " ns " does not exist"))))))))))
+                (IllegalArgumentException.
+                  (str "Namespace " ns " does not exist"))))))))))
 
 (defn cljs-dependencies
   "Given a list of all required namespaces, return a list of
@@ -997,7 +1002,7 @@
   to the specified base file."
   [^File base input]
   (let [base-path  (util/path-seq (.getCanonicalPath base))
-        input-path (util/path-seq (.getCanonicalPath (io/file ^URL (deps/-url input))))
+        input-path (util/path-seq (.getCanonicalPath (io/file (deps/-url input))))
         count-base (count base-path)
         common     (count (take-while true? (map #(= %1 %2) base-path input-path)))
         prefix     (repeat (- count-base common 1) "..")]

src/main/clojure/cljs/repl.cljc

@@ -177,7 +177,8 @@
          ;; source must supply at least :url - David
          sources (cljsc/add-dependencies
                    (merge (env->opts repl-env) opts)
-                   {:requires [(name ns)] :type :seed
+                   {:requires [(name ns)]
+                    :type :seed
                     :url (:uri (cljsc/source-for-namespace
                                  ns env/*compiler*))})
          deps (->> sources
@@ -187,7 +188,9 @@
      (if (:output-dir opts)
        ;; REPLs that read from :output-dir just need to add deps,
        ;; environment will handle actual loading - David
-       (doseq [source (map #(cljsc/source-on-disk opts %) sources)]
+       (doseq [source (->> sources
+                        (remove (comp #{:seed} :type))
+                        (map #(cljsc/source-on-disk opts %)))]
          (-evaluate repl-env "<cljs repl>" 1
            (cljsc/add-dep-string opts source)))
        ;; REPLs that stream must manually load each dep - David