Check if regex and regex.test is available before calling it (#608)

* Check if regex and regex.test is available before calling it * If the json loader test is a function, execute it * rename loader to matcher
storybookjs · Nov 9, 2016 · 1711fd5 · 1711fd5
1 parent 4f42aeb
commit 1711fd5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -98,8 +98,16 @@ var logger = console;
 
 function addJsonLoaderIfNotAvailable(config) {
   var jsonLoaderExists = config.module.loaders.reduce(function (value, loader) {
-    return value || [].concat(loader.test).some(function (regex) {
-      return regex.test('my_package.json');
+    return value || [].concat(loader.test).some(function (matcher) {
+      var isRegex = matcher instanceof RegExp;
+      var testString = 'my_package.json';
+      if (isRegex) {
+        return matcher.test(testString);
+      }
+      if (typeof matcher === 'function') {
+        return matcher(testString);
+      }
+      return false;
     });
   }, false);
 

diff --git a/src/server/config.js b/src/server/config.js
@@ -11,7 +11,17 @@ const logger = console;
 export function addJsonLoaderIfNotAvailable(config) {
   const jsonLoaderExists = config.module.loaders.reduce(
     (value, loader) => {
-      return value || [].concat(loader.test).some(regex => regex.test('my_package.json'));
+      return value || [].concat(loader.test).some((matcher) => {
+        const isRegex = matcher instanceof RegExp;
+        const testString = 'my_package.json';
+        if (isRegex) {
+          return matcher.test(testString);
+        }
+        if (typeof matcher === 'function') {
+          return matcher(testString);
+        }
+        return false;
+      });
     },
     false
   );