From deeee48760a28efa2550ca8a687aca695dfd44ef Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Fri, 10 Apr 2015 08:13:30 -0400 Subject: [PATCH 1/2] Fixed sass loader, it now expects sass files to contain sass instead of scss --- templates/common/_webpack.config.js | 2 +- templates/common/_webpack.dist.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/common/_webpack.config.js b/templates/common/_webpack.config.js index 6c7e765..76a5a0c 100644 --- a/templates/common/_webpack.config.js +++ b/templates/common/_webpack.config.js @@ -48,7 +48,7 @@ module.exports = { loader: 'react-hot!babel-loader' },<% if (stylesLanguage === 'sass') { %> { test: /\.sass/, - loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' + loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded&indentedSyntax' },<% } %><% if (stylesLanguage === 'scss') { %> { test: /\.scss/, loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' diff --git a/templates/common/_webpack.dist.config.js b/templates/common/_webpack.dist.config.js index 4bc115d..2e7cc3c 100644 --- a/templates/common/_webpack.dist.config.js +++ b/templates/common/_webpack.dist.config.js @@ -58,7 +58,7 @@ module.exports = { loader: 'style-loader!css-loader' },<% if (stylesLanguage === 'sass') { %> { test: /\.sass/, - loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' + loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded&indentedSyntax' },<% } %><% if (stylesLanguage === 'scss') { %> { test: /\.scss/, loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' From ab25717ed987dfda0af90f4df030ed24b7f07e16 Mon Sep 17 00:00:00 2001 From: Daniel Schmidt Date: Fri, 10 Apr 2015 08:18:11 -0400 Subject: [PATCH 2/2] updated the sass loader version, so installations stops failing --- templates/common/_package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/common/_package.json b/templates/common/_package.json index 2d0e74b..3de4bd2 100644 --- a/templates/common/_package.json +++ b/templates/common/_package.json @@ -42,7 +42,7 @@ "babel": "^4.0.0", "babel-loader": "^4.0.0", "grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage.match(/s[ac]ss/)) { %> - "sass-loader": "^0.3.1",<% } %><% if (stylesLanguage === 'less') { %> + "sass-loader": "^1.0.1",<% } %><% if (stylesLanguage === 'less') { %> "less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %> "stylus-loader": "^0.5.0",<% } %> "react-hot-loader": "^1.0.7"