Find resolvers locally when Bower is installed globally

PoC implementation for review and feedback. Fixes bower#1919
wrumsby · Feb 3, 2016 · a19b524 · a19b524
1 parent 96d986f
commit a19b524
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/lib/core/resolverFactory.js b/lib/core/resolverFactory.js
@@ -56,8 +56,21 @@ function getConstructor(decEndpoint, options, registryClient) {
         }
 
         var resolverPromises = resolverNames.map(function (resolverName) {
-            var resolver = resolvers[resolverName]
-                || pluginResolverFactory(require(resolverName), options);
+            var resolver = resolvers[resolverName];
+
+            if (resolver === undefined) {
+                try {
+                    resolver = pluginResolverFactory(require(resolverName), options);
+                } catch (e) {
+                    if (e.code === 'MODULE_NOT_FOUND') {
+                        resolver = pluginResolverFactory(require('./node_modules/' + resolverName), options);
+                    }
+                } finally {
+                  if (resolver === undefined) {
+                    throw new Error('Cannot find resolver ' + resolverName);
+                  }
+                }
+            }
 
             return function () {
                 if (selectedResolver === undefined) {