From 3762945acc00e4cb0279bee3ea937ebd020fad90 Mon Sep 17 00:00:00 2001 From: Pepe Cano <825430+ppcano@users.noreply.github.com> Date: Fri, 8 Mar 2019 19:49:46 +0100 Subject: [PATCH] Include `resolverConfig` on nested addons --- index.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/index.js b/index.js index 4d5daef4..a161559a 100644 --- 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);