From c185e57347d50f29acb712ef5a2f949642e9296f Mon Sep 17 00:00:00 2001 From: mr-winter Date: Fri, 5 Feb 2016 14:26:35 +1300 Subject: [PATCH] output sass errors in terminal and prevent gulp watch from exiting --- CHANGELOG.txt | 1 + docs/releases/1.4.rst | 1 + gulpfile.js/tasks/styles.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index b8a063f1c..90b38c544 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -41,6 +41,7 @@ Changelog * Fix: Logging in to the admin as a user with valid credentials but no admin access permission now displays an error message, rather than rejecting the user silently * Fix: StreamBlock HTML rendering now handles non-ASCII characters correctly on Python 2 (Mikalai Radchuk) * Fix: Fixed a bug preventing pages with a OneToOneField from being copied (Liam Brenner) + * Fix: SASS compilation errors during Wagtail development no longer cause exit of Gulp process, instead throws error to console and continues (Thomas Winter) 1.3.1 (05.01.2016) ~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.4.rst b/docs/releases/1.4.rst index 4d96a4f33..be0037e05 100644 --- a/docs/releases/1.4.rst +++ b/docs/releases/1.4.rst @@ -84,6 +84,7 @@ Bug fixes * Logging in to the admin as a user with valid credentials but no admin access permission now displays an error message, rather than rejecting the user silently * StreamBlock HTML rendering now handles non-ASCII characters correctly on Python 2 (Mikalai Radchuk) * Fixed a bug preventing pages with a ``OneToOneField`` from being copied (Liam Brenner) + * SASS compilation errors during Wagtail development no longer cause exit of Gulp process, instead throws error to console and continues (Thomas Winter) Upgrade considerations diff --git a/gulpfile.js/tasks/styles.js b/gulpfile.js/tasks/styles.js index 880068a41..dd75a088f 100644 --- a/gulpfile.js/tasks/styles.js +++ b/gulpfile.js/tasks/styles.js @@ -31,7 +31,7 @@ gulp.task('styles:sass', function () { errLogToConsole: true, includePaths: includePaths, outputStyle: 'expanded' - })) + }).on('error', sass.logError)) .pipe(autoprefixer({ browsers: ['last 3 versions', 'not ie <= 8'], cascade: false