CLJS-2296: Foreign libs that expose modules are not being processed under target node

Author: anmonteiro

src/main/clojure/cljs/closure.clj

@@ -2408,23 +2408,24 @@
         ;; Select Node files that are required by Cljs code,
         ;; and create list of all their dependencies
         node-required (set/intersection (set (keys top-level)) requires)]
-    (if-not (= target :nodejs)
-      (let [opts (-> opts
-                   (update :foreign-libs
-                     (fn [libs]
-                       (into (index-node-modules node-required)
-                         (expand-libs libs))))
-                   process-js-modules)]
-        (swap! compiler-env merge
-          ;; we need to also track the whole top level - this is to support
-          ;; cljs.analyze/analyze-deps, particularly in REPL contexts - David
-          {:js-dependency-index (deps/js-dependency-index opts)
-           :node-module-index (into #{} (map str (keys top-level)))})
-        opts)
-      (do
-        (swap! compiler-env update-in [:node-module-index]
-          (fnil into #{}) (map str node-required))
-        opts))))
+    (let [opts (-> opts
+                 (update :foreign-libs
+                   (fn [libs]
+                     (into (if (= target :nodejs)
+                             []
+                             (index-node-modules node-required))
+                       (expand-libs libs))))
+                 process-js-modules)]
+      (swap! compiler-env (fn [cenv]
+                            (-> cenv
+                              ;; we need to also track the whole top level - this is to support
+                              ;; cljs.analyze/analyze-deps, particularly in REPL contexts - David
+                              (merge {:js-dependency-index (deps/js-dependency-index opts)})
+                              (update-in [:node-module-index] (fnil into #{})
+                                (if (= target :nodejs)
+                                  (map str node-required)
+                                  (map str (keys top-level)))))))
+      opts)))
 
 (defn build
   "Given a source which can be compiled, produce runnable JavaScript."

src/test/cljs_build/foreign-libs-dir/vendor/lib.js

@@ -0,0 +1,3 @@
+module.exports = {
+  foo: 'bar',
+}

src/test/cljs_build/foreign_libs_dir_test/core.cljs

@@ -0,0 +1,15 @@
+;; Copyright (c) Rich Hickey. All rights reserved.
+;; The use and distribution terms for this software are covered by the
+;; Eclipse Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
+;; which can be found in the file epl-v10.html at the root of this distribution.
+;; By using this software in any fashion, you are agreeing to be bound by
+;; the terms of this license.
+;; You must not remove this notice, or any other, from this software.
+
+(ns foreign-libs-dir-test.core
+  (:require [vendor.lib :as lib]))
+
+(enable-console-print!)
+
+(defn main []
+  (println lib))

src/test/clojure/cljs/build_api_tests.clj

@@ -462,3 +462,19 @@
     (test/delete-out-files out)
     (test/delete-node-modules)
     (.delete (io/file "package.json"))))
+
+(deftest test-cljs-2296
+  (let [out (.getPath (io/file (test/tmp-dir) "cljs-2296-test-out"))
+        {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
+                               :opts {:main 'foreign_libs_dir_test.core
+                                      :output-dir out
+                                      :optimizations :none
+                                      :target :nodejs
+                                      ;; :file is a directory
+                                      :foreign-libs [{:file "src/test/cljs_build/foreign-libs-dir"
+                                                      :module-type :commonjs}]}}]
+    (test/delete-out-files out)
+    (build/build (build/inputs (io/file inputs "foreign_libs_dir_test/core.cljs")) opts)
+    (is (.exists (io/file out "src/test/cljs_build/foreign-libs-dir/vendor/lib.js")))
+    (is (true? (boolean (re-find #"goog\.provide\(\"module\$src\$test\$cljs_build\$foreign_libs_dir\$vendor\$lib\"\)"
+                          (slurp (io/file out "src/test/cljs_build/foreign-libs-dir/vendor/lib.js"))))))))