Merge branch Thumbleweed-master into master

OpenMTC · Mar 8, 2017 · a3e64b8 · a3e64b8
2 parents 28b3e1f + ea6cca6
commit a3e64b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/lib/loadData.js b/lib/loadData.js
@@ -8,21 +8,17 @@ var yaml  = require('js-yaml');
  * @param {string} dir - Folder to check for data files.
  */
 module.exports = function(dir) {
-  var dataFiles = utils.loadFiles(dir, '*.{js,json,yml}');
+  var dataFiles = utils.loadFiles(dir, '**/*.{js,json,yml}');
 
   for (var i in dataFiles) {
     var file = fs.readFileSync(dataFiles[i]);
     var ext = path.extname(dataFiles[i]);
     var name = path.basename(dataFiles[i], ext);
     var data;
 
-    if (ext === '.json') {
+    if (ext === '.json' || ext === '.js') {
       delete require.cache[require.resolve(dataFiles[i])];
-      data = require(dataFiles[i]);
-    }
-    else if (ext === '.js') {
-      delete require.cache[require.resolve(dataFiles[i])];
-      data = require(dataFiles[i]);
+      data = require(dataFiles[i])
     }
     else if (ext === '.yml') {
       data = yaml.safeLoad(fs.readFileSync(dataFiles[i]));

diff --git a/test/fixtures/data-json/data/breakfast.json → ...s/data-json/data/subfolder/breakfast.json b/test/fixtures/data-json/data/breakfast.json → ...s/data-json/data/subfolder/breakfast.json