Skip to content

Commit

Permalink
Merge pull request #249 from sandeep45/master
Browse files Browse the repository at this point in the history
build public path with correct hash value
  • Loading branch information
jantimon committed Mar 17, 2016
2 parents b613824 + eb01c77 commit 67ca550
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ HtmlWebpackPlugin.prototype.htmlWebpackPluginAssets = function (compilation, chu

// Use the configured public path or build a relative path
var publicPath = typeof compilation.options.output.publicPath !== 'undefined'
? compilation.options.output.publicPath
? compilation.mainTemplate.getPublicPath({hash: webpackStatsJson.hash})
: path.relative(path.dirname(self.options.filename), '.').split(path.sep).join('/');

if (publicPath.length && publicPath.substr(-1, 1) !== '/') {
Expand Down
12 changes: 12 additions & 0 deletions spec/HtmlWebpackPluginSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,18 @@ describe('HtmlWebpackPlugin', function () {
}, [/<script src="index_bundle_[0-9a-f]+\.js"*/], null, done);
});

it('handles hashes in the directory which has the bundle file', function (done) {
testHtmlPlugin({
entry: path.join(__dirname, 'fixtures/index.js'),
output: {
path: path.join(__dirname, '../dist'),
publicPath: '/dist/[hash]/',
filename: 'index_bundle_[hash].js'
},
plugins: [new HtmlWebpackPlugin()]
}, [/<script src="\/dist\/[0-9a-f]+\/index_bundle_[0-9a-f]+\.js"*/], null, done);
});

it('allows to append hashes to the assets', function (done) {
testHtmlPlugin({
entry: path.join(__dirname, 'fixtures/index.js'),
Expand Down

0 comments on commit 67ca550

Please sign in to comment.