Merge branch 'develop' into feature/fix_regexes

danielcherubini · web-flow · commit 87e971d6a73b · 2017-08-21T16:19:02.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -82,13 +82,13 @@
     },
     "devDependencies": {
         "ava": "^0.22.0",
-        "babel-cli": "^6.24.1",
+        "babel-cli": "^6.26.0",
         "babel-plugin-transform-flow-strip-types": "^6.22.0",
         "babel-preset-env": "^1.6.0",
         "babel-preset-flow": "^6.23.0",
         "codecov": "^2.3.0",
         "coveralls": "^2.13.1",
-        "eslint": "^4.4.1",
+        "eslint": "^4.5.0",
         "eslint-config-xo-space": "^0.16.0",
         "eslint-plugin-flowtype": "^2.35.0",
         "express": "^4.15.4",
diff --git a/src/parser/html.js b/src/parser/html.js
@@ -21,9 +21,15 @@ function htmlParser(templateObject: TemplateObjectType, minify: boolean): Promis
                 parsedString = pug.compile(templateObject.content,{})({});
             }
             if (minify) {
-                parsedString = htmlMinify.minify(templateObject.content, {
-                    collapseWhitespace: true
-                });
+                if (parsedString === '') {
+                    parsedString = htmlMinify.minify(templateObject.content, {
+                        collapseWhitespace: true
+                    });
+                } else {
+                    parsedString = htmlMinify.minify(parsedString, {
+                        collapseWhitespace: true
+                    });
+                }
             }
             resolve(parsedString);
         }

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,15 @@ function htmlParser(templateObject: TemplateObjectType, minify: boolean): Promis`
`21`	`21`	`parsedString = pug.compile(templateObject.content,{})({});`
`22`	`22`	`}`
`23`	`23`	`if (minify) {`
`24`		`- parsedString = htmlMinify.minify(templateObject.content, {`
`25`		`- collapseWhitespace: true`
`26`		`- });`
	`24`	`+ if (parsedString === '') {`
	`25`	`+ parsedString = htmlMinify.minify(templateObject.content, {`
	`26`	`+ collapseWhitespace: true`
	`27`	`+ });`
	`28`	`+ } else {`
	`29`	`+ parsedString = htmlMinify.minify(parsedString, {`
	`30`	`+ collapseWhitespace: true`
	`31`	`+ });`
	`32`	`+ }`
`27`	`33`	`}`
`28`	`34`	`resolve(parsedString);`
`29`	`35`	`}`