sass-loader 9.0.2 → 9.0.3

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.3](https://github.com/webpack-contrib/sass-loader/compare/v9.0.2...v9.0.3) (2020-08-05)
+
+
+### Bug Fixes
+
+* resolution algorithm ([#875](https://github.com/webpack-contrib/sass-loader/issues/875)) ([ea73cfa](https://github.com/webpack-contrib/sass-loader/commit/ea73cfab047c751e1055d0c2ec58ef503f7dbe36))
+
 ### [9.0.2](https://github.com/webpack-contrib/sass-loader/compare/v9.0.1...v9.0.2) (2020-07-07)
 
 

package/dist/utils.js

@@ -229,7 +229,7 @@ url, forWebpackResolver = false) {
 
   const basename = _path.default.basename(request);
 
-  return [...new Set([`${dirname}/_${basename}`, request].concat(forWebpackResolver ? [url] : []))];
+  return [...new Set([`${dirname}/_${basename}`, request].concat(forWebpackResolver ? [`${_path.default.dirname(url)}/_${basename}`, url] : []))];
 }
 
 const matchCss = /\.css$/i;
@@ -238,7 +238,7 @@ const isSpecialModuleImport = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[s
 const isNativeWin32Path = /^[a-zA-Z]:[/\\]|^\\\\/i;
 
 function getWebpackImporter(loaderContext, implementation, includePaths) {
-  function startResolving(resolutionMap) {
+  async function startResolving(resolutionMap) {
     if (resolutionMap.length === 0) {
       return Promise.reject();
     }
@@ -248,16 +248,11 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
       context,
       possibleRequests
     }] = resolutionMap;
-    return resolve(context, possibleRequests[0]).then(result => {
-      // 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.
-
-      return {
-        file: result.replace(matchCss, '')
-      };
-    }).catch(() => {
+    let result;
+
+    try {
+      result = await resolve(context, possibleRequests[0]);
+    } catch (_ignoreError) {
       const [, ...tailResult] = possibleRequests;
 
       if (tailResult.length === 0) {
@@ -268,7 +263,16 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
 
       resolutionMap[0].possibleRequests = tailResult;
       return startResolving(resolutionMap);
-    });
+    } // 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.
+
+    return {
+      file: result.replace(matchCss, '')
+    };
   }
 
   const sassResolve = loaderContext.getResolve({
@@ -348,7 +352,7 @@ function getWebpackImporter(loaderContext, implementation, includePaths) {
     startResolving(resolutionMap) // Catch all resolving errors, return the original file and pass responsibility back to other custom importers
     .catch(() => ({
       file: originalUrl
-    })).then(done);
+    })).then(result => done(result));
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -56,45 +56,45 @@
     }
   },
   "dependencies": {
-    "klona": "^1.1.1",
+    "klona": "^1.1.2",
     "loader-utils": "^2.0.0",
-    "neo-async": "^2.6.1",
+    "neo-async": "^2.6.2",
     "schema-utils": "^2.7.0",
     "semver": "^7.3.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.10.3",
-    "@babel/core": "^7.10.3",
-    "@babel/preset-env": "^7.10.3",
-    "@commitlint/cli": "^9.0.1",
-    "@commitlint/config-conventional": "^9.0.1",
+    "@babel/cli": "^7.10.5",
+    "@babel/core": "^7.11.0",
+    "@babel/preset-env": "^7.11.0",
+    "@commitlint/cli": "^9.1.1",
+    "@commitlint/config-conventional": "^9.1.1",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^26.0.1",
-    "bootstrap": "^4.5.0",
+    "babel-jest": "^26.2.2",
+    "bootstrap": "^4.5.1",
     "bootstrap-sass": "^3.4.1",
     "cross-env": "^7.0.2",
-    "css-loader": "^3.6.0",
+    "css-loader": "^4.2.0",
     "del": "^5.1.0",
     "del-cli": "^3.0.1",
-    "eslint": "^7.3.0",
+    "eslint": "^7.6.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.21.2",
     "fibers": "^5.0.0",
     "file-loader": "^6.0.0",
     "foundation-sites": "^6.6.3",
     "husky": "^4.2.5",
-    "jest": "^26.0.1",
+    "jest": "^26.2.2",
     "lint-staged": "^10.2.11",
     "material-components-web": "^7.0.0",
     "memfs": "^3.2.0",
     "node-sass": "^4.14.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "sass": "^1.26.8",
-    "standard-version": "^8.0.0",
+    "sass": "^1.26.10",
+    "standard-version": "^8.0.2",
     "style-loader": "^1.2.1",
-    "webpack": "^4.43.0"
+    "webpack": "^4.44.1"
   },
   "keywords": [
     "sass",