From 2002c42df5ba886d351cd0de78aed7c08d89ea59 Mon Sep 17 00:00:00 2001
From: Judd Younce <jfyounce@gmail.com>
Date: Mon, 1 Feb 2016 17:47:01 +0000
Subject: [PATCH] chore(dep): replace gulp-minify-html with gulp-htmlmin for
 html minification

gulp-minify-html has been deprecated in favor of gulp-htmlmin.
---
 config/config-minify.coffee        | 7 ++++++-
 package.json                       | 2 +-
 tasks/minify/minify-html.coffee    | 2 +-
 tasks/minify/minify-spa.coffee     | 2 +-
 tasks/minify/template-cache.coffee | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/config/config-minify.coffee b/config/config-minify.coffee
index 98e16a4..722842c 100644
--- a/config/config-minify.coffee
+++ b/config/config-minify.coffee
@@ -33,7 +33,12 @@ module.exports = (config, options) ->
 			views: getOption 'html', 'views'
 			templateCache: getOption 'html', 'templateCache'
 			options: # not configurable
-				conditionals:true, empty:true, ssi:true
+				collapseWhitespace:    true
+				removeComments:        true # excludes ie conditionals
+				removeEmptyElements:   false
+				removeEmptyAttributes: false
+				ignoreCustomFragments: [/<!--\s*?#\s*?include.*?-->/ig] # exclude custom html spa placeholder comments
+
 		spa:
 			file: getOption 'spa', 'file'
 
diff --git a/package.json b/package.json
index 02fc028..2ec60a9 100644
--- a/package.json
+++ b/package.json
@@ -49,10 +49,10 @@
 		"gulp-coffee": "2.3.1",
 		"gulp-concat": "2.6.0",
 		"gulp-cssnano": "2.1.0",
+		"gulp-htmlmin": "1.3.0",
 		"gulp-if": "2.0.0",
 		"gulp-jsonminify": "1.0.0",
 		"gulp-less": "3.0.5",
-		"gulp-minify-html": "1.0.4",
 		"gulp-nodemon": "2.0.6",
 		"gulp-plumber": "1.0.1",
 		"gulp-rename": "1.2.2",
diff --git a/tasks/minify/minify-html.coffee b/tasks/minify/minify-html.coffee
index dfec0c1..9f56fd5 100644
--- a/tasks/minify/minify-html.coffee
+++ b/tasks/minify/minify-html.coffee
@@ -1,7 +1,7 @@
 module.exports = (config, gulp) ->
 	q           = require 'q'
 	path        = require 'path'
-	minifyHtml  = require 'gulp-minify-html'
+	minifyHtml  = require 'gulp-htmlmin'
 	promiseHelp = require "#{config.req.helpers}/promise"
 
 	minifyTask = (appOrRb) ->
diff --git a/tasks/minify/minify-spa.coffee b/tasks/minify/minify-spa.coffee
index 27cf48d..58726eb 100644
--- a/tasks/minify/minify-spa.coffee
+++ b/tasks/minify/minify-spa.coffee
@@ -1,6 +1,6 @@
 module.exports = (config, gulp) ->
 	q           = require 'q'
-	minifyHtml  = require 'gulp-minify-html'
+	minifyHtml  = require 'gulp-htmlmin'
 	promiseHelp = require "#{config.req.helpers}/promise"
 
 	# tasks
diff --git a/tasks/minify/template-cache.coffee b/tasks/minify/template-cache.coffee
index 5cf039c..1079055 100644
--- a/tasks/minify/template-cache.coffee
+++ b/tasks/minify/template-cache.coffee
@@ -3,7 +3,7 @@ module.exports = (config, gulp, taskOpts={}) ->
 	path          = require 'path'
 	es            = require 'event-stream'
 	gulpif        = require 'gulp-if'
-	minifyHtml    = require 'gulp-minify-html'
+	minifyHtml    = require 'gulp-htmlmin'
 	templateCache = require 'gulp-angular-templatecache'
 	ngFormify     = require "#{config.req.plugins}/gulp-ng-formify"
 	dirHelper     = require("#{config.req.helpers}/dir") config, gulp