Skip to content

Commit

Permalink
Merge pull request #110 from ember-learn/feature/fix-node-sass
Browse files Browse the repository at this point in the history
fixing sass error in consuming applications
  • Loading branch information
mansona authored Oct 23, 2018
2 parents 0690edb + 130f597 commit 56d78ce
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const mergeTrees = require('broccoli-merge-trees');
const Funnel = require('broccoli-funnel');
const path = require('path');
const nodeSass = require('node-sass');

module.exports = {
name: require('./package').name,
Expand Down Expand Up @@ -31,8 +32,11 @@ module.exports = {
importBootstrapFont: false,
importBootstrapCSS: false
};

target.options['ember-bootstrap'] = target.options['ember-bootstrap'] || defaultEmberBootStrapOptions;

target.options.sassOptions = target.options.sassOptions || { implementation: nodeSass };

this.checkPreprocessor();

this._super.included.apply(this, arguments);
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-sass": "^8.0.1",
"ember-svg-jar": "^1.2.2",
"ember-truth-helpers": "^2.1.0"
"ember-truth-helpers": "^2.1.0",
"node-sass": "^4.9.4"
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
Expand Down Expand Up @@ -76,7 +77,6 @@
"eslint-plugin-ember": "^5.2.0",
"eslint-plugin-node": "^7.0.1",
"loader.js": "^4.7.0",
"node-sass": "^4.9.4",
"normalize.css": "^8.0.0",
"np": "*",
"qunit-dom": "^0.8.0",
Expand Down

0 comments on commit 56d78ce

Please sign in to comment.