TouchInstinct
/
html-webpack-plugin
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minify and head injection

This commit is contained in:
Jan Nicklas 2015-09-09 11:46:22 +02:00 committed by Jan Nicklas
parent 668ab7ffb3
commit f16dc48025
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.js
View File

@ -194,7 +194,7 @@ HtmlWebpackPlugin.prototype.evaluateCompilationResult = function(compilation, co
} catch (e) {
// Log syntax error
var syntaxError = require('syntax-error')(source);
var errorMessage = 'Template compilation failed: ' + e +
var errorMessage = 'Template compilation failed: ' + e +
(syntaxError ? '\n' + syntaxError + '\n\n\n' + source.split('\n').map(function(row, i) {
return (1 + i) + ' - ' + row;
}).join('\n') : '');
@ -255,10 +255,8 @@ HtmlWebpackPlugin.prototype.postProcessHtml = function(html, assets) {
.then(function(html) {
if (self.options.minify) {
var minify = require('html-minifier').minify;
// If `options.minify` is set to true use the default minify options
var minifyOptions = _.isObject(self.options.minify) ? self.options.minify : {};
try {
return minify(html, minifyOptions);
return minify(html, this.options.minify);
} catch(e) {
Promise.reject(e);
}
@ -430,7 +428,7 @@ HtmlWebpackPlugin.prototype.injectAssetsIntoHtml = function(html, assets) {
head = head.concat(styles);
// Add scripts to body or head
if (this.options.inject === 'head') {
head = body.concat(scripts);
head = head.concat(scripts);
} else {
body = body.concat(scripts);
}