Skip to content

Commit

Permalink
update to latest gulp file, more bower ignores.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdwragg committed Sep 22, 2016
1 parent e285321 commit 4c34c50
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 8 deletions.
6 changes: 4 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "px-tooltip",
"version": "0.8.1",
"version": "0.8.2",
"main": [
"px-tooltip.html"
],
Expand All @@ -13,7 +13,9 @@
"node_modules",
"test",
"OSS_Notice.pdf",
"px-tooltip.png"
"px-tooltip.png",
"wct.conf.*",
"package.json"
],
"dependencies": {
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#~1.0.2",
Expand Down
14 changes: 9 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ gulp.task('clean', function() {
}).pipe($.clean());
});

function handleError(err){
console.log(err.toString());
this.emit('end');
}

function buildCSS(){
return combiner.obj([
$.sass(sassOptions).on('error', $.sass.logError),
$.sass(sassOptions),
$.autoprefixer({
browsers: ['last 2 versions', 'Safari 8.0'],
cascade: false
}),
gulpif(!argv.debug, $.cssmin())
]);
]).on('error', handleError);
}

gulp.task('sass', function() {
Expand Down Expand Up @@ -73,12 +78,11 @@ gulp.task('serve', function() {
reloadOnRestart: true,
logPrefix: `${pkg.name}`,
https: false,
files: ['*.*'],
server: ['./', 'bower_components'],
});

gulp.watch(['!${pkg.name}-styles.html', '*.html', 'bower_components/**/*.html']).on('change', browserSync.reload);
gulp.watch(['!sass/*-demo.scss', 'sass/*.scss'], ['sass']);
gulp.watch(['css/*-styles.html', 'css/*-demo.css', '*.html', '*.js']).on('change', browserSync.reload);
gulp.watch(['sass/*.scss', '!sass/*-demo.scss'], ['sass']);
gulp.watch('sass/*-demo.scss', ['demosass']);

});
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "px-tooltip",
"author": "General Electric",
"description": "A Px component that provides a tooltip on invocation",
"version": "0.8.1",
"version": "0.8.2",
"private": true,
"extName": null,
"repository": {
Expand Down

0 comments on commit 4c34c50

Please sign in to comment.