From a808dc9057675eb92cfe32a59090e48a5d548e34 Mon Sep 17 00:00:00 2001
From: Andrew Luca <aluca@winify.com>
Date: Fri, 16 Nov 2018 11:34:41 +0200
Subject: [PATCH] Resolve relative paths for preprocessor styles

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

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

diff --git a/packages/react-scripts/config/webpack.config.js b/packages/react-scripts/config/webpack.config.js
index 771b06c94d1..7d61006cdc6 100644
--- a/packages/react-scripts/config/webpack.config.js
+++ b/packages/react-scripts/config/webpack.config.js
@@ -121,12 +121,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/packages/react-scripts/package.json b/packages/react-scripts/package.json
index af92d8ab28b..d657d392986 100644
--- a/packages/react-scripts/package.json
+++ b/packages/react-scripts/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",