Use versioned filenames during copying if the "to" option isn't set

Author: Lyrkan

index.js

@@ -437,9 +437,6 @@ class Encore {
      * Notes:
      *      * No transformation is applied to the copied files (for instance
      *        copying a CSS file won't minify it)
-     *      * By default files won't be versioned even if enableVersioning()
-     *        has been called. In order to add a hash to your filenames you
-     *        must use the "[hash]" placeholder in the "to" option (see below)
      *
      * Supported options:
      *      * {string} from (mandatory)

lib/WebpackConfig.js

@@ -378,7 +378,7 @@ class WebpackConfig {
         const defaultConfig = {
             from: null,
             pattern: /.*/,
-            to: '[path][name].[ext]',
+            to: null,
             includeSubdirectories: true
         };
 

lib/config-generator.js

@@ -151,7 +151,12 @@ class ConfigGenerator {
                         entry.from
                     );
 
-                    const requireContextParam = `!${require.resolve('file-loader')}?context=${copyFrom}&name=${entry.to}!${copyFrom}`;
+                    let copyTo = entry.to;
+                    if (copyTo === null) {
+                        copyTo = this.webpackConfig.useVersioning ? '[path][name].[hash:8].[ext]' : '[path][name].[ext]';
+                    }
+
+                    const requireContextParam = `!${require.resolve('file-loader')}?context=${copyFrom}&name=${copyTo}!${copyFrom}`;
 
                     return buffer + `
                         const context_${index} = require.context(

test/WebpackConfig.js

@@ -360,7 +360,7 @@ describe('WebpackConfig object', () => {
     });
 
     describe('copyFiles', () => {
-        it('Calling it add files to be copied', () => {
+        it('Calling it adds files to be copied', () => {
             const config = createConfig();
 
             // With multiple config objects
@@ -375,7 +375,7 @@ describe('WebpackConfig object', () => {
             expect(config.copyFilesConfigs).to.deep.equal([{
                 from: './foo',
                 pattern: /.*/,
-                to: '[path][name].[ext]',
+                to: null,
                 includeSubdirectories: true
             }, {
                 from: './bar',
@@ -385,7 +385,7 @@ describe('WebpackConfig object', () => {
             }, {
                 from: './baz',
                 pattern: /.*/,
-                to: '[path][name].[ext]',
+                to: null,
                 includeSubdirectories: true
             }]);
         });

test/functional.js

@@ -1545,6 +1545,60 @@ module.exports = {
                     done();
                 });
             });
+
+            it('Copy with versioning enabled', (done) => {
+                const config = createWebpackConfig('www/build', 'production');
+                config.addEntry('main', './js/no_require');
+                config.setPublicPath('/build');
+                config.enableVersioning(true);
+                config.copyFiles([{
+                    from: './images',
+                    includeSubdirectories: false
+                }, {
+                    from: './fonts',
+                    to: 'assets/[path][name].[ext]',
+                    includeSubdirectories: false
+                }]);
+
+                testSetup.runWebpack(config, (webpackAssert) => {
+                    expect(config.outputPath).to.be.a.directory()
+                        .with.files([
+                            'entrypoints.json',
+                            'runtime.d41d8cd9.js',
+                            'main.1172d977.js',
+                            'manifest.json',
+                            'symfony_logo.ea1ca6f7.png',
+                            'symfony_logo_alt.f27119c2.png',
+                        ]);
+
+                    expect(path.join(config.outputPath, 'assets')).to.be.a.directory()
+                        .with.files([
+                            'Roboto.woff2',
+                        ]);
+
+                    webpackAssert.assertManifestPath(
+                        'build/main.js',
+                        '/build/main.1172d977.js'
+                    );
+
+                    webpackAssert.assertManifestPath(
+                        'build/symfony_logo.png',
+                        '/build/symfony_logo.ea1ca6f7.png'
+                    );
+
+                    webpackAssert.assertManifestPath(
+                        'build/symfony_logo_alt.png',
+                        '/build/symfony_logo_alt.f27119c2.png'
+                    );
+
+                    webpackAssert.assertManifestPath(
+                        'build/assets/Roboto.woff2',
+                        '/build/assets/Roboto.woff2'
+                    );
+
+                    done();
+                });
+            });
         });
 
         describe('entrypoints.json', () => {