Include resolverConfig on nested addons

ember-cli · Mar 8, 2019 · 3762945 · 3762945
1 parent 532ef05
commit 3762945
Showing 1 changed file with 17 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -5,6 +5,21 @@ var VersionChecker = require('ember-cli-version-checker');
 var path = require('path');
 var isModuleUnification;
 
+function mergeRecursivelyAddonResolverConfig(config, addon) {
+
+  if (!config.hasOwnProperty(addon.name)) {
+
+    if (addon.resolverConfig) {
+      config[addon.name] = addon.resolverConfig() || {};
+    }
+
+    addon.addons.forEach(nestedAddon => {
+      mergeRecursivelyAddonResolverConfig(config, nestedAddon);
+    });
+  }
+
+}
+
 module.exports = {
   name: 'ember-resolver',
 
@@ -104,10 +119,9 @@ module.exports = {
   _moduleUnificationTrees: function() {
 
     let addonConfigs = {};
+
     this.project.addons.forEach(addon => {
-      if (addon.resolverConfig) {
-        addonConfigs[addon.name] = addon.resolverConfig() || {};
-      }
+      mergeRecursivelyAddonResolverConfig(addonConfigs, addon);
     });
     this.validateAddonsConfig(addonConfigs);