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

fix favicon location

This commit is contained in:
Jiri Kolarik 2016-02-10 16:48:15 +01:00 committed by Jan Nicklas
parent e3c7975d78
commit b65c39c2f1
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.js
View File

@ -75,7 +75,11 @@ HtmlWebpackPlugin.prototype.apply = function (compiler) {
if (self.options.favicon) {
return self.addFileToAssets(self.options.favicon, compilation)
.then(function (faviconBasename) {
assets.favicon = faviconBasename;
if (compilation.options.output.publicPath) {
assets.favicon = compilation.options.output.publicPath + faviconBasename;
} else {
assets.favicon = faviconBasename;
}
});
}
})

16
spec/HtmlWebpackPluginSpec.js
View File

@ -770,6 +770,22 @@ describe('HtmlWebpackPlugin', function () {
}, [/<link rel="shortcut icon" href="[^"]+\.ico">/], null, done);
});
it('adds a favicon with publicPath set', function (done) {
testHtmlPlugin({
entry: path.join(__dirname, 'fixtures/index.js'),
output: {
path: OUTPUT_DIR,
publicPath: '/some/',
filename: 'index_bundle.js'
},
plugins: [
new HtmlWebpackPlugin({
favicon: path.join(__dirname, 'fixtures/favicon.ico')
})
]
}, [/<link rel="shortcut icon" href="\/some\/+[^"]+\.ico">/], null, done);
});
it('adds a favicon with inject enabled', function (done) {
testHtmlPlugin({
entry: path.join(__dirname, 'fixtures/index.js'),