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

Merge branch 'master' into feature-loaders-doc 

# Conflicts:
#	index.js
#	spec/HtmlWebpackPluginSpec.js
This commit is contained in:
Kees Kluskens 2015-09-20 17:54:35 +02:00
parent 5865ca7b30 273371859b
commit 9278bee55b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.js
View File

@ -4,6 +4,7 @@ var fs = require('fs');
var _ = require('lodash');
var Promise = require('bluebird');
var path = require('path');
var urlModule = require('url');
Promise.promisifyAll(fs);
var webpack = require('webpack');
@ -334,7 +335,7 @@ HtmlWebpackPlugin.prototype.htmlWebpackPluginAssets = function(compilation, chun
path.relative(path.dirname(self.options.filename), '.');
if (publicPath.length && publicPath.substr(-1, 1) !== '/') {
publicPath += '/';
publicPath = urlModule.resolve(publicPath + '/', '.');
}
var assets = {