Skip to content
This repository has been archived by the owner on Feb 26, 2023. It is now read-only.

Fix scss support and update to gulp-ruby-sass 1.0.0-alpha #29

Merged
merged 1 commit into from
Mar 15, 2015
Merged

Fix scss support and update to gulp-ruby-sass 1.0.0-alpha #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion generators/app/templates/_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"gulp-replace": "^0.4.0",
"gulp-rename": "^1.2.0",
"gulp-rimraf": "^0.1.0"<% if (includeSass) { %>,
"gulp-ruby-sass": "^0.7.1"<% } if (includeLess) { %>,
"gulp-ruby-sass": "^1.0.0-alpha"<% } if (includeLess || includeSass) { %>,
"gulp-sourcemaps": "^1.1.0"<% } if (includeTypeScript) { %>,
"gulp-tslint": "^1.3.0"<% } %>,
"gulp-uglify": "^0.3.0",
Expand Down
15 changes: 7 additions & 8 deletions generators/app/templates/gulp/tasks/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ var gulpif = require('gulp-if');
var rename = require('gulp-rename');
var csso = require('gulp-csso');
var autoprefixer = require('gulp-autoprefixer');<% if (includeLess) { %>
var less = require('gulp-less');
var sourcemaps = require('gulp-sourcemaps');<% } else if (includeSass) { %>
var sass = require('gulp-ruby-sass');<% } %>
var less = require('gulp-less');<% } else if (includeSass) { %>
var sass = require('gulp-ruby-sass');<% } %><% if (includeLess || includeSass ) { %>
var sourcemaps = require('gulp-sourcemaps');<% } %>

<% if (includeLess || includeSass) { %>
function handleError(err) {
Expand All @@ -17,12 +17,11 @@ function handleError(err) {
<% } %>

module.exports = gulp.task('styles', function () {
return gulp.src(config.paths.src.styles)<% if (includeLess) { %>
.pipe(gulpif(!release, sourcemaps.init()))
.pipe(less().on('error', handleError))<% } else if (includeSass) { %>
.pipe(gulpif(release, sass().on('error', handleError), sass(/*{sourcemap: true, sourcemapPath: '../src/styles'}*/).on('error', handleError)))<% } %>
<% if (includeSass) { %>return sass(config.paths.src.styles, {sourcemap: !release } ).on('error', handleError)<% } else { %> return gulp.src(config.paths.src.styles) <% } %><% if (includeLess || includeSass) { %>
.pipe(gulpif(!release, sourcemaps.init())) <% } %><% if (includeLess) { %>
.pipe(less().on('error', handleError))<% } %>
.pipe(autoprefixer('last 1 version'))
.pipe(gulpif(release, csso()))<% if (includeLess) { %>
.pipe(gulpif(release, csso()))<% if (includeLess || includeSass) { %>
.pipe(gulpif(!release, sourcemaps.write()))<% } %>
.pipe(gulpif(release, rename(config.filenames.release.styles), rename(config.filenames.build.styles)))
.pipe(gulpif(release, gulp.dest(config.paths.dest.release.styles), gulp.dest(config.paths.dest.build.styles)));
Expand Down