[BUGFIX] clean up config

brousalis · Jul 4, 2016 · 92c8ce8 · 92c8ce8
1 parent d5b212d
commit 92c8ce8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/gulpfile.js/config.js b/gulpfile.js/config.js
@@ -46,7 +46,6 @@ var settings = {
     babel: false, // Enable babel es2015
     coffeescript: false, // Enable coffeescript compilation
     sourcemaps: false, // Enable sourcemap generation
-    combineMQ: true, // Auto combine media queries
     inject: [ // In what order should COMPILED scripts be injected into the template and bundled on build
       // Paths taken relative to the src (default 'source') folder.
       // ex: 'javascripts/components/**/*.js',
@@ -65,6 +64,7 @@ var settings = {
     sass: true,
     autoprefixer: true,
     sourcemaps: false,
+    combineMediaQueries: true, // Combine media queries
     compiler: {
       indentedSyntax: true,
       imagePath: 'images',

diff --git a/gulpfile.js/tasks/build.js b/gulpfile.js/tasks/build.js
@@ -66,10 +66,12 @@ function compile(callback) {
     .pipe(assets = useref.assets())
     .pipe(jsFilter)
     .pipe(gulpif(config.angular.enabled, ngAnnotate()))
-    .pipe(uglify()).on('error', util.errorHandler('uglify'))
+    .pipe(uglify())
+    .on('error', util.errorHandler('uglify'))
     .pipe(jsFilter.restore())
     .pipe(cssFilter)
     .pipe(gulpif(config.build.uncss, uncss({ html: [ path.join(config.paths.dev, '**/*.html') ] })))
+    .on('error', util.errorHandler('uncss'))
     .pipe(minifyCss())
     .pipe(cssFilter.restore())
     .pipe(assets.restore())

diff --git a/gulpfile.js/tasks/styles.js b/gulpfile.js/tasks/styles.js
@@ -24,7 +24,7 @@ function styles() {
     .on('error', util.errorHandler('sass'))
     .pipe(gulpif(config.styles.autoprefixer, autoprefixer()))
     .on('error', util.errorHandler('autoprefixer'))
-    .pipe(gulpif(config.styles.combineMQ, cmq()))
+    .pipe(gulpif(config.styles.combineMediaQueries, cmq()))
     .on('error', util.errorHandler('combine-mq'))
     .pipe(gulpif(config.styles.sourcemaps, sourcemaps.write()))
     .pipe(gulp.dest(dest))