Merge branch 'master' into feature/hbs-linting

Author: sivakumar-kailasam

CHANGELOG.md

@@ -1,7 +1,27 @@
-### 2.2.0
-- Remove need for consuming app to configure `ember-cli-bootstrap` addon #87 @ppcano
-- Refer to Discord vs. Slack Fixes #85 @sivakumar-kailasam
-- updated the blog header component to remove unnecessary complexity #81 @MelSumner
-- list component refactor, added contributor invite #80 @MelSumner
-- updated the button component and supporting documentation #79 @MelSumner
-- Use ember-cli-addon-docs for dummy app #76 @hakilebara
+
+2.3.1 / 2018-10-23
+==================
+
+  * Fixing sass error in consuming applications #110 @mansona
+
+2.3.0 / 2018-10-23
+==================
+
+  * Fix display of section tags #102 @mansona
+  * Update Testing Setup #107 @aklkv
+  * Upgrade Ember #105 @aklkv
+  * Fixing Mascot Image on es-note component #90 @mansona
+  * Include trademark symbol on the Ember logo #96 @BradenLawrence
+  * Fix line height of headers #97 @underoot
+  * Export `sass` modules on `ember-styleguide` namespace #88 @ppcano
+  * Footer: separate data from the component #89 @ppcano
+
+2.2.0 / 2018-09-12
+==================
+
+  * Remove need for consuming app to configure `ember-cli-bootstrap` addon #87 @ppcano
+  * Refer to Discord vs. Slack Fixes #85 @sivakumar-kailasam
+  * updated the blog header component to remove unnecessary complexity #81 @MelSumner
+  * list component refactor, added contributor invite #80 @MelSumner
+  * updated the button component and supporting documentation #79 @MelSumner
+  * Use ember-cli-addon-docs for dummy app #76 @hakilebara

index.js

@@ -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,
@@ -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);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-styleguide",
-  "version": "2.2.0",
+  "version": "2.3.1",
   "description": "Addon to help standardize the ember family of websites",
   "keywords": [
     "ember-addon"
@@ -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",
@@ -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",