From 11150d106d7251f60d27abb525d0099add1f6927 Mon Sep 17 00:00:00 2001 From: Chris Montgomery Date: Sun, 15 Mar 2015 09:40:23 -0500 Subject: [PATCH] remove test dep on gulp-sass to get around error on node 0.12 and iojs --- examples/full/bundle.config.js | 11 +---------- examples/full/lib/article/styles/other.scss | 4 ---- examples/full/package.json | 1 - test/integ/index-test.js | 4 ++-- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 examples/full/lib/article/styles/other.scss diff --git a/examples/full/bundle.config.js b/examples/full/bundle.config.js index 8f349319..666897dd 100644 --- a/examples/full/bundle.config.js +++ b/examples/full/bundle.config.js @@ -1,5 +1,4 @@ var lazypipe = require('lazypipe'); -var sass = require('gulp-sass'); var less = require('gulp-less'); var gif = require('gulp-if'); var path = require('path'); @@ -9,18 +8,11 @@ function stringEndsWith(str, suffix) { return str.indexOf(suffix, str.length - suffix.length) !== -1; } -function isSassFile(file) { - return stringEndsWith(file.relative, 'scss'); -} - function isLessFile(file) { return stringEndsWith(file.relative, 'less'); } var styleTransforms = lazypipe() - .pipe(function() { - return gif(isSassFile, sass()); - }) .pipe(function() { return gif(isLessFile, less()); }); @@ -81,7 +73,6 @@ module.exports = { './lib/article/**/*.coffee' ], styles: [ - './lib/article/**/*.scss', './lib/article/**/*.less' ], options: { @@ -90,7 +81,7 @@ module.exports = { rev: prodLikeEnvs, transforms: { scripts: transformHelper.coffee(), - styles: styleTransforms // stream that will tranform both scss and less + styles: styleTransforms // stream that will transform less } } }, diff --git a/examples/full/lib/article/styles/other.scss b/examples/full/lib/article/styles/other.scss deleted file mode 100644 index 4279e53c..00000000 --- a/examples/full/lib/article/styles/other.scss +++ /dev/null @@ -1,4 +0,0 @@ -$primary-color: darkred; -.other-sass { - background-color: $primary-color; -} diff --git a/examples/full/package.json b/examples/full/package.json index dbc13bad..14f2ba87 100644 --- a/examples/full/package.json +++ b/examples/full/package.json @@ -14,7 +14,6 @@ "gulp-less": "^3.0.1", "gulp-livereload": "^3.8.0", "gulp-rimraf": "^0.1.1", - "gulp-sass": "^1.3.3", "lazypipe": "^0.2.2" } } diff --git a/test/integ/index-test.js b/test/integ/index-test.js index 2e073b26..7cbb60bd 100644 --- a/test/integ/index-test.js +++ b/test/integ/index-test.js @@ -375,7 +375,7 @@ describe('integration tests', function () { VENDOR_CSS_CONTENT_NOT_MINIFIED = '.angular-csp {\n font-weight: bold;\n}\n', ARTICLE_CONTENT_NOT_UGLIFIED = 'console.log(\"page\")\nconsole.log(\"scroll\")\n(function() {\n var number, square;\n\n number = 42;\n\n square = function(x) {\n return x * x;\n };\n\n}).call(this);\n\n', ARTICLE_CONTENT_UGLIFIED = 'console.log(\"page\");\nconsole.log(\"scroll\");\n(function(){var n,t;n=42,t=function(n){return n*n}}).call(this);\n', - ARTICLE_CSS_CONTENT_MINIFIED = '.other-sass{background-color:#8b0000}\n.page{background-color:red}\n', + ARTICLE_CSS_CONTENT_MINIFIED = '.page{background-color:red}\n', ARTICLE_CSS_CONTENT_NOT_MINIFIED = '.other-sass {\n background-color: darkred; }\n\n.page {\n background-color: red;\n}\n\n', MAIN_CONTENT_NOT_UGLIFIED = 'console.log(\"app\")\nconsole.log(\"controllers\")\nconsole.log(\"directives\")\nconsole.log(\"filters\")\n', MAIN_CONTENT_UGLIFIED = 'console.log(\"app\");\nconsole.log(\"controllers\");\nconsole.log(\"directives\");\nconsole.log(\"filters\");\n', @@ -410,7 +410,7 @@ describe('integration tests', function () { fileContents.should.eql( ARTICLE_CONTENT_UGLIFIED + helpers.getJsSrcMapLine(file.relative)); - } else if (file.relative === 'article-e4e60ef0.css') { + } else if (file.relative === 'article-eb84c68e.css') { fileContents.should.eql( ARTICLE_CSS_CONTENT_MINIFIED + helpers.getCssSrcMapLine(file.relative));