CLJS-2315: module_deps.js can't resolve JSON modules

Author: anmonteiro

src/main/cljs/cljs/module_deps.js

@@ -9,13 +9,14 @@ var filename = path.resolve(__dirname, 'JS_FILE');
 var resolver = target === 'nodejs' ? nodeResolve : browserResolve;
 
 var md = mdeps({
-  resolve: function(id, parent, cb) {
+  resolve: function(id, parentOpts, 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);
+    parentOpts.basedir =
+      parentOpts.filename === filename ? __dirname : path.dirname(parentOpts.filename);
+    parentOpts.extensions = ['.js', '.json'];
 
-    resolver(id, parent, cb);
+    resolver(id, parentOpts, cb);
   },
   filter: function(id) {
     return !(target === 'nodejs' && nodeResolve.isCore(id));

src/test/cljs_build/json_modules_test/a.js

@@ -0,0 +1,2 @@
+// b is a .json module
+var theJSON = require('./b');

src/test/cljs_build/json_modules_test/b.json

@@ -0,0 +1 @@
+{"foo": 42}

src/test/clojure/cljs/closure_tests.clj

@@ -10,6 +10,8 @@
   (:refer-clojure :exclude [compile])
   (:use cljs.closure clojure.test)
   (:require [cljs.build.api :as build]
+            [clojure.data.json :as json]
+            [clojure.java.shell :as sh]
             [cljs.closure :as closure]
             [cljs.js-deps :as deps]
             [cljs.util :as util]
@@ -240,3 +242,21 @@
     (.delete (io/file "package.json"))
     (test/delete-node-modules)
     (test/delete-out-files out)))
+
+(deftest test-cljs-2315
+  (spit (io/file "package.json") (json/json-str {:devDependencies {"@cljs-oss/module-deps" "*"
+                                                                   :konan "*"
+                                                                   :resolve "*"
+                                                                   :browser-resolve "*"}}))
+  (apply sh/sh (cond->> ["npm" "install"]
+                 util/windows? (into ["cmd" "/c"])))
+  (let [file (io/file (test/tmp-dir) "cljs-2315-inputs.js")
+        _ (spit file "require('./src/test/cljs_build/json_modules_test/a.js');")
+        node-inputs (closure/node-inputs [{:file (str file)}])]
+    (is (= node-inputs
+          [{:file (.getAbsolutePath (io/file "src/test/cljs_build/json_modules_test/a.js"))
+            :module-type :es6}
+           {:file (.getAbsolutePath (io/file "src/test/cljs_build/json_modules_test/b.json"))
+            :module-type :es6}])))
+  (.delete (io/file "package.json"))
+  (test/delete-node-modules))