sass-loader 13.3.0 → 13.3.1

package/dist/index.js

@@ -8,7 +8,6 @@ var _url = _interopRequireDefault(require("url"));
 var _path = _interopRequireDefault(require("path"));
 var _options = _interopRequireDefault(require("./options.json"));
 var _utils = require("./utils");
-var _SassError = _interopRequireDefault(require("./SassError"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  * The sass-loader makes node-sass and dart-sass available to webpack modules.
@@ -19,9 +18,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 async function loader(content) {
   const options = this.getOptions(_options.default);
   const callback = this.async();
-  const implementation = (0, _utils.getSassImplementation)(this, options.implementation);
-  if (!implementation) {
-    callback();
+  let implementation;
+  try {
+    implementation = (0, _utils.getSassImplementation)(this, options.implementation);
+  } catch (error) {
+    callback(error);
     return;
   }
   const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
@@ -38,7 +39,13 @@ async function loader(content) {
       sassOptions.importers.push((0, _utils.getModernWebpackImporter)(this, implementation));
     }
   }
-  const compile = (0, _utils.getCompileFn)(implementation, options);
+  let compile;
+  try {
+    compile = (0, _utils.getCompileFn)(implementation, options);
+  } catch (error) {
+    callback(error);
+    return;
+  }
   let result;
   try {
     result = await compile(sassOptions, options);
@@ -53,7 +60,7 @@ async function loader(content) {
       // `node-sass` returns POSIX paths
       this.addDependency(_path.default.normalize(error.file));
     }
-    callback(new _SassError.default(error));
+    callback((0, _utils.errorFactory)(error));
     return;
   }
   let map =

package/dist/utils.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.errorFactory = errorFactory;
 exports.getCompileFn = getCompileFn;
 exports.getModernWebpackImporter = getModernWebpackImporter;
 exports.getSassImplementation = getSassImplementation;
@@ -15,7 +16,6 @@ var _url = _interopRequireDefault(require("url"));
 var _path = _interopRequireDefault(require("path"));
 var _full = require("klona/full");
 var _neoAsync = _interopRequireDefault(require("neo-async"));
-var _SassWarning = _interopRequireDefault(require("./SassWarning"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getDefaultSassImplementation() {
   let sassImplPkg = "sass";
@@ -45,35 +45,21 @@ function getDefaultSassImplementation() {
 function getSassImplementation(loaderContext, implementation) {
   let resolvedImplementation = implementation;
   if (!resolvedImplementation) {
-    try {
-      resolvedImplementation = getDefaultSassImplementation();
-    } catch (error) {
-      loaderContext.emitError(error);
-      return;
-    }
+    resolvedImplementation = getDefaultSassImplementation();
   }
   if (typeof resolvedImplementation === "string") {
-    try {
-      // eslint-disable-next-line import/no-dynamic-require, global-require
-      resolvedImplementation = require(resolvedImplementation);
-    } catch (error) {
-      loaderContext.emitError(error);
-
-      // eslint-disable-next-line consistent-return
-      return;
-    }
+    // eslint-disable-next-line import/no-dynamic-require, global-require
+    resolvedImplementation = require(resolvedImplementation);
   }
   const {
     info
   } = resolvedImplementation;
   if (!info) {
-    loaderContext.emitError(new Error("Unknown Sass implementation."));
-    return;
+    throw new Error("Unknown Sass implementation.");
   }
   const infoParts = info.split("\t");
   if (infoParts.length < 2) {
-    loaderContext.emitError(new Error(`Unknown Sass implementation "${info}".`));
-    return;
+    throw new Error(`Unknown Sass implementation "${info}".`);
   }
   const [implementationName] = infoParts;
   if (implementationName === "dart-sass") {
@@ -86,7 +72,7 @@ function getSassImplementation(loaderContext, implementation) {
     // eslint-disable-next-line consistent-return
     return resolvedImplementation;
   }
-  loaderContext.emitError(new Error(`Unknown Sass implementation "${implementationName}".`));
+  throw new Error(`Unknown Sass implementation "${implementationName}".`);
 }
 
 /**
@@ -152,7 +138,10 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
           builtMessage += `\n\n${loggerOptions.stack}`;
         }
         if (needEmitWarning) {
-          loaderContext.emitWarning(new _SassWarning.default(builtMessage, loggerOptions));
+          const warning = new Error(builtMessage);
+          warning.name = "SassWarning";
+          warning.stack = null;
+          loaderContext.emitWarning(warning);
         } else {
           logger.warn(builtMessage);
         }
@@ -623,4 +612,20 @@ function normalizeSourceMap(map, rootContext) {
     return source;
   });
   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;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "13.3.0",
+  "version": "13.3.1",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",

package/dist/SassError.js

@@ -1,31 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-class SassError extends Error {
-  constructor(sassError) {
-    super();
-    this.name = "SassError";
-
-    // Instruct webpack to hide the JS stack from the console.
-    // Usually you're only interested in the SASS error in this case.
-    this.hideStack = true;
-    Error.captureStackTrace(this, this.constructor);
-    if (typeof sassError.line !== "undefined" || typeof sassError.column !== "undefined") {
-      this.loc = {
-        line: sassError.line,
-        column: sassError.column
-      };
-    }
-
-    // Keep original error if `sassError.formatted` is unavailable
-    this.message = `${this.name}: ${typeof sassError.message !== "undefined" ? sassError.message : sassError}`;
-    if (sassError.formatted) {
-      this.message = `${this.name}: ${sassError.formatted.replace(/^Error: /, "")}`;
-    }
-  }
-}
-var _default = SassError;
-exports.default = _default;

package/dist/SassWarning.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-class SassWarning extends Error {
-  constructor(warning, options) {
-    super(warning);
-    this.name = "SassWarning";
-    this.hideStack = true;
-    if (options.span) {
-      this.loc = {
-        line: options.span.start.line,
-        column: options.span.start.column
-      };
-    }
-  }
-}
-var _default = SassWarning;
-exports.default = _default;