Fix issue #848 (#853)

* Fix issue #848 * Process the css in the 'styles' task
google · Jun 2, 2016 · 20eb478 · 20eb478
1 parent 722095f
commit 20eb478
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/app/index.html b/app/index.html
@@ -284,7 +284,7 @@ <h1 class="mdl-mega-footer--heading">FAQ</h1>
     </div>
 
     <script src="https://storage.googleapis.com/code.getmdl.io/1.0.6/material.min.js"></script>
-    <!-- build:js(app/) ../../scripts/main.min.js -->
+    <!-- build:js scripts/main.min.js -->
     <script src="scripts/main.js"></script>
     <!-- endbuild -->
 

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -92,6 +92,14 @@ gulp.task('styles', () => {
     .pipe($.sass({
       precision: 10
     }).on('error', $.sass.logError))
+    // Remove any unused CSS
+    .pipe($.if('*.css', $.uncss({
+      html: [
+        'app/index.html'
+      ],
+      // CSS Selectors for UnCSS to ignore
+      ignore: []
+    })))
     .pipe($.autoprefixer(AUTOPREFIXER_BROWSERS))
     .pipe(gulp.dest('.tmp/styles'))
     // Concatenate and minify styles
@@ -128,19 +136,10 @@ gulp.task('scripts', () =>
 // Scan your HTML for assets & optimize them
 gulp.task('html', () => {
   return gulp.src('app/**/*.html')
-    .pipe($.useref({searchPath: '{.tmp,app}'}))
-    // Remove any unused CSS
-    .pipe($.if('*.css', $.uncss({
-      html: [
-        'app/index.html'
-      ],
-      // CSS Selectors for UnCSS to ignore
-      ignore: []
-    })))
-
-    // Concatenate and minify styles
-    // In case you are still using useref build blocks
-    .pipe($.if('*.css', $.cssnano()))
+    .pipe($.useref({
+      searchPath: '{.tmp,app}',
+      noAssets: true
+    }))
 
     // Minify any HTML
     .pipe($.if('*.html', $.htmlmin({