Skip to content

Fix JS query string versioning when using addStyleEntry #161

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

Merged
merged 1 commit into from
Sep 16, 2017
Merged

Fix JS query string versioning when using addStyleEntry #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions lib/webpack/delete-unused-entries-js-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

'use strict';

const path = require('path');

function DeleteUnusedEntriesJSPlugin(entriesToDelete = []) {
this.entriesToDelete = entriesToDelete;
}
Expand All @@ -25,7 +23,7 @@ DeleteUnusedEntriesJSPlugin.prototype.apply = function(compiler) {

// loop over the output files and find the 1 that ends in .js
chunk.files.forEach((filename) => {
if (path.extname(filename) === '.js') {
if (/\.js(\?[^.]*)?$/.test(filename)) {
fileDeleteCount++;
// remove the output file
delete compilation.assets[filename];
Expand Down
106 changes: 85 additions & 21 deletions test/functional.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,30 +243,94 @@ describe('Functional tests using webpack', function() {
});
});

it('addStyleEntry .js files are removed', (done) => {
const config = createWebpackConfig('web', 'dev');
config.addEntry('main', './js/no_require');
config.setPublicPath('/');
config.addStyleEntry('styles', './css/h1_style.css');
describe('addStyleEntry .js files are removed', () => {
it('Without versioning', (done) => {
const config = createWebpackConfig('web', 'dev');
config.addEntry('main', './js/no_require');
config.setPublicPath('/');
config.addStyleEntry('styles', './css/h1_style.css');

testSetup.runWebpack(config, (webpackAssert) => {
expect(config.outputPath).to.be.a.directory()
// public.js should not exist
.with.files(['main.js', 'styles.css', 'manifest.json']);
testSetup.runWebpack(config, (webpackAssert) => {
expect(config.outputPath).to.be.a.directory()
// public.js should not exist
.with.files(['main.js', 'styles.css', 'manifest.json']);

webpackAssert.assertOutputFileContains(
'styles.css',
'font-size: 50px;'
);
webpackAssert.assertManifestPathDoesNotExist(
'styles.js'
);
webpackAssert.assertManifestPath(
'styles.css',
'/styles.css'
);
webpackAssert.assertOutputFileContains(
'styles.css',
'font-size: 50px;'
);
webpackAssert.assertManifestPathDoesNotExist(
'styles.js'
);
webpackAssert.assertManifestPath(
'styles.css',
'/styles.css'
);

done();
done();
});
});

it('With default versioning', (done) => {
const config = createWebpackConfig('web', 'dev');
config.addEntry('main', './js/no_require');
config.setPublicPath('/');
config.addStyleEntry('styles', './css/h1_style.css');
config.enableVersioning(true);

testSetup.runWebpack(config, (webpackAssert) => {
expect(config.outputPath).to.be.a.directory()
.with.files([
'main.f1e0a9350e13fe3a597e.js',
'styles.c84caea6dd12bba7955dee9fedd5fd03.css',
'manifest.json'
]);

webpackAssert.assertOutputFileContains(
'styles.c84caea6dd12bba7955dee9fedd5fd03.css',
'font-size: 50px;'
);
webpackAssert.assertManifestPathDoesNotExist(
'styles.js'
);
webpackAssert.assertManifestPath(
'styles.css',
'/styles.c84caea6dd12bba7955dee9fedd5fd03.css'
);

done();
});
});

it('With query string versioning', (done) => {
const config = createWebpackConfig('web', 'dev');
config.addEntry('main', './js/no_require');
config.setPublicPath('/');
config.addStyleEntry('styles', './css/h1_style.css');
config.enableVersioning(true);
config.configureFilenames({
js: '[name].js?[chunkhash:16]',
css: '[name].css?[contenthash:16]'
});

testSetup.runWebpack(config, (webpackAssert) => {
expect(config.outputPath).to.be.a.directory()
.with.files(['main.js', 'styles.css', 'manifest.json']);

webpackAssert.assertOutputFileContains(
'styles.css',
'font-size: 50px;'
);
webpackAssert.assertManifestPathDoesNotExist(
'styles.js'
);
webpackAssert.assertManifestPath(
'styles.css',
'/styles.css?c84caea6dd12bba7'
);

done();
});
});
});

Expand Down