sass-loader 10.1.0 → 10.1.1

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [10.1.1](https://github.com/webpack-contrib/sass-loader/compare/v10.1.0...v10.1.1) (2021-01-11)
+
+
+### Bug Fixes
+
+* problem with resolving and the `includePaths` option ([#913](https://github.com/webpack-contrib/sass-loader/issues/913)) ([cadc75e](https://github.com/webpack-contrib/sass-loader/commit/cadc75e80caf7d32ea47de1cbaab639f9204c0eb))
+
 ## [10.1.0](https://github.com/webpack-contrib/sass-loader/compare/v10.0.5...v10.1.0) (2020-11-11)
 
 

package/dist/index.js

@@ -70,7 +70,12 @@ async function loader(content) {
     }
 
     result.stats.includedFiles.forEach(includedFile => {
-      this.addDependency(_path.default.normalize(includedFile));
+      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);
+      }
     });
     callback(null, result.css.toString(), map);
   });

package/dist/utils.js

@@ -103,11 +103,9 @@ function isProductionLikeMode(loaderContext) {
 }
 
 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);
   });
 }
 /**
@@ -186,7 +184,8 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
 
 
   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
@@ -377,11 +376,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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "10.1.0",
+  "version": "10.1.1",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -77,9 +77,9 @@
     "css-loader": "^5.0.1",
     "del": "^6.0.0",
     "del-cli": "^3.0.1",
-    "enhanced-resolve": "^5.3.1",
+    "enhanced-resolve": "^5.5.0",
     "eslint": "^7.13.0",
-    "eslint-config-prettier": "^6.15.0",
+    "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-import": "^2.22.1",
     "fibers": "^5.0.0",
     "file-loader": "^6.2.0",
@@ -95,7 +95,7 @@
     "sass": "^1.29.0",
     "standard-version": "^9.0.0",
     "style-loader": "^2.0.0",
-    "webpack": "^5.4.0"
+    "webpack": "^5.12.2"
   },
   "keywords": [
     "sass",