From 2c60a5a31b057cae5fcd0b7f81e518943f08c610 Mon Sep 17 00:00:00 2001 From: Grant Elliott Date: Mon, 16 Jan 2017 14:11:43 -0500 Subject: [PATCH 1/2] Basic fix for #3531 --- packages/angular-cli/ember-cli/lib/models/project.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/angular-cli/ember-cli/lib/models/project.js b/packages/angular-cli/ember-cli/lib/models/project.js index 5dbaf44c5582..9cf561221564 100644 --- a/packages/angular-cli/ember-cli/lib/models/project.js +++ b/packages/angular-cli/ember-cli/lib/models/project.js @@ -129,7 +129,7 @@ Project.prototype.isEmberCLIAddon = function() { @return {String} Configuration path */ Project.prototype.configPath = function() { - var configPath = 'config'; + var configPath = 'src/environments'; if (this.pkg['ember-addon'] && this.pkg['ember-addon']['configPath']) { configPath = this.pkg['ember-addon']['configPath']; From eb686494b03cff6e1ab186bf8f434c661ff2ae2d Mon Sep 17 00:00:00 2001 From: Grant Elliott Date: Mon, 16 Jan 2017 14:23:51 -0500 Subject: [PATCH 2/2] Drops deprecated config logic that caused #3531 --- .../ember-cli/lib/models/project.js | 41 +------------------ 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/packages/angular-cli/ember-cli/lib/models/project.js b/packages/angular-cli/ember-cli/lib/models/project.js index 9cf561221564..d8ef0f84590e 100644 --- a/packages/angular-cli/ember-cli/lib/models/project.js +++ b/packages/angular-cli/ember-cli/lib/models/project.js @@ -121,23 +121,6 @@ Project.prototype.isEmberCLIAddon = function() { return !!this.pkg.keywords && this.pkg.keywords.indexOf('ember-addon') > -1; }; -/** - Returns the path to the configuration. - - @private - @method configPath - @return {String} Configuration path - */ -Project.prototype.configPath = function() { - var configPath = 'src/environments'; - - if (this.pkg['ember-addon'] && this.pkg['ember-addon']['configPath']) { - configPath = this.pkg['ember-addon']['configPath']; - } - - return path.join(configPath, 'environment'); -}; - /** Loads the configuration for this project and its addons. @@ -147,31 +130,9 @@ Project.prototype.configPath = function() { @return {Object} Merged confiration object */ Project.prototype.config = function(env) { - var configPath = this.configPath(); - - if (existsSync(path.join(this.root, configPath + '.js'))) { - var appConfig = this.require('./' + configPath)(env); - var addonsConfig = this.getAddonsConfig(env, appConfig); - - return merge(addonsConfig, appConfig); - } else { - return this.getAddonsConfig(env, {}); - } -}; - -/** - Returns the addons configuration. - - @private - @method getAddonsConfig - @param {String} env Environment name - @param {Object} appConfig Application configuration - @return {Object} Merged configuration of all addons - */ -Project.prototype.getAddonsConfig = function(env, appConfig) { this.initializeAddons(); - var initialConfig = merge({}, appConfig); + var initialConfig = {}; return this.addons.reduce(function(config, addon) { if (addon.config) {