Skip to content

Commit

Permalink
remove test dep on gulp-sass to get around error on node 0.12 and iojs
Browse files Browse the repository at this point in the history
  • Loading branch information
chmontgomery committed Mar 15, 2015
1 parent 50a0914 commit 11150d1
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 17 deletions.
11 changes: 1 addition & 10 deletions examples/full/bundle.config.js
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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());
});
Expand Down Expand Up @@ -81,7 +73,6 @@ module.exports = {
'./lib/article/**/*.coffee'
],
styles: [
'./lib/article/**/*.scss',
'./lib/article/**/*.less'
],
options: {
Expand All @@ -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
}
}
},
Expand Down
4 changes: 0 additions & 4 deletions examples/full/lib/article/styles/other.scss

This file was deleted.

1 change: 0 additions & 1 deletion examples/full/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions test/integ/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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));
Expand Down

0 comments on commit 11150d1

Please sign in to comment.