Update addLoader to take a raw loader config object

Author: pierredup

index.js

@@ -1,3 +1,12 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 'use strict';
 
 const WebpackConfig = require('./lib/WebpackConfig');

lib/WebpackConfig.js

@@ -49,7 +49,7 @@ class WebpackConfig {
         this.providedVariables = {};
         this.babelConfigurationCallback = function() {};
         this.useReact = false;
-        this.loaders = new Set();
+        this.loaders = [];
     }
 
     getContext() {
@@ -158,8 +158,8 @@ class WebpackConfig {
         this.styleEntries.set(name, src);
     }
 
-    addLoader(test, use, options = { include: null, exclude: null }) {
-        this.loaders.add({ 'test': test, 'use': use, 'include': options.include || null, 'exclude': options.exclude || null });
+    addLoader(loader) {
+        this.loaders.push(loader);
     }
 
     enableVersioning(enabled = true) {

lib/config-generator.js

@@ -235,11 +235,9 @@ class ConfigGenerator {
             });
         }
 
-        if (this.webpackConfig.loaders.size > 0) {
-            this.webpackConfig.loaders.forEach((loader) => {
-                rules.push(loader);
-            });
-        }
+        this.webpackConfig.loaders.forEach((loader) => {
+            rules.push(loader);
+        });
 
         return rules;
     }

test/WebpackConfig.js

@@ -281,17 +281,9 @@ describe('WebpackConfig object', () => {
         it('Adds a new loader with default options', () => {
             const config = createConfig();
 
-            config.addLoader(/\.custom$/, 'custom-loader');
+            config.addLoader({ 'test': /\.custom$/, 'loader': 'custom-loader' });
 
-            expect(Array.from(config.loaders)).to.deep.equals([{ 'test': /\.custom$/, 'use': 'custom-loader', 'include': null, 'exclude': null }]);
-        });
-
-        it('Adds a custom exclude path', () => {
-            const config = createConfig();
-
-            config.addLoader(/\.custom$/, 'custom-loader', { 'exclude': 'node_modules' });
-
-            expect(Array.from(config.loaders)).to.deep.equals([{ 'test': /\.custom$/, 'use': 'custom-loader', 'include': null, 'exclude': 'node_modules' }]);
+            expect(Array.from(config.loaders)).to.deep.equals([{ 'test': /\.custom$/, 'loader': 'custom-loader' }]);
         });
     });
 });

test/config-generator.js

@@ -348,27 +348,16 @@ describe('The config-generator function', () => {
         });
     });
 
-    describe('addLoader() adds custom rules', () => {
+    describe('addLoader() adds a custom loader', () => {
         it('addLoader()', () => {
             const config = createConfig();
             config.outputPath = '/tmp/output/public-path';
             config.publicPath = '/public-path';
-            config.addLoader(/\.custom$/, 'custom-loader');
+            config.addLoader({ 'test': /\.custom$/, 'loader': 'custom-loader' });
 
             const actualConfig = configGenerator(config);
 
-            expect(actualConfig.module.rules).to.deep.include({ 'test': /\.custom$/, 'use': 'custom-loader', 'include': null, 'exclude': null });
-        });
-
-        it('addLoader() with custom exlude path', () => {
-            const config = createConfig();
-            config.outputPath = '/tmp/output/public-path';
-            config.publicPath = '/public-path';
-            config.addLoader(/\.custom$/, 'custom-loader', { 'exclude': 'node_modules' });
-
-            const actualConfig = configGenerator(config);
-
-            expect(actualConfig.module.rules).to.deep.include({ 'test': /\.custom$/, 'use': 'custom-loader', 'include': null, 'exclude': 'node_modules' });
+            expect(actualConfig.module.rules).to.deep.include({ 'test': /\.custom$/, 'loader': 'custom-loader' });
         });
     });