diff --git a/gulpfile.js b/gulpfile.js index 79355a5..9557101 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -8,11 +8,10 @@ var stringify = require('stringify'); var del = require('del'); var inline = require('gulp-inline'); var htmlmin = require('gulp-htmlmin'); -var sass = require('gulp-sass'); +var sass = require('gulp-sass')(require('sass')); var sourceMaps = require('gulp-sourcemaps'); var autoprefixer = require('gulp-autoprefixer'); var uglify = require('gulp-uglify'); -var sassify = require('sassify'); var autoprefixify = require('./src/scripts/vendor/autoprefixify'); var insert = require('gulp-insert'); var clayPackage = require('./package.json'); @@ -22,21 +21,12 @@ var sassIncludePaths = [].concat( 'src/styles' ); -var sassifyOptions = { - base64Encode: false, - sourceMap: false, - sourceMapEmbed: false, - sourceMapContents: false, - outputStyle: 'compact', - includePaths: sassIncludePaths -}; - var autoprefixerOptions = { browsers: ['Android 4', 'iOS 8'], cascade: false }; -var stringifyOptions = ['.html', '.tpl']; +var stringifyOptions = ['.html', '.tpl', '.scss']; var versionMessage = '/* Clay - https://github.com/pebble/clay - Version: ' + clayPackage.version + ' - Build Date: ' + new Date().toISOString() + ' */\n'; @@ -89,7 +79,6 @@ gulp.task('clay', ['inlineHtml'], function() { }) .transform('deamdify') .transform(stringify(stringifyOptions)) - .transform(sassify, sassifyOptions) .transform(autoprefixify, autoprefixerOptions) .require(require.resolve('./index'), {expose: clayPackage.name}) .exclude('message_keys') @@ -107,7 +96,6 @@ gulp.task('dev-js', ['js', 'sass'], function() { return browserify('dev/dev.js', { debug: true }) .transform(stringify(stringifyOptions)) .transform('deamdify') - .transform(sassify, sassifyOptions) .transform(autoprefixify, autoprefixerOptions) .ignore('message_keys') .bundle() diff --git a/package.json b/package.json index 4ed6b49..de1e462 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "gulp-htmlmin": "^1.3.0", "gulp-inline": "0.0.15", "gulp-insert": "^0.5.0", - "gulp-sass": "^2.1.1", + "gulp-sass": "^6.0.1", "gulp-sourcemaps": "^1.6.0", "gulp-uglify": "^1.5.2", "joi": "^6.10.1", @@ -78,7 +78,6 @@ "mocha": "^2.3.4", "postcss": "^5.0.14", "require-from-string": "^1.1.0", - "sassify": "^0.9.1", "sinon": "^1.17.3", "stringify": "^3.2.0", "through": "^2.3.8",