CLJS-2327: module_deps.js doesn't know about browser field advanced usage

Author: anmonteiro

src/main/cljs/cljs/module_deps.js

@@ -8,7 +8,9 @@ let enhancedResolve = require('enhanced-resolve');
 
 let target = 'CLJS_TARGET';
 let filename = fs.realpathSync(path.resolve(__dirname, 'JS_FILE'));
-let mainFields = ['module', 'main'];
+let mainFields = target === 'nodejs'
+      ? ['module', 'main']
+      : ['browser', 'module', 'main'];
 let aliasFields = target === 'nodejs' ? [] : ['browser'];
 
 // https://github.com/egoist/konan
@@ -61,7 +63,7 @@ let resolver = enhancedResolve.create({
     ),
     extensions: ['.js', '.json'],
     mainFields: mainFields,
-    aliasFields: aliasFields,
+    aliasFields: target === 'nodejs' ? [] : ['browser'],
     moduleExtensions: ['.js', '.json']
 });
 
@@ -89,21 +91,59 @@ let md = mdeps({
 function getPackageJsonMainEntry(pkgJson) {
     for (let i = 0; i < mainFields.length; i++) {
         let entry = mainFields[i];
-
-        if (pkgJson[entry] != null) {
-            return pkgJson[entry];
+        const entryVal = pkgJson[entry];
+
+        if (entryVal != null) {
+          if (typeof entryVal === 'string') {
+            return entryVal;
+          } else if (typeof entryVal === 'object') {
+            for (let j = i; j < mainFields.length; j++) {
+              let otherEntry = mainFields[j];
+              const otherEntryVal = pkgJson[entry];
+
+              if (entryVal[otherEntryVal] != null) {
+                return entryVal[otherEntryVal]
+              }
+            }
+          }
         }
     }
     return null;
 }
 
+function depProvides(provides, file) {
+  const result = provides != null ? provides.slice(0) : [];
+
+  let providedModule = file
+      .substring(file.lastIndexOf('node_modules'))
+      .replace(/\\/g, '/')
+      .replace('node_modules/', '');
+
+  result.push(
+    providedModule,
+    providedModule.replace(/\.js(on)?$/, '')
+  );
+
+  let indexReplaced = providedModule.replace(/\/index\.js(on)?$/, '');
+
+  if (
+      /\/index\.js(on)?$/.test(providedModule) &&
+      result.indexOf(indexReplaced) === -1
+  ) {
+    result.push(indexReplaced);
+  }
+
+  return result;
+}
+
 let pkgJsons = [];
 let deps_files = {};
 
 md.on('package', function (pkg) {
     // we don't want to include the package.json for users' projects
     if (/node_modules/.test(pkg.__dirname)) {
         let pkgJson = {
+            basedir: pkg.__dirname,
             file: path.join(pkg.__dirname, 'package.json'),
         };
 
@@ -116,6 +156,14 @@ md.on('package', function (pkg) {
             pkgJson.mainEntry = path.join(pkg.__dirname, pkgJsonMainEntry);
         }
 
+        // we'll need these later
+        for (let i = 0; i < aliasFields.length; i++) {
+          const field = aliasFields[i];
+          if (pkg[field] != null) {
+            pkgJson[field] = pkg[field];
+          }
+        }
+
         pkgJsons.push(pkgJson);
     }
 });
@@ -132,6 +180,22 @@ md.on('end', function () {
             deps_files[pkgJson.mainEntry].provides = pkgJson.provides;
         }
 
+        for (let j = 0; j < aliasFields.length; j++) {
+          const field = aliasFields[j];
+          const fieldValue = pkgJson[field];
+
+          if (fieldValue != null && typeof fieldValue === 'object') {
+            for (let key in fieldValue) {
+              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));
+              }
+            }
+          }
+        }
+
+
         deps_files[pkgJson.file] = {file: pkgJson.file};
     }
 
@@ -146,25 +210,7 @@ md.on('end', function () {
             )
         ) {
             if (dep.file.indexOf('node_modules') !== -1) {
-                let providedModule = dep.file
-                    .substring(dep.file.lastIndexOf('node_modules'))
-                    .replace(/\\/g, '/')
-                    .replace('node_modules/', '');
-
-                dep.provides = dep.provides || [];
-                dep.provides.push(
-                    providedModule,
-                    providedModule.replace(/\.js(on)?$/, '')
-                );
-
-                let indexReplaced = providedModule.replace(/\/index\.js(on)?$/, '');
-
-                if (
-                    /\/index\.js(on)?$/.test(providedModule) &&
-                    dep.provides.indexOf(indexReplaced) === -1
-                ) {
-                    dep.provides.push(indexReplaced);
-                }
+              dep.provides = depProvides(dep.provides, dep.file);
             }
         }
 

src/main/clojure/cljs/closure.clj

@@ -2281,7 +2281,7 @@
    (index-node-modules-dir
      (when env/*compiler*
        (:options @env/*compiler*))))
-  ([{:keys [verbose target]}]
+  ([opts]
    (let [module-fseq (util/module-file-seq)]
      (node-file-seq->libs-spec module-fseq))))
 

src/test/clojure/cljs/closure_tests.clj

@@ -277,3 +277,65 @@
                  (closure/index-node-modules ["tslib"] opts))))
     (test/delete-node-modules)
     (test/delete-out-files out)))
+
+(deftest test-cljs-2327
+  (spit (io/file "package.json") "{}")
+  (let [opts {:npm-deps {:react "16.0.0-beta.5"
+                         :react-dom "16.0.0-beta.5"}}
+        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 ["react" "react-dom" "react-dom/server"] opts)]
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/react/index.js"))
+                                    :provides ["react"
+                                               "react/index.js"
+                                               "react/index"]}))
+                   modules)))
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/react-dom/index.js"))
+                                    :provides ["react-dom"
+                                               "react-dom/index.js"
+                                               "react-dom/index"]}))
+                   modules)))
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/react-dom/server.browser.js"))
+                                    :provides ["react-dom/server.js"
+                                               "react-dom/server"
+                                               "react-dom/server.browser.js"
+                                               "react-dom/server.browser"]}))
+                   modules))))
+    (test/delete-node-modules)
+    (test/delete-out-files out)
+    (spit (io/file "package.json") "{}")
+    (let [opts {:npm-deps {:warning "3.0.0"}}
+          _ (closure/maybe-install-node-deps! opts)
+          modules (closure/index-node-modules ["warning"] opts)]
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/warning/browser.js"))
+                                    :provides ["warning"
+                                               "warning/browser.js"
+                                               "warning/browser"]}))
+                   modules))))
+    (test/delete-node-modules)
+    (test/delete-out-files out)
+    (spit (io/file "package.json") "{}")
+    (let [opts {:npm-deps {:react-dom "16.0.0-beta.5"
+                           :react "16.0.0-beta.5"}
+                :target :nodejs}
+          _ (closure/maybe-install-node-deps! opts)
+          modules (closure/index-node-modules ["react-dom/server"] opts)]
+      (is (true? (some (fn [module]
+                         (= module {:module-type :es6
+                                    :file (.getAbsolutePath (io/file "node_modules/react-dom/server.js"))
+                                    :provides ["react-dom/server.js"
+                                               "react-dom/server"]}))
+                   modules))))
+    (.delete (io/file "package.json"))
+    (test/delete-node-modules)
+    (test/delete-out-files out)))