sass-loader 10.4.1 → 10.5.0

package/dist/SassError.js

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

package/dist/cjs.js

@@ -1,5 +1,4 @@
 "use strict";
 
 const loader = require("./index");
-
 module.exports = loader.default;

package/dist/index.js

@@ -4,21 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _schemaUtils = require("schema-utils");
-
 var _loaderUtils = require("loader-utils");
-
 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.
  *
@@ -33,23 +25,19 @@ async function loader(content) {
   });
   const callback = this.async();
   const implementation = (0, _utils.getSassImplementation)(this, options.implementation);
-
   if (!implementation) {
     callback();
     return;
   }
-
   const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
   const sassOptions = await (0, _utils.getSassOptions)(this, options, content, implementation, useSourceMap);
   const shouldUseWebpackImporter = typeof options.webpackImporter === "boolean" ? options.webpackImporter : true;
-
   if (shouldUseWebpackImporter) {
     const {
       includePaths
     } = sassOptions;
     sassOptions.importer.push((0, _utils.getWebpackImporter)(this, implementation, includePaths));
   }
-
   const render = (0, _utils.getRenderFunctionFromSassImplementation)(implementation);
   render(sassOptions, (error, result) => {
     if (error) {
@@ -58,21 +46,19 @@ async function loader(content) {
         // `node-sass` returns POSIX paths
         this.addDependency(_path.default.normalize(error.file));
       }
-
       callback(new _SassError.default(error));
       return;
     }
+    let map = result.map ? JSON.parse(result.map) : null;
 
-    let map = result.map ? JSON.parse(result.map) : null; // Modify source paths only for webpack, otherwise we do nothing
-
+    // Modify source paths only for webpack, otherwise we do nothing
     if (map && useSourceMap) {
       map = (0, _utils.normalizeSourceMap)(map, this.rootContext);
     }
-
     result.stats.includedFiles.forEach(includedFile => {
-      const normalizedIncludedFile = _path.default.normalize(includedFile); // Custom `importer` can return only `contents` so includedFile will be relative
-
+      const normalizedIncludedFile = _path.default.normalize(includedFile);
 
+      // Custom `importer` can return only `contents` so includedFile will be relative
       if (_path.default.isAbsolute(normalizedIncludedFile)) {
         this.addDependency(normalizedIncludedFile);
       }
@@ -80,6 +66,5 @@ async function loader(content) {
     callback(null, result.css.toString(), map);
   });
 }
-
 var _default = loader;
 exports.default = _default;

package/dist/utils.js

@@ -10,49 +10,37 @@ exports.getWebpackImporter = getWebpackImporter;
 exports.getWebpackResolver = getWebpackResolver;
 exports.isSupportedFibers = isSupportedFibers;
 exports.normalizeSourceMap = normalizeSourceMap;
-
 var _url = _interopRequireDefault(require("url"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _semver = _interopRequireDefault(require("semver"));
-
 var _full = require("klona/full");
-
 var _loaderUtils = require("loader-utils");
-
 var _neoAsync = _interopRequireDefault(require("neo-async"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function getDefaultSassImplementation() {
   let sassImplPkg = "sass";
-
   try {
     require.resolve("sass");
   } catch (error) {
     try {
       require.resolve("node-sass");
-
       sassImplPkg = "node-sass";
     } catch (ignoreError) {
       sassImplPkg = "sass";
     }
-  } // eslint-disable-next-line import/no-dynamic-require, global-require
-
+  }
 
+  // eslint-disable-next-line import/no-dynamic-require, global-require
   return require(sassImplPkg);
 }
+
 /**
  * @public
  * This function is not Webpack-specific and can be used by tools wishing to
  * mimic `sass-loader`'s behaviour, so its signature should not be changed.
  */
-
-
 function getSassImplementation(loaderContext, implementation) {
   let resolvedImplementation = implementation;
-
   if (!resolvedImplementation) {
     try {
       resolvedImplementation = getDefaultSassImplementation();
@@ -61,59 +49,53 @@ function getSassImplementation(loaderContext, implementation) {
       return;
     }
   }
-
   const {
     info
   } = resolvedImplementation;
-
   if (!info) {
     loaderContext.emitError(new Error("Unknown Sass implementation."));
     return;
   }
-
   const infoParts = info.split("\t");
-
   if (infoParts.length < 2) {
     loaderContext.emitError(new Error(`Unknown Sass implementation "${info}".`));
     return;
   }
-
   const [implementationName, version] = infoParts;
-
   if (implementationName === "dart-sass") {
     if (!_semver.default.satisfies(version, "^1.3.0")) {
       loaderContext.emitError(new Error(`Dart Sass version ${version} is incompatible with ^1.3.0.`));
-    } // eslint-disable-next-line consistent-return
-
+    }
 
+    // eslint-disable-next-line consistent-return
     return resolvedImplementation;
   } else if (implementationName === "node-sass") {
     if (!_semver.default.satisfies(version, "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0")) {
       loaderContext.emitError(new Error(`Node Sass version ${version} is incompatible with ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0.`));
-    } // eslint-disable-next-line consistent-return
-
+    }
 
+    // eslint-disable-next-line consistent-return
+    return resolvedImplementation;
+  } else if (implementationName === "sass-embedded") {
+    // eslint-disable-next-line consistent-return
     return resolvedImplementation;
   }
-
   loaderContext.emitError(new Error(`Unknown Sass implementation "${implementationName}".`));
 }
-
 function isSupportedFibers() {
   const [nodeVersion] = process.versions.node.split(".");
   return Number(nodeVersion) < 16;
 }
-
 function isProductionLikeMode(loaderContext) {
   return loaderContext.mode === "production" || !loaderContext.mode;
 }
-
 function proxyCustomImporters(importers, loaderContext) {
   return [].concat(importers).map(importer => function proxyImporter(...args) {
     this.webpackLoaderContext = loaderContext;
     return importer.apply(this, args);
   });
 }
+
 /**
  * Derives the sass options from the loader context and normalizes its values with sane defaults.
  *
@@ -124,23 +106,18 @@ function proxyCustomImporters(importers, loaderContext) {
  * @param {boolean} useSourceMap
  * @returns {Object}
  */
-
-
 async function getSassOptions(loaderContext, loaderOptions, content, implementation, useSourceMap) {
   const options = (0, _full.klona)(loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === "function" ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {});
   const isDartSass = implementation.info.includes("dart-sass");
-
   if (isDartSass && isSupportedFibers()) {
     const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
-
     if (shouldTryToResolveFibers) {
       let fibers;
-
       try {
         fibers = require.resolve("fibers");
-      } catch (_error) {// Nothing
+      } catch (_error) {
+        // Nothing
       }
-
       if (fibers) {
         // eslint-disable-next-line global-require, import/no-dynamic-require
         options.fiber = require(fibers);
@@ -153,14 +130,13 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
     // Don't pass the `fiber` option for `node-sass`
     delete options.fiber;
   }
-
   options.file = loaderContext.resourcePath;
-  options.data = loaderOptions.additionalData ? typeof loaderOptions.additionalData === "function" ? await loaderOptions.additionalData(content, loaderContext) : `${loaderOptions.additionalData}\n${content}` : content; // opt.outputStyle
+  options.data = loaderOptions.additionalData ? typeof loaderOptions.additionalData === "function" ? await loaderOptions.additionalData(content, loaderContext) : `${loaderOptions.additionalData}\n${content}` : content;
 
+  // opt.outputStyle
   if (!options.outputStyle && isProductionLikeMode(loaderContext)) {
     options.outputStyle = "compressed";
   }
-
   if (useSourceMap) {
     // Deliberately overriding the sourceMap option here.
     // node-sass won't produce source maps if the data option is used and options.sourceMap is not a string.
@@ -174,35 +150,35 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
     options.omitSourceMapUrl = true;
     options.sourceMapEmbed = false;
   }
-
   const {
     resourcePath
   } = loaderContext;
+  const ext = _path.default.extname(resourcePath);
 
-  const ext = _path.default.extname(resourcePath); // If we are compiling sass and indentedSyntax isn't set, automatically set it.
-
-
+  // If we are compiling sass and indentedSyntax isn't set, automatically set it.
   if (ext && ext.toLowerCase() === ".sass" && typeof options.indentedSyntax === "undefined") {
     options.indentedSyntax = true;
   } else {
     options.indentedSyntax = Boolean(options.indentedSyntax);
-  } // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
-
+  }
 
+  // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
   options.importer = options.importer ? proxyCustomImporters(Array.isArray(options.importer) ? options.importer : [options.importer], loaderContext) : [];
-  options.includePaths = [].concat(process.cwd()).concat( // We use `includePaths` in context for resolver, so it should be always absolute
+  options.includePaths = [].concat(process.cwd()).concat(
+  // We use `includePaths` in context for resolver, so it should be always absolute
   (options.includePaths || []).map(includePath => _path.default.isAbsolute(includePath) ? includePath : _path.default.join(process.cwd(), includePath))).concat(process.env.SASS_PATH ? process.env.SASS_PATH.split(process.platform === "win32" ? ";" : ":") : []);
   return options;
-} // Examples:
+}
+
+// Examples:
 // - ~package
 // - ~package/
 // - ~@org
 // - ~@org/
 // - ~@org/package
 // - ~@org/package/
-
-
 const isModuleImport = /^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+\/)$/;
+
 /**
  * When `sass`/`node-sass` tries to resolve an import, it uses a special algorithm.
  * Since the `sass-loader` uses webpack to resolve the modules, we need to simulate that algorithm.
@@ -217,19 +193,23 @@ const isModuleImport = /^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+
  * @param {string} rootContext
  * @returns {Array<string>}
  */
-
-function getPossibleRequests( // eslint-disable-next-line no-shadow
+function getPossibleRequests(
+// eslint-disable-next-line no-shadow
 url, forWebpackResolver = false, rootContext = false) {
-  const request = (0, _loaderUtils.urlToRequest)(url, // Maybe it is server-relative URLs
-  forWebpackResolver && rootContext); // In case there is module request, send this to webpack resolver
+  const request = (0, _loaderUtils.urlToRequest)(url,
+  // Maybe it is server-relative URLs
+  forWebpackResolver && rootContext);
 
+  // In case there is module request, send this to webpack resolver
   if (forWebpackResolver && isModuleImport.test(url)) {
     return [...new Set([request, url])];
-  } // Keep in mind: ext can also be something like '.datepicker' when the true extension is omitted and the filename contains a dot.
-  // @see https://github.com/webpack-contrib/sass-loader/issues/167
+  }
 
+  // Keep in mind: ext can also be something like '.datepicker' when the true extension is omitted and the filename contains a dot.
+  // @see https://github.com/webpack-contrib/sass-loader/issues/167
+  const ext = _path.default.extname(request).toLowerCase();
 
-  const ext = _path.default.extname(request).toLowerCase(); // Because @import is also defined in CSS, Sass needs a way of compiling plain CSS @imports without trying to import the files at compile time.
+  // Because @import is also defined in CSS, Sass needs a way of compiling plain CSS @imports without trying to import the files at compile time.
   // To accomplish this, and to ensure SCSS is as much of a superset of CSS as possible, Sass will compile any @imports with the following characteristics to plain CSS imports:
   //  - imports where the URL ends with .css.
   //  - imports where the URL begins http:// or https://.
@@ -237,19 +217,13 @@ url, forWebpackResolver = false, rootContext = false) {
   //  - imports that have media queries.
   //
   // The `node-sass` package sends `@import` ending on `.css` to importer, it is bug, so we skip resolve
-
-
   if (ext === ".css") {
     return [];
   }
-
   const dirname = _path.default.dirname(request);
-
   const basename = _path.default.basename(request);
-
   return [...new Set([`${dirname}/_${basename}`, request].concat(forWebpackResolver ? [`${_path.default.dirname(url)}/_${basename}`, url] : []))];
 }
-
 function promiseResolve(callbackResolve) {
   return (context, request) => new Promise((resolve, reject) => {
     callbackResolve(context, request, (error, result) => {
@@ -261,10 +235,10 @@ function promiseResolve(callbackResolve) {
     });
   });
 }
-
-const IS_SPECIAL_MODULE_IMPORT = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[sharename]\`
-
+const IS_SPECIAL_MODULE_IMPORT = /^~[^/]+$/;
+// `[drive_letter]:\` + `\\[server]\[sharename]\`
 const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
+
 /**
  * @public
  * Create the resolve function used in the custom Sass importer.
@@ -283,42 +257,35 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
  *
  * @throws If a compatible Sass implementation cannot be found.
  */
-
 function getWebpackResolver(resolverFactory, implementation, includePaths = [], rootContext = false) {
   async function startResolving(resolutionMap) {
     if (resolutionMap.length === 0) {
       return Promise.reject();
     }
-
     const [{
       possibleRequests
     }] = resolutionMap;
-
     if (possibleRequests.length === 0) {
       return Promise.reject();
     }
-
     const [{
       resolve,
       context
     }] = resolutionMap;
-
     try {
       return await resolve(context, possibleRequests[0]);
     } catch (_ignoreError) {
       const [, ...tailResult] = possibleRequests;
-
       if (tailResult.length === 0) {
         const [, ...tailResolutionMap] = resolutionMap;
         return startResolving(tailResolutionMap);
-      } // eslint-disable-next-line no-param-reassign
-
+      }
 
+      // eslint-disable-next-line no-param-reassign
       resolutionMap[0].possibleRequests = tailResult;
       return startResolving(resolutionMap);
     }
   }
-
   const isDartSass = implementation.info.includes("dart-sass");
   const sassResolve = promiseResolve(resolverFactory({
     alias: [],
@@ -342,7 +309,6 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
   return (context, request) => {
     const originalRequest = request;
     const isFileScheme = originalRequest.slice(0, 5).toLowerCase() === "file:";
-
     if (isFileScheme) {
       try {
         // eslint-disable-next-line no-param-reassign
@@ -352,15 +318,15 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
         request = request.slice(7);
       }
     }
-
     let resolutionMap = [];
-    const needEmulateSassResolver = // `sass` doesn't support module import
-    !IS_SPECIAL_MODULE_IMPORT.test(request) && // We need improve absolute paths handling.
+    const needEmulateSassResolver =
+    // `sass` doesn't support module import
+    !IS_SPECIAL_MODULE_IMPORT.test(request) &&
+    // We need improve absolute paths handling.
     // Absolute paths should be resolved:
     // - Server-relative URLs - `<context>/path/to/file.ext` (where `<context>` is root context)
     // - Absolute path - `/full/path/to/file.ext` or `C:\\full\path\to\file.ext`
     !isFileScheme && !originalRequest.startsWith("/") && !IS_NATIVE_WIN32_PATH.test(originalRequest);
-
     if (includePaths.length > 0 && needEmulateSassResolver) {
       // The order of import precedence is as follows:
       //
@@ -371,8 +337,9 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
       // 5. Filesystem imports relative to a `SASS_PATH` path.
       //
       // Because `sass`/`node-sass` run custom importers before `3`, `4` and `5` points, we need to emulate this behavior to avoid wrong resolution.
-      const sassPossibleRequests = getPossibleRequests(request); // `node-sass` calls our importer before `1. Filesystem imports relative to the base file.`, so we need emulate this too
+      const sassPossibleRequests = getPossibleRequests(request);
 
+      // `node-sass` calls our importer before `1. Filesystem imports relative to the base file.`, so we need emulate this too
       if (!isDartSass) {
         resolutionMap = resolutionMap.concat({
           resolve: sassResolve,
@@ -380,8 +347,8 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
           possibleRequests: sassPossibleRequests
         });
       }
-
-      resolutionMap = resolutionMap.concat( // eslint-disable-next-line no-shadow
+      resolutionMap = resolutionMap.concat(
+      // eslint-disable-next-line no-shadow
       includePaths.map(context => {
         return {
           resolve: sassResolve,
@@ -390,7 +357,6 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
         };
       }));
     }
-
     const webpackPossibleRequests = getPossibleRequests(request, true, rootContext);
     resolutionMap = resolutionMap.concat({
       resolve: webpackResolve,
@@ -400,9 +366,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
     return startResolving(resolutionMap);
   };
 }
-
 const matchCss = /\.css$/i;
-
 function getWebpackImporter(loaderContext, implementation, includePaths) {
   const resolve = getWebpackResolver(loaderContext.getResolve, implementation, includePaths, loaderContext.rootContext);
   return (originalUrl, prev, done) => {
@@ -410,12 +374,13 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
       // Add the result as dependency.
       // Although we're also using stats.includedFiles, this might come in handy when an error occurs.
       // In this case, we don't get stats.includedFiles from node-sass/sass.
-      loaderContext.addDependency(_path.default.normalize(result)); // By removing the CSS file extension, we trigger node-sass to include the CSS file instead of just linking it.
-
+      loaderContext.addDependency(_path.default.normalize(result));
+      // By removing the CSS file extension, we trigger node-sass to include the CSS file instead of just linking it.
       done({
         file: result.replace(matchCss, "")
       });
-    }) // Catch all resolving errors, return the original file and pass responsibility back to other custom importers
+    })
+    // Catch all resolving errors, return the original file and pass responsibility back to other custom importers
     .catch(() => {
       done({
         file: originalUrl
@@ -423,70 +388,64 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
     });
   };
 }
-
 let nodeSassJobQueue = null;
+
 /**
  * Verifies that the implementation and version of Sass is supported by this loader.
  *
  * @param {Object} implementation
  * @returns {Function}
  */
-
 function getRenderFunctionFromSassImplementation(implementation) {
   const isDartSass = implementation.info.includes("dart-sass");
-
   if (isDartSass) {
     return implementation.render.bind(implementation);
-  } // There is an issue with node-sass when async custom importers are used
+  }
+
+  // There is an issue with node-sass when async custom importers are used
   // See https://github.com/sass/node-sass/issues/857#issuecomment-93594360
   // We need to use a job queue to make sure that one thread is always available to the UV lib
-
-
   if (nodeSassJobQueue === null) {
     const threadPoolSize = Number(process.env.UV_THREADPOOL_SIZE || 4);
     nodeSassJobQueue = _neoAsync.default.queue(implementation.render.bind(implementation), threadPoolSize - 1);
   }
-
   return nodeSassJobQueue.push.bind(nodeSassJobQueue);
 }
-
 const ABSOLUTE_SCHEME = /^[A-Za-z0-9+\-.]+:/;
-
 function getURLType(source) {
   if (source[0] === "/") {
     if (source[1] === "/") {
       return "scheme-relative";
     }
-
     return "path-absolute";
   }
-
   if (IS_NATIVE_WIN32_PATH.test(source)) {
     return "path-absolute";
   }
-
   return ABSOLUTE_SCHEME.test(source) ? "absolute" : "path-relative";
 }
-
 function normalizeSourceMap(map, rootContext) {
-  const newMap = map; // result.map.file is an optional property that provides the output filename.
+  const newMap = map;
+
+  // result.map.file is an optional property that provides the output filename.
   // Since we don't know the final filename in the webpack build chain yet, it makes no sense to have it.
   // eslint-disable-next-line no-param-reassign
+  delete newMap.file;
 
-  delete newMap.file; // eslint-disable-next-line no-param-reassign
+  // eslint-disable-next-line no-param-reassign
+  newMap.sourceRoot = "";
 
-  newMap.sourceRoot = ""; // node-sass returns POSIX paths, that's why we need to transform them back to native paths.
+  // node-sass returns POSIX paths, that's why we need to transform them back to native paths.
   // This fixes an error on windows where the source-map module cannot resolve the source maps.
   // @see https://github.com/webpack-contrib/sass-loader/issues/366#issuecomment-279460722
   // eslint-disable-next-line no-param-reassign
-
   newMap.sources = newMap.sources.map(source => {
-    const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
+    const sourceType = getURLType(source);
 
+    // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
     if (sourceType === "path-relative") {
       return _path.default.resolve(rootContext, _path.default.normalize(source));
     }
-
     return source;
   });
   return newMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "10.4.1",
+  "version": "10.5.0",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -40,7 +40,7 @@
   ],
   "peerDependencies": {
     "fibers": ">= 3.1.0",
-    "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
+    "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
     "sass": "^1.3.0",
     "webpack": "^4.36.0 || ^5.0.0"
   },