Replace duplicated 'options callback' logic by an utility method

Author: Lyrkan

lib/config-generator.js

@@ -200,7 +200,7 @@ class ConfigGenerator {
         if (this.webpackConfig.useVueLoader) {
             rules.push({
                 test: /\.vue$/,
-                use: vueLoaderUtil.getLoaders(this.webpackConfig, this.webpackConfig.vueLoaderOptionsCallback)
+                use: vueLoaderUtil.getLoaders(this.webpackConfig)
             });
         }
 

lib/loaders/babel.js

@@ -10,6 +10,7 @@
 'use strict';
 
 const loaderFeatures = require('../features');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -67,16 +68,7 @@ module.exports = {
                 }
             }
 
-            // allow for babel config to be controlled
-            const callbackResult = webpackConfig.babelConfigurationCallback.apply(
-                // use babelConfig as the this variable
-                babelConfig,
-                [babelConfig]
-            );
-
-            if (callbackResult instanceof Object) {
-                babelConfig = callbackResult;
-            }
+            babelConfig = applyOptionsCallback(webpackConfig.babelConfigurationCallback, babelConfig);
         }
 
         return [

lib/loaders/coffee-script.js

@@ -10,6 +10,7 @@
 'use strict';
 
 const loaderFeatures = require('../features');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -19,27 +20,17 @@ module.exports = {
     getLoaders(webpackConfig) {
         loaderFeatures.ensurePackagesExist('coffeescript');
 
-        let options = {
+        const options = {
             sourceMap: webpackConfig.useSourceMaps,
             transpile: {
                 presets: ['env']
             }
         };
 
-        // allow options to be configured
-        const callbackResult = webpackConfig.coffeeScriptConfigurationCallback.apply(
-            options,
-            [options]
-        );
-
-        if (callbackResult instanceof Object) {
-            options = callbackResult;
-        }
-
         return [
             {
                 loader: 'coffee-loader',
-                options: options,
+                options: applyOptionsCallback(webpackConfig.coffeeScriptConfigurationCallback, options)
             },
         ];
     }

lib/loaders/css.js

@@ -10,6 +10,7 @@
 'use strict';
 
 const loaderFeatures = require('../features');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -38,24 +39,13 @@ module.exports = {
         if (usePostCssLoader) {
             loaderFeatures.ensurePackagesExist('postcss');
 
-            let postCssLoaderOptions = {
+            const postCssLoaderOptions = {
                 sourceMap: webpackConfig.useSourceMaps
             };
 
-            // allow options to be configured
-            const callbackResult = webpackConfig.postCssLoaderOptionsCallback.apply(
-                // use config as the this variable
-                postCssLoaderOptions,
-                [postCssLoaderOptions]
-            );
-
-            if (callbackResult instanceof Object) {
-                postCssLoaderOptions = callbackResult;
-            }
-
             cssLoaders.push({
                 loader: 'postcss-loader',
-                options: postCssLoaderOptions
+                options: applyOptionsCallback(webpackConfig.postCssLoaderOptionsCallback, postCssLoaderOptions)
             });
         }
 

lib/loaders/less.js

@@ -11,6 +11,7 @@
 
 const loaderFeatures = require('../features');
 const cssLoader = require('./css');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -21,26 +22,15 @@ module.exports = {
     getLoaders(webpackConfig, ignorePostCssLoader = false) {
         loaderFeatures.ensurePackagesExist('less');
 
-        let config = {
+        const config = {
             sourceMap: webpackConfig.useSourceMaps
         };
 
-        // allow options to be configured
-        const callbackResult = webpackConfig.lessLoaderOptionsCallback.apply(
-            // use config as the this variable
-            config,
-            [config]
-        );
-
-        if (callbackResult instanceof Object) {
-            config = callbackResult;
-        }
-
         return [
             ...cssLoader.getLoaders(webpackConfig, ignorePostCssLoader),
             {
                 loader: 'less-loader',
-                options: config
+                options: applyOptionsCallback(webpackConfig.lessLoaderOptionsCallback, config)
             },
         ];
     }

lib/loaders/sass.js

@@ -11,6 +11,7 @@
 
 const loaderFeatures = require('../features');
 const cssLoader = require('./css');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -35,25 +36,14 @@ module.exports = {
             });
         }
 
-        let config = Object.assign({}, sassOptions, {
+        const config = Object.assign({}, sassOptions, {
             // needed by the resolve-url-loader
             sourceMap: (true === webpackConfig.sassOptions.resolveUrlLoader) || webpackConfig.useSourceMaps
         });
 
-        // allow options to be configured
-        const callbackResult = webpackConfig.sassLoaderOptionsCallback.apply(
-            // use config as the this variable
-            config,
-            [config]
-        );
-
-        if (callbackResult instanceof Object) {
-            config = callbackResult;
-        }
-
         sassLoaders.push({
             loader: 'sass-loader',
-            options: config,
+            options: applyOptionsCallback(webpackConfig.sassLoaderOptionsCallback, config)
         });
 
         return sassLoaders;

lib/loaders/stylus.js

@@ -11,6 +11,7 @@
 
 const loaderFeatures = require('../features');
 const cssLoader = require('./css');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -21,26 +22,15 @@ module.exports = {
     getLoaders(webpackConfig, ignorePostCssLoader = false) {
         loaderFeatures.ensurePackagesExist('stylus');
 
-        let config = {
+        const config = {
             sourceMap: webpackConfig.useSourceMaps
         };
 
-        // allow options to be configured
-        const callbackResult = webpackConfig.stylusLoaderOptionsCallback.apply(
-            // use config as the this variable
-            config,
-            [config]
-        );
-
-        if (callbackResult instanceof Object) {
-            config = callbackResult;
-        }
-
         return [
             ...cssLoader.getLoaders(webpackConfig, ignorePostCssLoader),
             {
                 loader: 'stylus-loader',
-                options: config
+                options: applyOptionsCallback(webpackConfig.stylusLoaderOptionsCallback, config)
             },
         ];
     }

lib/loaders/typescript.js

@@ -11,6 +11,7 @@
 
 const loaderFeatures = require('../features');
 const babelLoader = require('./babel');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
@@ -26,15 +27,7 @@ module.exports = {
         };
 
         // allow for ts-loader config to be controlled
-        const callbackResult = webpackConfig.tsConfigurationCallback.apply(
-            // use config as the this variable
-            config,
-            [config]
-        );
-
-        if (callbackResult instanceof Object) {
-            config = callbackResult;
-        }
+        config = applyOptionsCallback(webpackConfig.tsConfigurationCallback, config);
 
         // fork-ts-checker-webpack-plugin integration
         if (webpackConfig.useForkedTypeScriptTypeChecking) {

lib/loaders/vue.js

@@ -15,14 +15,14 @@ const sassLoaderUtil = require('./sass');
 const lessLoaderUtil = require('./less');
 const babelLoaderUtil = require('./babel');
 const extractText = require('./extract-text');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {WebpackConfig} webpackConfig
- * @param {function} vueLoaderOptionsCallback
  * @return {Array} of loaders to use for Vue files
  */
 module.exports = {
-    getLoaders(webpackConfig, vueLoaderOptionsCallback) {
+    getLoaders(webpackConfig) {
         loaderFeatures.ensurePackagesExist('vue');
 
         /*
@@ -117,21 +117,14 @@ module.exports = {
             };
         }
 
-        let options = {
+        const options = {
             loaders: loaders
         };
 
-        // allow the options to be mutated via a callback
-        const callbackResult = vueLoaderOptionsCallback(options);
-
-        if (callbackResult instanceof Object) {
-            options = callbackResult;
-        }
-
         return [
             {
                 loader: 'vue-loader',
-                options: options
+                options: applyOptionsCallback(webpackConfig.vueLoaderOptionsCallback, options)
             }
         ];
     }

lib/plugins/clean.js

@@ -11,6 +11,7 @@
 
 const CleanWebpackPlugin = require('clean-webpack-plugin');
 const PluginPriorities = require('./plugin-priorities');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * Updates plugins array passed adding CleanWebpackPlugin instance
@@ -25,24 +26,15 @@ module.exports = function(plugins, webpackConfig) {
         return;
     }
 
-    let cleanWebpackPluginOptions = {
+    const cleanWebpackPluginOptions = {
         root: webpackConfig.outputPath,
         verbose: false,
     };
 
-    const callbackResult = webpackConfig.cleanWebpackPluginOptionsCallback.apply(
-        cleanWebpackPluginOptions,
-        [cleanWebpackPluginOptions]
-    );
-
-    if (callbackResult instanceof Object) {
-        cleanWebpackPluginOptions = callbackResult;
-    }
-
     plugins.push({
         plugin: new CleanWebpackPlugin(
             webpackConfig.cleanWebpackPluginPaths,
-            cleanWebpackPluginOptions
+            applyOptionsCallback(webpackConfig.cleanWebpackPluginOptionsCallback, cleanWebpackPluginOptions)
         ),
         priority: PluginPriorities.CleanWebpackPlugin
     });

lib/plugins/define.js

@@ -11,30 +11,24 @@
 
 const webpack = require('webpack');
 const PluginPriorities = require('./plugin-priorities');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {Array} plugins
  * @param {WebpackConfig} webpackConfig
  * @return {void}
  */
 module.exports = function(plugins, webpackConfig) {
-    let definePluginOptions = {
+    const definePluginOptions = {
         'process.env': {
             NODE_ENV: webpackConfig.isProduction() ? '"production"' : '"development"'
         }
     };
 
-    const callbackResult = webpackConfig.definePluginOptionsCallback.apply(
-        definePluginOptions,
-        [definePluginOptions]
-    );
-
-    if (callbackResult instanceof Object) {
-        definePluginOptions = callbackResult;
-    }
-
     plugins.push({
-        plugin: new webpack.DefinePlugin(definePluginOptions),
+        plugin: new webpack.DefinePlugin(
+            applyOptionsCallback(webpackConfig.definePluginOptionsCallback, definePluginOptions)
+        ),
         priority: PluginPriorities.DefinePlugin
     });
 };

lib/plugins/extract-text.js

@@ -11,6 +11,7 @@
 
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const PluginPriorities = require('./plugin-priorities');
+const applyOptionsCallback = require('../utils/apply-options-callback');
 
 /**
  * @param {Array} plugins
@@ -37,25 +38,18 @@ module.exports = function(plugins, webpackConfig) {
         filename = webpackConfig.configuredFilenames.css;
     }
 
-    let extractTextPluginOptions = {
+    const extractTextPluginOptions = {
         filename: filename,
         // if true, async CSS (e.g. loaded via require.ensure())
         // is extracted to the entry point CSS. If false, it's
         // inlined in the AJAX-loaded .js file.
         allChunks: false
     };
 
-    const callbackResult = webpackConfig.extractTextPluginOptionsCallback.apply(
-        extractTextPluginOptions,
-        [extractTextPluginOptions]
-    );
-
-    if (callbackResult instanceof Object) {
-        extractTextPluginOptions = callbackResult;
-    }
-
     plugins.push({
-        plugin: new ExtractTextPlugin(extractTextPluginOptions),
+        plugin: new ExtractTextPlugin(
+            applyOptionsCallback(webpackConfig.extractTextPluginOptionsCallback, extractTextPluginOptions)
+        ),
         priority: PluginPriorities.ExtractTextWebpackPlugin
     });
 };