glob-util -> smart-glob, pass extensions around

tmcw · tmcw · commit f37045591279 · 2016-12-16T18:02:20.000-08:00
diff --git a/lib/input/dependency.js b/lib/input/dependency.js
@@ -7,7 +7,7 @@ var babelify = require('babelify');
 var filterJS = require('../filter_js');
 var concat = require('concat-stream');
 var moduleFilters = require('../../lib/module_filters');
-var globUtil = require('../glob_util.js');
+var smartGlob = require('../smart_glob.js');
 
 /**
  * Returns a readable stream of dependencies, given an array of entry
@@ -57,9 +57,7 @@ function dependencyStream(indexes, options, callback) {
     })],
     postFilter: moduleFilters.externals(indexes, options)
   });
-  globUtil.listFilesToProcess(
-    globUtil.resolveFileGlobPatterns(indexes)
-  ).forEach(function (index) {
+  smartGlob(indexes, options.extension).forEach(function (index) {
     md.write(path.resolve(index));
   });
   md.end();
diff --git a/lib/input/shallow.js b/lib/input/shallow.js
@@ -1,6 +1,6 @@
 'use strict';
 
-var globUtil = require('../glob_util.js');
+var smartGlob = require('../smart_glob.js');
 
 /**
  * A readable source for content that doesn't do dependency resolution, but
@@ -31,7 +31,5 @@ module.exports = function (indexes, options, callback) {
       throw new Error('indexes should be either strings or objects');
     }
   });
-  return callback(null, objects.concat(globUtil.listFilesToProcess(
-    globUtil.resolveFileGlobPatterns(strings)
-  )));
+  return callback(null, objects.concat(smartGlob(strings, options.extension)));
 };
diff --git a/lib/smart_glob.js b/lib/smart_glob.js
@@ -126,7 +126,12 @@ function listFilesToProcess(globPatterns) {
   return files;
 }
 
-module.exports = {
-  resolveFileGlobPatterns: resolveFileGlobPatterns,
-  listFilesToProcess: listFilesToProcess
-};
+function smartGlob(indexes, extensions) {
+  return listFilesToProcess(
+    resolveFileGlobPatterns(indexes, {
+      extensions: extensions
+    })
+  );
+}
+
+module.exports = smartGlob;
