Split disableAssetsLoaders into disableImagesLoader and disableFontsLoader

Author: Lyrkan

index.js

@@ -431,12 +431,24 @@ module.exports = {
 
     /**
      * Call this if you wish to disable the default
-     * assets loaders (images and fonts).
+     * images loader.
      *
      * @returns {exports}
      */
-    disableAssetsLoaders() {
-        webpackConfig.disableAssetsLoaders();
+    disableImagesLoader() {
+        webpackConfig.disableImagesLoader();
+
+        return this;
+    },
+
+    /**
+     * Call this if you wish to disable the default
+     * fonts loader.
+     *
+     * @returns {exports}
+     */
+    disableFontsLoader() {
+        webpackConfig.disableFontsLoader();
 
         return this;
     },

lib/WebpackConfig.js

@@ -59,7 +59,8 @@ class WebpackConfig {
         this.tsConfigurationCallback = function() {};
         this.useForkedTypeScriptTypeChecking = false;
         this.forkedTypeScriptTypesCheckOptionsCallback = () => {};
-        this.useAssetsLoaders = true;
+        this.useImagesLoader = true;
+        this.useFontsLoader = true;
     }
 
     getContext() {
@@ -269,8 +270,12 @@ class WebpackConfig {
         this.vueLoaderOptionsCallback = vueLoaderOptionsCallback;
     }
 
-    disableAssetsLoaders() {
-        this.useAssetsLoaders = false;
+    disableImagesLoader() {
+        this.useImagesLoader = false;
+    }
+
+    disableFontsLoader() {
+        this.useFontsLoader = false;
     }
 
     cleanupOutputBeforeBuild() {

lib/config-generator.js

@@ -125,7 +125,7 @@ class ConfigGenerator {
             }
         ];
 
-        if (this.webpackConfig.useAssetsLoaders) {
+        if (this.webpackConfig.useImagesLoader) {
             rules.push({
                 test: /\.(png|jpg|jpeg|gif|ico|svg)$/,
                 loader: 'file-loader',
@@ -134,7 +134,9 @@ class ConfigGenerator {
                     publicPath: this.webpackConfig.getRealPublicPath()
                 }
             });
+        }
 
+        if (this.webpackConfig.useFontsLoader) {
             rules.push({
                 test: /\.(woff|woff2|ttf|eot|otf)$/,
                 loader: 'file-loader',

test/WebpackConfig.js

@@ -431,12 +431,21 @@ describe('WebpackConfig object', () => {
         });
     });
 
-    describe('disableAssetsLoaders', () => {
-        it('Disable default assets loaders', () => {
+    describe('disableImagesLoader', () => {
+        it('Disable default images loader', () => {
             const config = createConfig();
-            config.disableAssetsLoaders();
+            config.disableImagesLoader();
 
-            expect(config.useAssetsLoaders).to.be.false;
+            expect(config.useImagesLoader).to.be.false;
+        });
+    });
+
+    describe('disableFontsLoader', () => {
+        it('Disable default fonts loader', () => {
+            const config = createConfig();
+            config.disableFontsLoader();
+
+            expect(config.useFontsLoader).to.be.false;
         });
     });
 });

test/config-generator.js

@@ -417,33 +417,61 @@ describe('The config-generator function', () => {
         });
     });
 
-    describe('disableAssetsLoaders() removes the default assets loaders', () => {
-        it('without disableAssetsLoaders()', () => {
+    describe('disableImagesLoader() removes the default images loader', () => {
+        it('without disableImagesLoader()', () => {
             const config = createConfig();
             config.outputPath = '/tmp/output/public-path';
             config.publicPath = '/public-path';
             config.addEntry('main', './main');
-            // do not call disableAssetsLoaders
+            // do not call disableImagesLoader
 
             const actualConfig = configGenerator(config);
 
             expect(function() {
                 findRule(/\.(png|jpg|jpeg|gif|ico|svg)$/, actualConfig.module.rules);
-                findRule(/\.(woff|woff2|ttf|eot|otf)$/, actualConfig.module.rules);
             }).to.not.throw();
         });
 
-        it('with disableAssetsLoaders()', () => {
+        it('with disableImagesLoader()', () => {
             const config = createConfig();
             config.outputPath = '/tmp/output/public-path';
             config.publicPath = '/public-path';
             config.addEntry('main', './main');
-            config.disableAssetsLoaders();
+            config.disableImagesLoader();
 
             const actualConfig = configGenerator(config);
 
             expect(function() {
                 findRule(/\.(png|jpg|jpeg|gif|ico|svg)$/, actualConfig.module.rules);
+            }).to.throw();
+        });
+    });
+
+    describe('disableFontsLoader() removes the default fonts loader', () => {
+        it('without disableFontsLoader()', () => {
+            const config = createConfig();
+            config.outputPath = '/tmp/output/public-path';
+            config.publicPath = '/public-path';
+            config.addEntry('main', './main');
+            // do not call disableFontsLoader
+
+            const actualConfig = configGenerator(config);
+
+            expect(function() {
+                findRule(/\.(woff|woff2|ttf|eot|otf)$/, actualConfig.module.rules);
+            }).to.not.throw();
+        });
+
+        it('with disableFontsLoader()', () => {
+            const config = createConfig();
+            config.outputPath = '/tmp/output/public-path';
+            config.publicPath = '/public-path';
+            config.addEntry('main', './main');
+            config.disableFontsLoader();
+
+            const actualConfig = configGenerator(config);
+
+            expect(function() {
                 findRule(/\.(woff|woff2|ttf|eot|otf)$/, actualConfig.module.rules);
             }).to.throw();
         });

test/index.js

@@ -204,10 +204,19 @@ describe('Public API', () => {
 
     });
 
-    describe('disableAssetsLoaders', () => {
+    describe('disableImagesLoader', () => {
 
         it('must return the API object', () => {
-            const returnedValue = api.disableAssetsLoaders();
+            const returnedValue = api.disableImagesLoader();
+            expect(returnedValue).to.equal(api);
+        });
+
+    });
+
+    describe('disableFontsLoader', () => {
+
+        it('must return the API object', () => {
+            const returnedValue = api.disableFontsLoader();
             expect(returnedValue).to.equal(api);
         });