Merge pull request #11 from pierredup/custom-loaders

Allow to add custom loaders

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');
@@ -126,6 +135,32 @@ module.exports = {
         return this;
     },
 
+    /**
+     * Adds a custom loader config
+     *
+     * @param {object} loader The loader config object
+     *
+     * @returns {exports}
+     */
+    addLoader(loader) {
+        webpackConfig.addLoader(loader);
+
+        return this;
+    },
+
+    /**
+     * Alias to addLoader
+     *
+     * @param {object} rule
+     *
+     * @returns {exports}
+     */
+    addRule(rule) {
+        this.addLoader(rule);
+
+        return this;
+    },
+
     /**
      * When enabled, files are rendered with a hash based
      * on their contents (e.g. main.a2b61cc.js)

lib/WebpackConfig.js

@@ -49,6 +49,7 @@ class WebpackConfig {
         this.providedVariables = {};
         this.babelConfigurationCallback = function() {};
         this.useReact = false;
+        this.loaders = [];
     }
 
     getContext() {
@@ -157,6 +158,10 @@ class WebpackConfig {
         this.styleEntries.set(name, src);
     }
 
+    addLoader(loader) {
+        this.loaders.push(loader);
+    }
+
     enableVersioning(enabled = true) {
         this.useVersioning = enabled;
     }

lib/config-generator.js

@@ -235,6 +235,10 @@ class ConfigGenerator {
             });
         }
 
+        this.webpackConfig.loaders.forEach((loader) => {
+            rules.push(loader);
+        });
+
         return rules;
     }
 

test/WebpackConfig.js

@@ -276,4 +276,14 @@ describe('WebpackConfig object', () => {
             }).to.throw('Invalid option "fake_option" passed to enableSassLoader()');
         });
     });
+
+    describe('addLoader', () => {
+        it('Adds a new loader', () => {
+            const config = createConfig();
+
+            config.addLoader({ 'test': /\.custom$/, 'loader': 'custom-loader' });
+
+            expect(config.loaders).to.deep.equals([{ 'test': /\.custom$/, 'loader': 'custom-loader' }]);
+        });
+    });
 });

test/config-generator.js

@@ -348,6 +348,19 @@ describe('The config-generator function', () => {
         });
     });
 
+    describe('addLoader() adds a custom loader', () => {
+        it('addLoader()', () => {
+            const config = createConfig();
+            config.outputPath = '/tmp/output/public-path';
+            config.publicPath = '/public-path';
+            config.addLoader({ 'test': /\.custom$/, 'loader': 'custom-loader' });
+
+            const actualConfig = configGenerator(config);
+
+            expect(actualConfig.module.rules).to.deep.include({ 'test': /\.custom$/, 'loader': 'custom-loader' });
+        });
+    });
+
     describe('.js rule receives different configuration', () => {
         it('Use default config', () => {
             const config = createConfig();