Skip to content

Commit

Permalink
Merge pull request #161 from marcemira/patch-1
Browse files Browse the repository at this point in the history
Include Parent App support
  • Loading branch information
simonexmachina committed May 29, 2017
2 parents e4d46b8 + 58e18ee commit 0b7fd6c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,11 @@ module.exports = {
sassOptions: function () {
var env = process.env.EMBER_ENV;
var options = (this.app && this.app.options && this.app.options.sassOptions) || {};
var parentOption = (this.parent && this.parent.app && this.parent.app.options && this.parent.app.options.sassOptions) || {};
var envConfig = this.project.config(env).sassOptions;

merge(options, parentOption);

if (envConfig) {
console.warn("Deprecation warning: sassOptions should be moved to your ember-cli-build");
merge(options, envConfig);
Expand Down

0 comments on commit 0b7fd6c

Please sign in to comment.