CLJS-2245: Add support for using a local node_modules installation through a new :node-modules compiler flag

Author: anmonteiro

.travis.yml

@@ -6,6 +6,7 @@ node_js:
   - "8"
 
 before_install:
+  - npm install -g yarn
   - wget https://ftp.mozilla.org/pub/firefox/nightly/latest-mozilla-central/jsshell-linux-x86_64.zip
   - unzip jsshell-linux-x86_64.zip -d spidermoney
   - sudo apt-get install -y libjavascriptcoregtk-3.0-bin

src/main/clojure/cljs/closure.clj

@@ -2397,7 +2397,7 @@
   - index all the node node modules
   - process the JS modules (preprocess + convert to Closure JS)
   - save js-dependency-index for compilation"
-  [{:keys [npm-deps target] :as opts} js-sources compiler-env]
+  [{:keys [npm-deps node-modules target] :as opts} js-sources compiler-env]
   (let [;; Find all the top-level Node packages and their files
         top-level (reduce
                     (fn [acc m]
@@ -2411,7 +2411,7 @@
       (let [opts (-> opts
                    (update :foreign-libs
                      (fn [libs]
-                       (into (if-not (empty? npm-deps)
+                       (into (if (or (not (empty? npm-deps)) (true? node-modules))
                                (index-node-modules node-required)
                                [])
                          (expand-libs libs))))

src/test/clojure/cljs/build_api_tests.clj

@@ -10,7 +10,9 @@
   (:refer-clojure :exclude [compile])
   (:import java.io.File)
   (:require [clojure.test :refer [deftest is testing]]
+            [clojure.data.json :as json]
             [clojure.java.io :as io]
+            [clojure.java.shell :as sh]
             [cljs.env :as env]
             [cljs.analyzer :as ana]
             [cljs.test-util :as test]
@@ -374,3 +376,29 @@
     (test/delete-out-files out)
     (build/build (build/inputs (io/file inputs "data_readers_test")) opts cenv)
     (is (contains? (-> @cenv ::ana/data-readers) 'test/custom-identity))))
+
+(deftest test-node-modules-cljs-2245
+  (test/delete-node-modules)
+  (spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
+                                                 :devDependencies {:module-deps "*"
+                                                                   :resolve "*"
+                                                                   :browser-resolve "*"}}))
+  (sh/sh "yarn" "install")
+  (let [ws (atom [])
+        out (.getPath (io/file (test/tmp-dir) "node-modules-opt-test-out"))
+        {:keys [inputs opts]} {:inputs (str (io/file "src" "test" "cljs_build"))
+                               :opts {:main 'node-modules-opt-test.core
+                                      :output-dir out
+                                      :optimizations :none
+                                      :node-modules true
+                                      :closure-warnings {:check-types :off}}}
+        cenv (env/default-compiler-env opts)]
+    (test/delete-out-files out)
+    (ana/with-warning-handlers [(collecting-warning-handler ws)]
+      (build/build (build/inputs (io/file inputs "node_modules_opt_test/core.cljs")) opts cenv))
+    (is (.exists (io/file out "node_modules/left-pad/index.js")))
+    (is (contains? (:js-module-index @cenv) "left-pad"))
+    (is (empty? @ws)))
+  (.delete (io/file "package.json"))
+  (.delete (io/file "yarn.lock"))
+  (test/delete-node-modules))