Resolve loaders directly from Encore instead of using their names

Author: Lyrkan

lib/config-generator.js

@@ -302,7 +302,7 @@ class ConfigGenerator {
 
             rules.push(applyRuleConfigurationCallback('images', {
                 test: /\.(png|jpg|jpeg|gif|ico|svg|webp)$/,
-                loader: loaderName,
+                loader: require.resolve(loaderName),
                 options: loaderOptions
             }));
         }
@@ -330,7 +330,7 @@ class ConfigGenerator {
 
             rules.push(applyRuleConfigurationCallback('fonts', {
                 test: /\.(woff|woff2|ttf|eot|otf)$/,
-                loader: loaderName,
+                loader: require.resolve(loaderName),
                 options: loaderOptions
             }));
         }
@@ -394,7 +394,7 @@ class ConfigGenerator {
         if (this.webpackConfig.useEslintLoader) {
             rules.push(applyRuleConfigurationCallback('eslint', {
                 test: eslintLoaderUtil.getTest(this.webpackConfig),
-                loader: 'eslint-loader',
+                loader: require.resolve('eslint-loader'),
                 exclude: /node_modules/,
                 enforce: 'pre',
                 options: eslintLoaderUtil.getOptions(this.webpackConfig)

lib/loaders/babel.js

@@ -98,7 +98,7 @@ module.exports = {
 
         return [
             {
-                loader: 'babel-loader',
+                loader: require.resolve('babel-loader'),
                 options: babelConfig
             }
         ];

lib/loaders/css-extract.js

@@ -29,7 +29,7 @@ module.exports = {
             // If the CSS extraction is disabled, use the
             // style-loader instead.
             return [{
-                loader: 'style-loader',
+                loader: require.resolve('style-loader'),
                 options: applyOptionsCallback(webpackConfig.styleLoaderConfigurationCallback, options)
 
             }, ...loaders];

lib/loaders/css.js

@@ -41,7 +41,7 @@ module.exports = {
 
         const cssLoaders = [
             {
-                loader: 'css-loader',
+                loader: require.resolve('css-loader'),
                 options: applyOptionsCallback(webpackConfig.cssLoaderConfigurationCallback, options)
             },
         ];
@@ -54,7 +54,7 @@ module.exports = {
             };
 
             cssLoaders.push({
-                loader: 'postcss-loader',
+                loader: require.resolve('postcss-loader'),
                 options: applyOptionsCallback(webpackConfig.postCssLoaderOptionsCallback, postCssLoaderOptions)
             });
         }

lib/loaders/handlebars.js

@@ -25,7 +25,7 @@ module.exports = {
 
         return [
             {
-                loader: 'handlebars-loader',
+                loader: require.resolve('handlebars-loader'),
                 options: applyOptionsCallback(webpackConfig.handlebarsConfigurationCallback, options)
             }
         ];

lib/loaders/less.js

@@ -30,7 +30,7 @@ module.exports = {
         return [
             ...cssLoader.getLoaders(webpackConfig, useCssModules),
             {
-                loader: 'less-loader',
+                loader: require.resolve('less-loader'),
                 options: applyOptionsCallback(webpackConfig.lessLoaderOptionsCallback, config)
             },
         ];

lib/loaders/sass.js

@@ -29,7 +29,7 @@ module.exports = {
             // without this, all url() paths must be relative to the
             // entry file, not the file that contains the url()
             sassLoaders.push({
-                loader: 'resolve-url-loader',
+                loader: require.resolve('resolve-url-loader'),
                 options: Object.assign(
                     {
                         sourceMap: webpackConfig.useSourceMaps
@@ -47,7 +47,7 @@ module.exports = {
         });
 
         sassLoaders.push({
-            loader: 'sass-loader',
+            loader: require.resolve('sass-loader'),
             options: applyOptionsCallback(webpackConfig.sassLoaderOptionsCallback, config)
         });
 

lib/loaders/stylus.js

@@ -30,7 +30,7 @@ module.exports = {
         return [
             ...cssLoader.getLoaders(webpackConfig, useCssModules),
             {
-                loader: 'stylus-loader',
+                loader: require.resolve('stylus-loader'),
                 options: applyOptionsCallback(webpackConfig.stylusLoaderOptionsCallback, config)
             },
         ];

lib/loaders/typescript.js

@@ -51,7 +51,7 @@ module.exports = {
         let loaders = babelLoader.getLoaders(webpackConfig);
         return loaders.concat([
             {
-                loader: 'ts-loader',
+                loader: require.resolve('ts-loader'),
                 // @see https://github.com/TypeStrong/ts-loader/blob/master/README.md#available-options
                 options: config
             }

lib/loaders/vue.js

@@ -25,7 +25,7 @@ module.exports = {
 
         return [
             {
-                loader: 'vue-loader',
+                loader: require.resolve('vue-loader'),
                 options: applyOptionsCallback(webpackConfig.vueLoaderOptionsCallback, options)
             }
         ];