Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

addFileToAssets allow output name override #958

Closed
wants to merge 4 commits into from
Closed

addFileToAssets allow output name override #958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3c927b
addFileToAssets allow output name override
WearyMonkey May 29, 2018
d395aaf
contentHash and test
WearyMonkey May 29, 2018
a127c60
name
WearyMonkey May 29, 2018
2d42652
fix test
WearyMonkey May 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const vm = require('vm');
const fs = require('fs');
const _ = require('lodash');
const path = require('path');
const crypto = require('crypto');
const childCompiler = require('./lib/compiler.js');
const prettyError = require('./lib/errors.js');
const chunkSorter = require('./lib/chunksorter.js');
Expand Down Expand Up @@ -324,7 +325,7 @@ class HtmlWebpackPlugin {
/*
* Pushes the content of the given filename to the compilation assets
*/
addFileToAssets (filename, compilation) {
addFileToAssets (filename, compilation, outputName) {
filename = path.resolve(compilation.compiler.context, filename);
return Promise.all([
fsStatAsync(filename),
Expand All @@ -338,7 +339,17 @@ class HtmlWebpackPlugin {
})
.catch(() => Promise.reject(new Error('HtmlWebpackPlugin: could not load file ' + filename)))
.then(results => {
const basename = path.basename(filename);
let basename = path.basename(filename);
if (outputName != null) {
basename = outputName
.replace(/\[contenthash]/gi, () => {
const hash = crypto.createHash('md5');
hash.update(results.source);
return hash.digest('hex');
})
// name without the extension
.replace(/\[name]/gi, () => basename.replace(/\.[^/.]+$/, ''));
}
if (compilation.fileDependencies.add) {
compilation.fileDependencies.add(filename);
} else {
Expand Down
27 changes: 27 additions & 0 deletions spec/BasicSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1748,4 +1748,31 @@ describe('HtmlWebpackPlugin', function () {
})]
}, [/<head>[\s]*<script type="text\/javascript" src="index_bundle.js"><\/script>[\s]*<\/head\s>/], null, done);
});

it('addFileToAssets allows you to override output name of asset', function (done) {
const plugin = new HtmlWebpackPlugin();
const compilation = {
compiler: {
context: __dirname
},
assets: {},
fileDependencies: {
add (f) { this.files.push(f); },
files: []
}
};

plugin
.addFileToAssets('fixtures/additional_asset.js', compilation, '[name].foo.[contentHash].js')
.then(filename => {
const expectedFilename = 'additional_asset.foo.a507be46681ab5fdc64d829da4a0fc92.js';
expect(filename).toEqual(expectedFilename);
expect(compilation.assets[expectedFilename].source().toString())
.toEqual('// Content will be hashed in tests, do not change.\n');
expect(compilation.assets[expectedFilename].size())
.toEqual(51);
expect(compilation.fileDependencies.files).toEqual([`${__dirname}/fixtures/additional_asset.js`]);
done();
});
});
});
1 change: 1 addition & 0 deletions spec/fixtures/additional_asset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
// Content will be hashed in tests, do not change.