CLJS-2246: Revert CLJS-2245 and CLJS-2240 and fix lein test

Revert "CLJS-2240: don't shell out to module_deps.js if `:npm-deps` not specified"

This reverts commit efc7efa.

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

This reverts commit a0ed8c4.

Author: anmonteiro

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 node-modules target] :as opts} js-sources compiler-env]
+  [{:keys [npm-deps 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,9 +2411,7 @@
       (let [opts (-> opts
                    (update :foreign-libs
                      (fn [libs]
-                       (into (if (or (not (empty? npm-deps)) (true? node-modules))
-                               (index-node-modules node-required)
-                               [])
+                       (into (index-node-modules node-required)
                          (expand-libs libs))))
                    process-js-modules)]
         (swap! compiler-env merge

src/test/cljs_build/node_modules_opt_test/core.cljs

@@ -0,0 +1,6 @@
+(ns node-modules-opt-test.core
+  (:require left-pad))
+
+(enable-console-print!)
+
+(println "Padded:" (left-pad 42 5 0))

src/test/clojure/cljs/build_api_tests.clj

@@ -377,7 +377,7 @@
     (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
+(deftest test-node-modules-cljs-2246
   (test/delete-node-modules)
   (spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
                                                  :devDependencies {:module-deps "*"
@@ -390,7 +390,6 @@
                                :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)