CLJS-2281: module_deps.js cannot compute inputs for ES6 sources

Author: anmonteiro

src/main/cljs/cljs/module_deps.js

@@ -1,7 +1,8 @@
 var path = require('path');
-var mdeps = require('module-deps');
+var mdeps = require('@cljs-oss/module-deps');
 var nodeResolve = require('resolve');
 var browserResolve = require('browser-resolve');
+var konan = require('konan');
 
 var target = 'CLJS_TARGET';
 var filename = path.resolve(__dirname, 'JS_FILE');
@@ -11,26 +12,33 @@ var md = mdeps({
   resolve: function(id, parent, cb) {
     // set the basedir properly so we don't try to resolve requires in the Closure
     // Compiler processed `node_modules` folder.
-    parent.basedir = parent.filename === filename ? __dirname: path.dirname(parent.filename);
+    parent.basedir =
+      parent.filename === filename ? __dirname : path.dirname(parent.filename);
 
     resolver(id, parent, cb);
   },
   filter: function(id) {
     return !nodeResolve.isCore(id);
-}});
+  },
+  detect: function(src) {
+    var deps = konan(src);
+
+    return deps.strings;
+  },
+});
 
 var pkgJsons = [];
 var deps_files = {};
 
-md.on('package', function (pkg) {
+md.on('package', function(pkg) {
   // we don't want to include the package.json for users' projects
   if (/node_modules/.test(pkg.__dirname)) {
     var pkgJson = {
       file: path.join(pkg.__dirname, 'package.json'),
     };
 
     if (pkg.name != null) {
-      pkgJson.provides = [ pkg.name ];
+      pkgJson.provides = [pkg.name];
     }
 
     if (pkg.main != null) {
@@ -61,20 +69,29 @@ md.on('end', function() {
     var dep = deps_files[key];
 
     // add provides to files that are not `package.json`s
-    if (!/node_modules[/\\](@[^/\\]+?[/\\])?[^/\\]+?[/\\]package\.json$/.test(dep.file)) {
+    if (
+      !/node_modules[/\\](@[^/\\]+?[/\\])?[^/\\]+?[/\\]package\.json$/.test(
+        dep.file
+      )
+    ) {
       if (dep.file.indexOf('node_modules') !== -1) {
         var providedModule = dep.file
-            .substring(dep.file.lastIndexOf('node_modules'))
-            .replace('\\', '/')
-            .replace('node_modules/', '');
+          .substring(dep.file.lastIndexOf('node_modules'))
+          .replace('\\', '/')
+          .replace('node_modules/', '');
 
         dep.provides = dep.provides || [];
-        dep.provides.push(providedModule, providedModule.replace(/\.js(on)?$/, ''));
+        dep.provides.push(
+          providedModule,
+          providedModule.replace(/\.js(on)?$/, '')
+        );
 
-        var indexReplaced = providedModule.replace(/\/index\.js(on)?$/,'');
+        var indexReplaced = providedModule.replace(/\/index\.js(on)?$/, '');
 
-        if (/\/index\.js(on)?$/.test(providedModule) &&
-            dep.provides.indexOf(indexReplaced) === -1) {
+        if (
+          /\/index\.js(on)?$/.test(providedModule) &&
+          dep.provides.indexOf(indexReplaced) === -1
+        ) {
           dep.provides.push(indexReplaced);
         }
       }

src/main/clojure/cljs/build/api.clj

@@ -275,7 +275,8 @@
 (defn node-inputs
   "EXPERIMENTAL: return the foreign libs entries as computed by running
    the module-deps package on the supplied JavaScript entry points. Assumes
-   that the module-deps NPM packages is either locally or globally installed."
+   that the `@cljs-oss/module-deps` and `konan` NPM packages are either
+   locally or globally installed."
   [entries]
   (closure/node-inputs entries))
 

src/main/clojure/cljs/closure.clj

@@ -2134,7 +2134,8 @@
         (when-not (.exists pkg-json)
           (spit pkg-json "{}"))
         (let [proc (-> (ProcessBuilder.
-                         (into (cond->> ["npm" "install" "module-deps" "resolve" "browser-resolve"]
+                         (into (cond->> ["npm" "install" "@cljs-oss/module-deps"
+                                         "resolve" "browser-resolve" "konan"]
                                  util/windows? (into ["cmd" "/c"]))
                            (map (fn [[dep version]] (str (name dep) "@" version)))
                            npm-deps))
@@ -2158,7 +2159,8 @@
 (defn node-module-deps
   "EXPERIMENTAL: return the foreign libs entries as computed by running
    the module-deps package on the supplied JavaScript entry point. Assumes
-   that the module-deps NPM package is either locally or globally installed."
+   that the `@cljs-oss/module-deps` and `konan` NPM packages are either
+   locally or globally installed."
   ([entry]
    (node-module-deps entry
      (when env/*compiler*
@@ -2197,7 +2199,8 @@
 (defn node-inputs
   "EXPERIMENTAL: return the foreign libs entries as computed by running
    the module-deps package on the supplied JavaScript entry points. Assumes
-   that the module-deps NPM packages is either locally or globally installed."
+   that the `@cljs-oss/module-deps` and `konan` NPM packages are either
+    locally or globally installed."
   ([entries]
    (node-inputs entries
      (when env/*compiler*

src/test/clojure/cljs/build_api_tests.clj

@@ -402,7 +402,8 @@
   (test/delete-node-modules)
   (.delete (io/file "package-lock.json"))
   (spit (io/file "package.json") (json/json-str {:dependencies {:left-pad "1.1.3"}
-                                                 :devDependencies {:module-deps "*"
+                                                 :devDependencies {"@cljs-oss/module-deps" "*"
+                                                                   :konan "*"
                                                                    :resolve "*"
                                                                    :browser-resolve "*"}}))
   (sh/sh "npm" "install")