archive-gh-me/generator-react-webpack
1
0
Fork 0
mirror of https://github.com/react-webpack-generators/generator-react-webpack.git synced 2025-12-08 18:01:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86 from DanielMSchmidt/bugfix/sass-loader-now-expects-sass

Browse Source 
Sass loader now expects sass files to contain sass instead of scss
This commit is contained in:
Simon Bailey 2015-04-11 11:11:09 +01:00
commit f26f4c268e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/common/_package.json
View File

@ -43,7 +43,7 @@
"babel": "^4.0.0", "babel": "^4.0.0",
"babel-loader": "^4.0.0", "babel-loader": "^4.0.0",
"grunt-contrib-clean": "~0.6.0",<% if (stylesLanguage.match(/s[ac]ss/)) { %> "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') { %> "less-loader": "^2.0.0",<% } %><% if (stylesLanguage === 'stylus') { %>
"stylus-loader": "^0.5.0",<% } %> "stylus-loader": "^0.5.0",<% } %>
"react-hot-loader": "^1.0.7" "react-hot-loader": "^1.0.7"

2
templates/common/_webpack.config.js
View File

@ -49,7 +49,7 @@ module.exports = {
loader: 'react-hot!babel-loader' loader: 'react-hot!babel-loader'
},<% if (stylesLanguage === 'sass') { %> { },<% if (stylesLanguage === 'sass') { %> {
test: /\.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') { %> { },<% } %><% if (stylesLanguage === 'scss') { %> {
test: /\.scss/, test: /\.scss/,
loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'

2
templates/common/_webpack.dist.config.js
View File

@ -59,7 +59,7 @@ module.exports = {
loader: 'style-loader!css-loader' loader: 'style-loader!css-loader'
},<% if (stylesLanguage === 'sass') { %> { },<% if (stylesLanguage === 'sass') { %> {
test: /\.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') { %> { },<% } %><% if (stylesLanguage === 'scss') { %> {
test: /\.scss/, test: /\.scss/,
loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded' loader: 'style-loader!css-loader!sass-loader?outputStyle=expanded'