sass-loader 9.0.1 → 9.0.2

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.
 
+### [9.0.2](https://github.com/webpack-contrib/sass-loader/compare/v9.0.1...v9.0.2) (2020-07-07)
+
+
+### Bug Fixes
+
+* resolution algorithm for `node-sass` ([#866](https://github.com/webpack-contrib/sass-loader/issues/866)) ([4584c90](https://github.com/webpack-contrib/sass-loader/commit/4584c9054befbc56661e2781a55df96fb9f94673))
+
 ### [9.0.1](https://github.com/webpack-contrib/sass-loader/compare/v9.0.0...v9.0.1) (2020-07-03)
 
 

package/README.md

@@ -27,7 +27,7 @@ To begin, you'll need to install `sass-loader`:
 npm install sass-loader sass webpack --save-dev
 ```
 
-`sass-loader` requires you to install either [Dart Sass](https://github.com/sass/dart-sass) on your own (more documentation can be found below) or [Node Sass](https://github.com/sass/node-sass).
+`sass-loader` requires you to install either [Dart Sass](https://github.com/sass/dart-sass) or [Node Sass](https://github.com/sass/node-sass) on your own (more documentation can be found below).
 
 This allows you to control the versions of all your dependencies, and to choose which Sass implementation to use.
 
@@ -628,5 +628,5 @@ Please take a moment to read our contributing guidelines if you haven't yet done
 [cover-url]: https://codecov.io/gh/webpack-contrib/sass-loader
 [chat]: https://badges.gitter.im/webpack/webpack.svg
 [chat-url]: https://gitter.im/webpack/webpack
-[size]: https://packagephobia.now.sh/badge?p=css-loader
-[size-url]: https://packagephobia.now.sh/result?p=css-loader
+[size]: https://packagephobia.now.sh/badge?p=sass-loader
+[size-url]: https://packagephobia.now.sh/result?p=sass-loader

package/dist/index.js

@@ -39,7 +39,7 @@ function loader(content) {
     const {
       includePaths
     } = sassOptions;
-    sassOptions.importer.push((0, _utils.getWebpackImporter)(this, includePaths));
+    sassOptions.importer.push((0, _utils.getWebpackImporter)(this, implementation, includePaths));
   }
 
   const callback = this.async();

package/dist/utils.js

@@ -237,7 +237,7 @@ const isSpecialModuleImport = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[s
 
 const isNativeWin32Path = /^[a-zA-Z]:[/\\]|^\\\\/i;
 
-function getWebpackImporter(loaderContext, includePaths) {
+function getWebpackImporter(loaderContext, implementation, includePaths) {
   function startResolving(resolutionMap) {
     if (resolutionMap.length === 0) {
       return Promise.reject();
@@ -322,6 +322,16 @@ function getWebpackImporter(loaderContext, includePaths) {
       //
       // 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(loaderContext, request);
+      const isDartSass = implementation.info.includes('dart-sass'); // `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,
+          context: _path.default.dirname(prev),
+          possibleRequests: sassPossibleRequests
+        });
+      }
+
       resolutionMap = resolutionMap.concat(includePaths.map(context => ({
         resolve: sassResolve,
         context,

package/package.json

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