CLJS-2333: module-deps.js doesn't correctly compute main if aliased in browser field

Author: anmonteiro

src/main/cljs/cljs/module_deps.js

@@ -199,7 +199,12 @@ md.on('end', function () {
               const replacement = path.resolve(pkgJson.basedir, fieldValue[key]);
 
               if (deps_files[replacement] != null) {
-                deps_files[replacement].provides = depProvides(deps_files[replacement].provides, path.resolve(pkgJson.basedir, key));
+                const file = path.resolve(pkgJson.basedir, key);
+                deps_files[replacement].provides = depProvides(deps_files[replacement].provides, file);
+
+                if (file === pkgJson.mainEntry) {
+                  Array.prototype.push.apply(deps_files[replacement].provides, pkgJson.provides);
+                }
               }
             }
           }

src/test/clojure/cljs/closure_tests.clj

@@ -387,3 +387,26 @@
     (.delete (io/file "package.json"))
     (test/delete-node-modules)
     (test/delete-out-files out)))
+
+(deftest test-cljs-2333
+  (spit (io/file "package.json") "{}")
+  (let [opts {:npm-deps {"asap" "2.0.6"}}
+        out (util/output-directory opts)]
+    (test/delete-node-modules)
+    (test/delete-out-files out)
+    (closure/maybe-install-node-deps! opts)
+    (let [modules (closure/index-node-modules ["asap"] opts)]
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/asap/browser-asap.js"))
+                                    :provides ["asap/asap",
+                                               "asap/asap",
+                                               "asap/asap.js",
+                                               "asap/asap",
+                                               "asap",
+                                               "asap/browser-asap.js",
+                                               "asap/browser-asap"]}))
+                   modules))))
+    (.delete (io/file "package.json"))
+    (test/delete-node-modules)
+    (test/delete-out-files out)))