From 4c34c5080505269490fdc7f69a69ab3ea23e3344 Mon Sep 17 00:00:00 2001 From: Martin Wragg Date: Thu, 22 Sep 2016 11:25:30 -0700 Subject: [PATCH] update to latest gulp file, more bower ignores. --- bower.json | 6 ++++-- gulpfile.js | 14 +++++++++----- package.json | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/bower.json b/bower.json index 0f69f8ad..d9448d50 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "px-tooltip", - "version": "0.8.1", + "version": "0.8.2", "main": [ "px-tooltip.html" ], @@ -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", diff --git a/gulpfile.js b/gulpfile.js index 89501dc3..b5dcfcbf 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -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() { @@ -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']); }); diff --git a/package.json b/package.json index 7afd8211..749c2c85 100644 --- a/package.json +++ b/package.json @@ -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": {