Replace sass option 'resolve_url_loader' by 'resolveUrlLoader'

Author: Lyrkan

index.js

@@ -331,11 +331,11 @@ const publicApi = {
      *         // options.includePaths = [...]
      *     }, {
      *         // set optional Encore-specific options
-     *         // resolve_url_loader: true
+     *         // resolveUrlLoader: true
      *     });
      *
      * Supported options:
-     *      * {bool} resolve_url_loader (default=true)
+     *      * {bool} resolveUrlLoader (default=true)
      *              Whether or not to use the resolve-url-loader.
      *              Setting to false can increase performance in some
      *              cases, especially when using bootstrap_sass. But,

lib/WebpackConfig.js

@@ -45,7 +45,7 @@ class WebpackConfig {
         this.useSassLoader = false;
         this.sassLoaderOptionsCallback = function() {};
         this.sassOptions = {
-            resolve_url_loader: true
+            resolveUrlLoader: true
         };
         this.useLessLoader = false;
         this.lessLoaderOptionsCallback = function() {};
@@ -251,11 +251,17 @@ class WebpackConfig {
         this.sassLoaderOptionsCallback = sassLoaderOptionsCallback;
 
         for (const optionKey of Object.keys(options)) {
-            if (!(optionKey in this.sassOptions)) {
-                throw new Error(`Invalid option "${optionKey}" passed to enableSassLoader(). Valid keys are ${Object.keys(this.sassOptions).join(', ')}`);
+            let normalizedOptionKey = optionKey;
+            if (optionKey === 'resolve_url_loader') {
+                logger.warning('enableSassLoader: "resolve_url_loader" is deprecated. Please use "resolveUrlLoader" instead.');
+                normalizedOptionKey = 'resolveUrlLoader';
             }
 
-            this.sassOptions[optionKey] = options[optionKey];
+            if (!(normalizedOptionKey in this.sassOptions)) {
+                throw new Error(`Invalid option "${normalizedOptionKey}" passed to enableSassLoader(). Valid keys are ${Object.keys(this.sassOptions).join(', ')}`);
+            }
+
+            this.sassOptions[normalizedOptionKey] = options[optionKey];
         }
     }
 

lib/loaders/sass.js

@@ -23,7 +23,7 @@ module.exports = {
         loaderFeatures.ensurePackagesExist('sass');
 
         const sassLoaders = [...cssLoader.getLoaders(webpackConfig, ignorePostCssLoader)];
-        if (true === webpackConfig.sassOptions.resolve_url_loader) {
+        if (true === webpackConfig.sassOptions.resolveUrlLoader) {
             // responsible for resolving SASS url() paths
             // without this, all url() paths must be relative to the
             // entry file, not the file that contains the url()
@@ -37,7 +37,7 @@ module.exports = {
 
         let config = Object.assign({}, sassOptions, {
             // needed by the resolve-url-loader
-            sourceMap: (true === webpackConfig.sassOptions.resolve_url_loader) || webpackConfig.useSourceMaps
+            sourceMap: (true === webpackConfig.sassOptions.resolveUrlLoader) || webpackConfig.useSourceMaps
         });
 
         // allow options to be configured

test/WebpackConfig.js

@@ -346,10 +346,10 @@ describe('WebpackConfig object', () => {
 
         it('Pass valid config', () => {
             const config = createConfig();
-            config.enableSassLoader(() => {}, { resolve_url_loader: false });
+            config.enableSassLoader(() => {}, { resolveUrlLoader: false });
 
             expect(config.useSassLoader).to.be.true;
-            expect(config.sassOptions.resolve_url_loader).to.be.false;
+            expect(config.sassOptions.resolveUrlLoader).to.be.false;
         });
 
         it('Pass invalid config', () => {

test/loaders/sass.js

@@ -67,7 +67,7 @@ describe('loaders/sass', () => {
     it('getLoaders() without resolve-url-loader', () => {
         const config = createConfig();
         config.enableSassLoader(() => {}, {
-            resolve_url_loader: false,
+            resolveUrlLoader: false,
         });
         config.enableSourceMaps(false);