Encore.configureUrlLoader() - Merge options instead of replacing them

Author: Lyrkan

lib/config-generator.js

@@ -159,7 +159,7 @@ class ConfigGenerator {
 
             if (this.webpackConfig.urlLoaderOptions.images) {
                 loaderName = 'url-loader';
-                loaderOptions = this.webpackConfig.urlLoaderOptions.images;
+                Object.assign(loaderOptions, this.webpackConfig.urlLoaderOptions.images);
             }
 
             rules.push({
@@ -186,7 +186,7 @@ class ConfigGenerator {
 
             if (this.webpackConfig.urlLoaderOptions.fonts) {
                 loaderName = 'url-loader';
-                loaderOptions = this.webpackConfig.urlLoaderOptions.fonts;
+                Object.assign(loaderOptions, this.webpackConfig.urlLoaderOptions.fonts);
             }
 
             rules.push({

test/config-generator.js

@@ -711,6 +711,10 @@ describe('The config-generator function', () => {
             config.outputPath = '/tmp/public-path';
             config.publicPath = '/public-path';
             config.addEntry('main', './main');
+            config.configureFilenames({
+                images: '[name].foo.[ext]',
+                fonts: '[name].bar.[ext]'
+            });
             config.configureUrlLoader({
                 images: { limit: 8192 },
                 fonts: { limit: 4096 }
@@ -720,11 +724,13 @@ describe('The config-generator function', () => {
 
             const imagesRule = findRule(/\.(png|jpg|jpeg|gif|ico|svg|webp)$/, actualConfig.module.rules);
             expect(imagesRule.loader).to.equal('url-loader');
+            expect(imagesRule.options.name).to.equal('[name].foo.[ext]');
             expect(imagesRule.options.limit).to.equal(8192);
 
             const fontsRule = findRule(/\.(woff|woff2|ttf|eot|otf)$/, actualConfig.module.rules);
             expect(fontsRule.loader).to.equal('url-loader');
             expect(fontsRule.options.limit).to.equal(4096);
+            expect(fontsRule.options.name).to.equal('[name].bar.[ext]');
         });
     });