Merge pull request #1811 from angular-fullstack/fix/gulp-css

Fix/gulp css

Author: Awk34

app/templates/_package.json

@@ -65,7 +65,7 @@
     "jshint": "2.9.2",
     "gulp-livereload": "^3.8.0",
     "gulp-load-plugins": "^1.0.0-rc.1",
-    "gulp-minify-css": "^1.1.6",
+    "gulp-clean-css": "^2.0.6",
     "gulp-mocha": "^2.1.3",
     "gulp-ng-annotate": "^2.0.0",
     "gulp-ng-constant": "^1.1.0",

app/templates/gulpfile.babel(gulp).js

@@ -136,6 +136,8 @@ let styles = lazypipe()
     })<% } if(filters.sass) { %>
     .pipe(plugins.sass)<% } if(filters.less) { %>
     .pipe(plugins.less)<% } %>
+    <%_ if(filters.css) { _%>
+    .pipe(plugins.cleanCss, {processImportFrom: ['!fonts.googleapis.com']})<% } %>
     .pipe(plugins.autoprefixer, {browsers: ['last 1 version']})
     .pipe(plugins.sourcemaps.write, '.');<% if(filters.babel) { %>
 
@@ -295,7 +297,10 @@ gulp.task('tsd:test', cb => {
 });<% } %>
 
 gulp.task('styles', () => {
+    <%_ if(!filters.css) { _%>
     return gulp.src(paths.client.mainStyle)
+    <%_ } else { _%>
+    return gulp.src(paths.client.styles)<% } %>
         .pipe(styles())
         .pipe(gulp.dest('.tmp/app'));
 });<% if(filters.ts) { %>
@@ -581,8 +586,7 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html', 'constant'], ()
                 .pipe(plugins.uglify())
             .pipe(jsFilter.restore)
             .pipe(cssFilter)
-                .pipe(plugins.minifyCss({
-                    cache: true,
+                .pipe(plugins.cleanCss({
                     processImportFrom: ['!fonts.googleapis.com']
                 }))
             .pipe(cssFilter.restore)