From e7d0ef93cb3904c56d5c86134fa07b3d1efe3847 Mon Sep 17 00:00:00 2001
From: Andrew Luca <aluca@winify.com>
Date: Tue, 6 Aug 2019 06:28:09 +0300
Subject: [PATCH] Resolve relative paths for preprocessor styles (#5829)

preprocessor will output sourceMap by default
then check if sourceMaps are needed on resolve-url-loader

Fixes #4653
---
 config/webpack.config.js | 18 +++++++++++++-----
 package.json             |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 7ecb8a2a683..69aa3342770 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -124,12 +124,20 @@ module.exports = function(webpackEnv) {
       },
     ].filter(Boolean);
     if (preProcessor) {
-      loaders.push({
-        loader: require.resolve(preProcessor),
-        options: {
-          sourceMap: isEnvProduction && shouldUseSourceMap,
+      loaders.push(
+        {
+          loader: require.resolve('resolve-url-loader'),
+          options: {
+            sourceMap: isEnvProduction && shouldUseSourceMap,
+          },
         },
-      });
+        {
+          loader: require.resolve(preProcessor),
+          options: {
+            sourceMap: true,
+          },
+        }
+      );
     }
     return loaders;
   };
diff --git a/package.json b/package.json
index 269a93ddf5e..b6a1421dc62 100644
--- a/package.json
+++ b/package.json
@@ -70,6 +70,7 @@
     "react-app-polyfill": "^1.0.1",
     "react-dev-utils": "^9.0.1",
     "resolve": "1.10.0",
+    "resolve-url-loader": "3.0.1",
     "sass-loader": "7.1.0",
     "semver": "6.0.0",
     "style-loader": "0.23.1",