sass-loader 10.0.5 → 10.2.1

package/dist/utils.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getRenderFunctionFromSassImplementation = getRenderFunctionFromSassImplementation;
 exports.getSassImplementation = getSassImplementation;
 exports.getSassOptions = getSassOptions;
-exports.getWebpackResolver = getWebpackResolver;
 exports.getWebpackImporter = getWebpackImporter;
-exports.getRenderFunctionFromSassImplementation = getRenderFunctionFromSassImplementation;
+exports.getWebpackResolver = getWebpackResolver;
+exports.isSupportedFibers = isSupportedFibers;
 exports.normalizeSourceMap = normalizeSourceMap;
 
 var _url = _interopRequireDefault(require("url"));
@@ -25,17 +26,17 @@ var _neoAsync = _interopRequireDefault(require("neo-async"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getDefaultSassImplementation() {
-  let sassImplPkg = 'sass';
+  let sassImplPkg = "sass";
 
   try {
-    require.resolve('sass');
+    require.resolve("sass");
   } catch (error) {
     try {
-      require.resolve('node-sass');
+      require.resolve("node-sass");
 
-      sassImplPkg = 'node-sass';
+      sassImplPkg = "node-sass";
     } catch (ignoreError) {
-      sassImplPkg = 'sass';
+      sassImplPkg = "sass";
     }
   } // eslint-disable-next-line import/no-dynamic-require, global-require
 
@@ -49,12 +50,16 @@ function getDefaultSassImplementation() {
  */
 
 
-function getSassImplementation(implementation) {
+function getSassImplementation(loaderContext, implementation) {
   let resolvedImplementation = implementation;
 
   if (!resolvedImplementation) {
-    // eslint-disable-next-line no-param-reassign
-    resolvedImplementation = getDefaultSassImplementation();
+    try {
+      resolvedImplementation = getDefaultSassImplementation();
+    } catch (error) {
+      loaderContext.emitError(error);
+      return;
+    }
   }
 
   const {
@@ -62,44 +67,51 @@ function getSassImplementation(implementation) {
   } = resolvedImplementation;
 
   if (!info) {
-    throw new Error('Unknown Sass implementation.');
+    loaderContext.emitError(new Error("Unknown Sass implementation."));
+    return;
   }
 
-  const infoParts = info.split('\t');
+  const infoParts = info.split("\t");
 
   if (infoParts.length < 2) {
-    throw new Error(`Unknown Sass implementation "${info}".`);
+    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')) {
-      throw new Error(`Dart Sass version ${version} is incompatible with ^1.3.0.`);
-    }
+  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
+
 
     return resolvedImplementation;
-  } else if (implementationName === 'node-sass') {
-    if (!_semver.default.satisfies(version, '^4.0.0 || ^5.0.0')) {
-      throw new Error(`Node Sass version ${version} is incompatible with ^4.0.0 || ^5.0.0.`);
-    }
+  } else if (implementationName === "node-sass") {
+    if (!_semver.default.satisfies(version, "^4.0.0 || ^5.0.0 || ^6.0.0")) {
+      loaderContext.emitError(new Error(`Node Sass version ${version} is incompatible with ^4.0.0 || ^5.0.0 || ^6.0.0.`));
+    } // eslint-disable-next-line consistent-return
+
 
     return resolvedImplementation;
   }
 
-  throw new Error(`Unknown Sass implementation "${implementationName}".`);
+  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;
+  return loaderContext.mode === "production" || !loaderContext.mode;
 }
 
 function proxyCustomImporters(importers, loaderContext) {
-  return [].concat(importers).map(importer => {
-    return function proxyImporter(...args) {
-      this.webpackLoaderContext = loaderContext;
-      return importer.apply(this, args);
-    };
+  return [].concat(importers).map(importer => function proxyImporter(...args) {
+    this.webpackLoaderContext = loaderContext;
+    return importer.apply(this, args);
   });
 }
 /**
@@ -114,18 +126,18 @@ function proxyCustomImporters(importers, loaderContext) {
  */
 
 
-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');
+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) {
+  if (isDartSass && isSupportedFibers()) {
     const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
 
     if (shouldTryToResolveFibers) {
       let fibers;
 
       try {
-        fibers = require.resolve('fibers');
+        fibers = require.resolve("fibers");
       } catch (_error) {// Nothing
       }
 
@@ -143,10 +155,10 @@ function getSassOptions(loaderContext, loaderOptions, content, implementation, u
   }
 
   options.file = loaderContext.resourcePath;
-  options.data = loaderOptions.additionalData ? typeof loaderOptions.additionalData === 'function' ? 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';
+    options.outputStyle = "compressed";
   }
 
   if (useSourceMap) {
@@ -157,7 +169,7 @@ function getSassOptions(loaderContext, loaderOptions, content, implementation, u
     // all paths in sourceMap.sources will be relative to that path.
     // Pretty complicated... :(
     options.sourceMap = true;
-    options.outFile = _path.default.join(loaderContext.rootContext, 'style.css.map');
+    options.outFile = _path.default.join(loaderContext.rootContext, "style.css.map");
     options.sourceMapContents = true;
     options.omitSourceMapUrl = true;
     options.sourceMapEmbed = false;
@@ -170,7 +182,7 @@ function getSassOptions(loaderContext, loaderOptions, content, implementation, u
   const ext = _path.default.extname(resourcePath); // If we are compiling sass and indentedSyntax isn't set, automatically set it.
 
 
-  if (ext && ext.toLowerCase() === '.sass' && typeof options.indentedSyntax === 'undefined') {
+  if (ext && ext.toLowerCase() === ".sass" && typeof options.indentedSyntax === "undefined") {
     options.indentedSyntax = true;
   } else {
     options.indentedSyntax = Boolean(options.indentedSyntax);
@@ -178,7 +190,8 @@ function getSassOptions(loaderContext, loaderOptions, content, implementation, u
 
 
   options.importer = options.importer ? proxyCustomImporters(Array.isArray(options.importer) ? options.importer : [options.importer], loaderContext) : [];
-  options.includePaths = [].concat(process.cwd()).concat(options.includePaths || []).concat(process.env.SASS_PATH ? process.env.SASS_PATH.split(process.platform === 'win32' ? ';' : ':') : []);
+  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:
 // - ~package
@@ -226,7 +239,7 @@ url, forWebpackResolver = false, rootContext = false) {
   // The `node-sass` package sends `@import` ending on `.css` to importer, it is bug, so we skip resolve
 
 
-  if (ext === '.css') {
+  if (ext === ".css") {
     return [];
   }
 
@@ -306,29 +319,29 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
     }
   }
 
-  const isDartSass = implementation.info.includes('dart-sass');
+  const isDartSass = implementation.info.includes("dart-sass");
   const sassResolve = promiseResolve(resolverFactory({
     alias: [],
     aliasFields: [],
     conditionNames: [],
     descriptionFiles: [],
-    extensions: ['.sass', '.scss', '.css'],
+    extensions: [".sass", ".scss", ".css"],
     exportsFields: [],
     mainFields: [],
-    mainFiles: ['_index', 'index'],
+    mainFiles: ["_index", "index"],
     modules: [],
     restrictions: [/\.((sa|sc|c)ss)$/i]
   }));
   const webpackResolve = promiseResolve(resolverFactory({
-    conditionNames: ['sass', 'style'],
-    mainFields: ['sass', 'style', 'main', '...'],
-    mainFiles: ['_index', 'index', '...'],
-    extensions: ['.sass', '.scss', '.css'],
+    conditionNames: ["sass", "style"],
+    mainFields: ["sass", "style", "main", "..."],
+    mainFiles: ["_index", "index", "..."],
+    extensions: [".sass", ".scss", ".css"],
     restrictions: [/\.((sa|sc|c)ss)$/i]
   }));
   return (context, request) => {
     const originalRequest = request;
-    const isFileScheme = originalRequest.slice(0, 5).toLowerCase() === 'file:';
+    const isFileScheme = originalRequest.slice(0, 5).toLowerCase() === "file:";
 
     if (isFileScheme) {
       try {
@@ -346,7 +359,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
     // 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);
+    !isFileScheme && !originalRequest.startsWith("/") && !IS_NATIVE_WIN32_PATH.test(originalRequest);
 
     if (includePaths.length > 0 && needEmulateSassResolver) {
       // The order of import precedence is as follows:
@@ -369,11 +382,13 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
       }
 
       resolutionMap = resolutionMap.concat( // eslint-disable-next-line no-shadow
-      includePaths.map(context => ({
-        resolve: sassResolve,
-        context,
-        possibleRequests: sassPossibleRequests
-      })));
+      includePaths.map(context => {
+        return {
+          resolve: sassResolve,
+          context,
+          possibleRequests: sassPossibleRequests
+        };
+      }));
     }
 
     const webpackPossibleRequests = getPossibleRequests(request, true, rootContext);
@@ -398,7 +413,7 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
       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, '')
+        file: result.replace(matchCss, "")
       });
     }) // Catch all resolving errors, return the original file and pass responsibility back to other custom importers
     .catch(() => {
@@ -418,7 +433,7 @@ let nodeSassJobQueue = null;
  */
 
 function getRenderFunctionFromSassImplementation(implementation) {
-  const isDartSass = implementation.info.includes('dart-sass');
+  const isDartSass = implementation.info.includes("dart-sass");
 
   if (isDartSass) {
     return implementation.render.bind(implementation);
@@ -438,19 +453,19 @@ function getRenderFunctionFromSassImplementation(implementation) {
 const ABSOLUTE_SCHEME = /^[A-Za-z0-9+\-.]+:/;
 
 function getURLType(source) {
-  if (source[0] === '/') {
-    if (source[1] === '/') {
-      return 'scheme-relative';
+  if (source[0] === "/") {
+    if (source[1] === "/") {
+      return "scheme-relative";
     }
 
-    return 'path-absolute';
+    return "path-absolute";
   }
 
   if (IS_NATIVE_WIN32_PATH.test(source)) {
-    return 'path-absolute';
+    return "path-absolute";
   }
 
-  return ABSOLUTE_SCHEME.test(source) ? 'absolute' : 'path-relative';
+  return ABSOLUTE_SCHEME.test(source) ? "absolute" : "path-relative";
 }
 
 function normalizeSourceMap(map, rootContext) {
@@ -460,7 +475,7 @@ function normalizeSourceMap(map, rootContext) {
 
   delete newMap.file; // eslint-disable-next-line no-param-reassign
 
-  newMap.sourceRoot = ''; // node-sass returns POSIX paths, that's why we need to transform them back to native paths.
+  newMap.sourceRoot = ""; // 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
@@ -468,7 +483,7 @@ function normalizeSourceMap(map, rootContext) {
   newMap.sources = newMap.sources.map(source => {
     const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
 
-    if (sourceType === 'path-relative') {
+    if (sourceType === "path-relative") {
       return _path.default.resolve(rootContext, _path.default.normalize(source));
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "10.0.5",
+  "version": "10.2.1",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -39,10 +39,10 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^4.36.0 || ^5.0.0",
-    "node-sass": "^4.0.0 || ^5.0.0",
+    "fibers": ">= 3.1.0",
+    "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0",
     "sass": "^1.3.0",
-    "fibers": ">= 3.1.0"
+    "webpack": "^4.36.0 || ^5.0.0"
   },
   "peerDependenciesMeta": {
     "node-sass": {
@@ -70,32 +70,32 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^26.6.0",
+    "babel-jest": "^26.6.3",
     "bootstrap": "^4.5.3",
     "bootstrap-sass": "^3.4.1",
     "cross-env": "^7.0.2",
-    "css-loader": "^5.0.0",
+    "css-loader": "^5.0.1",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "enhanced-resolve": "^5.3.0",
-    "eslint": "^7.10.0",
-    "eslint-config-prettier": "^6.14.0",
+    "enhanced-resolve": "^5.5.0",
+    "eslint": "^7.13.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-import": "^2.22.1",
     "fibers": "^5.0.0",
-    "file-loader": "^6.1.0",
+    "file-loader": "^6.2.0",
     "foundation-sites": "^6.6.3",
     "husky": "^4.3.0",
-    "jest": "^26.6.0",
-    "lint-staged": "^10.4.2",
-    "material-components-web": "^7.0.0",
+    "jest": "^26.6.3",
+    "lint-staged": "^10.5.1",
+    "material-components-web": "^8.0.0",
     "memfs": "^3.2.0",
-    "node-sass": "^5.0.0",
+    "node-sass": "^6.0.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.1.2",
-    "sass": "^1.27.0",
+    "sass": "^1.29.0",
     "standard-version": "^9.0.0",
     "style-loader": "^2.0.0",
-    "webpack": "^5.2.0"
+    "webpack": "^5.12.2"
   },
   "keywords": [
     "sass",