fix(ConfigPathResolver): Fixes case when require.resolve returns `E…

…rror`
Fitbit · Jul 8, 2016 · 5e59bf3 · 5e59bf3
1 parent 241e432
commit 5e59bf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/ConfigPathResolver.js b/src/ConfigPathResolver.js
@@ -1,4 +1,5 @@
 import {
+    isString,
     isError
 } from 'lodash';
 import {
@@ -104,9 +105,10 @@ class ConfigPathResolver {
         filename = this.nameResolver.resolveName(filename);
 
         for (const resolver of this.resolvers) {
-            const value = resolver(filename);
+            const value = resolver(filename),
+                throwsError = isError(value) || value instanceof Error;
 
-            if (!isError(value)) {
+            if (isString(value) && !throwsError) {
                 filename = value;
                 break;
             }

diff --git a/test/ConfigPathResolver.spec.js b/test/ConfigPathResolver.spec.js
@@ -6,7 +6,7 @@ import ConfigPatternCache from '../src/ConfigPatternCache';
 import ConfigNameResolver from '../src/ConfigNameResolver';
 import ConfigPathResolver from '../src/ConfigPathResolver';
 
-describe('ConfigNameResolver', () => {
+describe('ConfigPathResolver', () => {
     let environment,
         patternCache,
         nameResolver,