CLJS-2673: Regression: Can't require cljs.js

Author: mfikes

src/main/clojure/cljs/closure.clj

@@ -2671,12 +2671,13 @@
    libs, and foreign libs. Duplicates the pipeline of build."
   [inputs opts]
   (env/ensure
-    (let [sources (-> inputs (add-dependency-sources opts))
+    (let [sources (-> inputs
+                    (#(map add-core-macros-if-cljs-js %))
+                    (add-dependency-sources opts))
           opts    (handle-js-modules opts sources env/*compiler*)
           sources (-> sources
                     deps/dependency-order
                     (compile-sources false opts)
-                    (#(map add-core-macros-if-cljs-js %))
                     (add-js-sources opts) deps/dependency-order
                     (->> (map #(source-on-disk opts %)) doall))]
       sources)))

src/test/cljs_cli/cljs_cli/test.clj

@@ -87,3 +87,12 @@
                                 "--compile" "foo.core")]
           (is (zero? (:exit result)))
           (is (str/blank? (:err result))))))))
+
+(deftest test-cljs-2673
+  (with-repl-env-filter #{"node"}
+    (-> (cljs-main
+          "-e" "(require 'cljs.js)"
+          "-e" "(cljs.js/eval-str (cljs.js/empty-state) \"(+ 1 2)\" nil {:eval cljs.js/js-eval :context :expr} prn)")
+      (output-is
+        nil
+        "{:ns cljs.user, :value 3}"))))