Skip to content

Commit e9c1c1a

Browse files
committed
bug #216 Always use 8 characters hashes by default (Lyrkan)
This PR was merged into the master branch. Discussion ---------- Always use 8 characters hashes by default This PR closes #203 by always generating 8 characters hashes for filenames when using default settings. Commits ------- e890e5b Always use 8 characters hashes by default
2 parents 5689d2e + e890e5b commit e9c1c1a

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

lib/config-generator.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class ConfigGenerator {
112112

113113
buildOutputConfig() {
114114
// Default filename can be overriden using Encore.configureFilenames({ js: '...' })
115-
let filename = this.webpackConfig.useVersioning ? '[name].[chunkhash].js' : '[name].js';
115+
let filename = this.webpackConfig.useVersioning ? '[name].[chunkhash:8].js' : '[name].js';
116116
if (this.webpackConfig.configuredFilenames.js) {
117117
filename = this.webpackConfig.configuredFilenames.js;
118118
}

lib/plugins/extract-text.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module.exports = function(plugins, webpackConfig) {
3232
*/
3333

3434
// Default filename can be overriden using Encore.configureFilenames({ css: '...' })
35-
let filename = webpackConfig.useVersioning ? '[name].[contenthash].css' : '[name].css';
35+
let filename = webpackConfig.useVersioning ? '[name].[contenthash:8].css' : '[name].css';
3636
if (webpackConfig.configuredFilenames.css) {
3737
filename = webpackConfig.configuredFilenames.css;
3838
}

test/config-generator.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ describe('The config-generator function', () => {
201201
config.useVersioning = true;
202202

203203
const actualConfig = configGenerator(config);
204-
expect(actualConfig.output.filename).to.equal('[name].[chunkhash].js');
204+
expect(actualConfig.output.filename).to.equal('[name].[chunkhash:8].js');
205205

206206
const extractTextPlugin = findPlugin(ExtractTextPlugin, actualConfig.plugins);
207207

208-
expect(extractTextPlugin.filename).to.equal('[name].[contenthash].css');
208+
expect(extractTextPlugin.filename).to.equal('[name].[contenthash:8].css');
209209
});
210210
});
211211

test/functional.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -281,21 +281,21 @@ describe('Functional tests using webpack', function() {
281281
testSetup.runWebpack(config, (webpackAssert) => {
282282
expect(config.outputPath).to.be.a.directory()
283283
.with.files([
284-
'main.f1e0a9350e13fe3a597e.js',
285-
'styles.c84caea6dd12bba7955dee9fedd5fd03.css',
284+
'main.f1e0a935.js',
285+
'styles.c84caea6.css',
286286
'manifest.json'
287287
]);
288288

289289
webpackAssert.assertOutputFileContains(
290-
'styles.c84caea6dd12bba7955dee9fedd5fd03.css',
290+
'styles.c84caea6.css',
291291
'font-size: 50px;'
292292
);
293293
webpackAssert.assertManifestPathDoesNotExist(
294294
'styles.js'
295295
);
296296
webpackAssert.assertManifestPath(
297297
'styles.css',
298-
'/styles.c84caea6dd12bba7955dee9fedd5fd03.css'
298+
'/styles.c84caea6.css'
299299
);
300300

301301
done();
@@ -377,10 +377,10 @@ describe('Functional tests using webpack', function() {
377377
testSetup.runWebpack(config, (webpackAssert) => {
378378
expect(config.outputPath).to.be.a.directory()
379379
.with.files([
380-
'0.d002be21e9bcf76057e9.js', // chunks are also versioned
381-
'main.292c0347ed1240663cb1.js',
382-
'h1.c84caea6dd12bba7955dee9fedd5fd03.css',
383-
'bg.483832e48e67e6a3b7f0ae064eadca51.css',
380+
'0.d002be21.js', // chunks are also versioned
381+
'main.292c0347.js',
382+
'h1.c84caea6.css',
383+
'bg.483832e4.css',
384384
'manifest.json'
385385
]);
386386

@@ -390,7 +390,7 @@ describe('Functional tests using webpack', function() {
390390
]);
391391

392392
webpackAssert.assertOutputFileContains(
393-
'bg.483832e48e67e6a3b7f0ae064eadca51.css',
393+
'bg.483832e4.css',
394394
'/build/images/symfony_logo.ea1ca6f7.png'
395395
);
396396

test/plugins/extract-text.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('plugins/extract-text', () => {
4444
extractTextPluginUtil(plugins, config);
4545
expect(plugins.length).to.equal(1);
4646
expect(plugins[0].plugin).to.be.instanceof(ExtractTextPlugin);
47-
expect(plugins[0].plugin.filename).to.equal('[name].[contenthash].css');
47+
expect(plugins[0].plugin.filename).to.equal('[name].[contenthash:8].css');
4848
expect(plugins[0].plugin.options.allChunks).to.equal(false);
4949
});
5050

0 commit comments

Comments
 (0)