CLJS-2326: Indexing node_modules can't find main when it doesn't have an extension

Author: anmonteiro

src/main/cljs/cljs/module_deps.js

@@ -175,9 +175,16 @@ md.on('file', function (file) {
 md.on('end', function () {
     for (let i = 0; i < pkgJsons.length; i++) {
         let pkgJson = pkgJsons[i];
+        const candidates = /\.js(on)?$/.test(pkgJson.mainEntry)
+            ? [pkgJson.mainEntry]
+            : [pkgJson.mainEntry, pkgJson.mainEntry + '.js', pkgJson.mainEntry + '.json'];
 
-        if (deps_files[pkgJson.mainEntry] != null && pkgJson.provides != null) {
-            deps_files[pkgJson.mainEntry].provides = pkgJson.provides;
+        for (let j = 0; j < candidates.length; j++) {
+          const candidate = candidates[j];
+
+          if (deps_files[candidate] != null && pkgJson.provides != null) {
+            deps_files[candidate].provides = pkgJson.provides;
+          }
         }
 
         for (let j = 0; j < aliasFields.length; j++) {

src/main/clojure/cljs/closure.clj

@@ -2259,8 +2259,12 @@
                                                                  (string/replace #"\\" "/")
                                                                  (string/replace #"package\.json$" "")
                                                                  (str main))]
-                                                 (when (= main-path (string/replace path #"\\" "/"))
-                                                   name))))
+                                                 (some (fn [candidate]
+                                                         (when (= candidate (string/replace path #"\\" "/"))
+                                                           name))
+                                                   (cond-> [main-path]
+                                                     (nil? (re-find #"\.js(on)?$" main-path))
+                                                     (into [(str main-path ".js") (str main-path ".json")]))))))
                                            pkg-jsons)]
                        {:provides (let [module-rel-name (-> (subs path (.lastIndexOf path "node_modules"))
                                                             (string/replace #"\\" "/")

src/test/clojure/cljs/closure_tests.clj

@@ -275,6 +275,7 @@
                                              "tslib/tslib.es6.js"
                                              "tslib/tslib.es6"]}))
                  (closure/index-node-modules ["tslib"] opts))))
+    (.delete (io/file "package.json"))
     (test/delete-node-modules)
     (test/delete-out-files out)))
 
@@ -339,3 +340,32 @@
     (.delete (io/file "package.json"))
     (test/delete-node-modules)
     (test/delete-out-files out)))
+
+(deftest test-cljs-2326
+  (spit (io/file "package.json") "{}")
+  (let [opts {:npm-deps {:bootstrap "4.0.0-beta"}}
+        out (util/output-directory opts)]
+    (test/delete-node-modules)
+    (test/delete-out-files out)
+    (closure/maybe-install-node-deps! opts)
+    (is (true? (some (fn [module]
+                       (= module {:module-type :es6
+                                  :file (.getAbsolutePath (io/file "node_modules/bootstrap/dist/js/bootstrap.js"))
+                                  :provides ["bootstrap"
+                                             "bootstrap/dist/js/bootstrap.js"
+                                             "bootstrap/dist/js/bootstrap"]}))
+                 (closure/index-node-modules ["bootstrap"] opts))))
+    (test/delete-node-modules)
+    (spit (io/file "package.json") "{}")
+    (test/delete-out-files out))
+  (closure/maybe-install-node-deps! {:npm-deps {:bootstrap "4.0.0-beta"}})
+  (let [modules (closure/index-node-modules-dir)]
+    (is (true? (some (fn [module]
+                       (= module {:module-type :es6
+                                  :file (.getAbsolutePath (io/file "node_modules/bootstrap/dist/js/bootstrap.js"))
+                                  :provides ["bootstrap/dist/js/bootstrap.js"
+                                             "bootstrap/dist/js/bootstrap"
+                                             "bootstrap"]}))
+                 modules))))
+  (.delete (io/file "package.json"))
+  (test/delete-node-modules))