fix: warnings and errors serialization (#1142)

webpack-contrib · May 28, 2023 · ed6f313 · ed6f313
1 parent 1f99474
commit ed6f313
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 100 deletions.
diff --git a/src/SassError.js b/src/SassError.js
diff --git a/src/SassWarning.js b/src/SassWarning.js
diff --git a/src/index.js b/src/index.js
@@ -9,8 +9,8 @@ import {
   getModernWebpackImporter,
   getCompileFn,
   normalizeSourceMap,
+  errorFactory,
 } from "./utils";
-import SassError from "./SassError";
 
 /**
  * The sass-loader makes node-sass and dart-sass available to webpack modules.
@@ -87,7 +87,7 @@ async function loader(content) {
       this.addDependency(path.normalize(error.file));
     }
 
-    callback(new SassError(error));
+    callback(errorFactory(error));
 
     return;
   }

diff --git a/src/utils.js b/src/utils.js
@@ -4,8 +4,6 @@ import path from "path";
 import { klona } from "klona/full";
 import async from "neo-async";
 
-import SassWarning from "./SassWarning";
-
 function getDefaultSassImplementation() {
   let sassImplPkg = "sass";
 
@@ -169,9 +167,12 @@ async function getSassOptions(
         }
 
         if (needEmitWarning) {
-          loaderContext.emitWarning(
-            new SassWarning(builtMessage, loggerOptions)
-          );
+          const warning = new Error(builtMessage);
+
+          warning.name = "SassWarning";
+          warning.stack = null;
+
+          loaderContext.emitWarning(warning);
         } else {
           logger.warn(builtMessage);
         }
@@ -781,6 +782,23 @@ function normalizeSourceMap(map, rootContext) {
   return newMap;
 }
 
+function errorFactory(error) {
+  let message;
+
+  if (error.formatted) {
+    message = error.formatted.replace(/^Error: /, "");
+  } else {
+    // Keep original error if `sassError.formatted` is unavailable
+    ({ message } = error);
+  }
+
+  const obj = new Error(message, { cause: error });
+
+  obj.stack = null;
+
+  return obj;
+}
+
 export {
   getSassImplementation,
   getSassOptions,
@@ -790,4 +808,5 @@ export {
   getCompileFn,
   normalizeSourceMap,
   isSupportedFibers,
+  errorFactory,
 };