sass-loader 11.0.0 → 11.0.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.
 
+### [11.0.1](https://github.com/webpack-contrib/sass-loader/compare/v11.0.0...v11.0.1) (2021-02-08)
+
+
+### Bug Fixes
+
+* compatibility with custom importers for `node-sass` ([#927](https://github.com/webpack-contrib/sass-loader/issues/927)) ([af5a072](https://github.com/webpack-contrib/sass-loader/commit/af5a072c5170f96f3d0643dec658248d98f65ff7))
+
 ## [11.0.0](https://github.com/webpack-contrib/sass-loader/compare/v10.1.1...v11.0.0) (2021-02-05)
 
 

package/dist/utils.js

@@ -175,7 +175,9 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
   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:
+}
+
+const MODULE_REQUEST_REGEX = /^[^?]*~/; // Examples:
 // - ~package
 // - ~package/
 // - ~@org
@@ -183,9 +185,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
 // - ~@org/package
 // - ~@org/package/
 
-
-const isModuleImport = /^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+\/)$/;
-const MODULE_REQUEST_REGEX = /^[^?]*~/;
+const IS_MODULE_IMPORT = /^~([^/]+|[^/]+\/|@[^/]+[/][^/]+|@[^/]+\/?|@[^/]+[/][^/]+\/)$/;
 /**
  * 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.
@@ -210,7 +210,7 @@ url, forWebpackResolver = false) {
       request = request.replace(MODULE_REQUEST_REGEX, "");
     }
 
-    if (isModuleImport.test(url)) {
+    if (IS_MODULE_IMPORT.test(url)) {
       request = request[request.length - 1] === "/" ? request : `${request}/`;
       return [...new Set([request, url])];
     }
@@ -268,12 +268,11 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
  * @param {Object} implementation - The imported Sass implementation, both
  *   `sass` (Dart Sass) and `node-sass` are supported.
  * @param {string[]} [includePaths] - The list of include paths passed to Sass.
- * @param {boolean} [rootContext] - The configured Webpack root context.
  *
  * @throws If a compatible Sass implementation cannot be found.
  */
 
-function getWebpackResolver(resolverFactory, implementation, includePaths = [], rootContext = false) {
+function getWebpackResolver(resolverFactory, implementation, includePaths = []) {
   async function startResolving(resolutionMap) {
     if (resolutionMap.length === 0) {
       return Promise.reject();
@@ -332,6 +331,13 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
     preferRelative: true
   }));
   return (context, request) => {
+    // See https://github.com/webpack/webpack/issues/12340
+    // Because `node-sass` calls our importer before `1. Filesystem imports relative to the base file.`
+    // custom importer may not return `{ file: '/path/to/name.ext' }` and therefore our `context` will be relative
+    if (!isDartSass && !_path.default.isAbsolute(context)) {
+      return Promise.reject();
+    }
+
     const originalRequest = request;
     const isFileScheme = originalRequest.slice(0, 5).toLowerCase() === "file:";
 
@@ -362,7 +368,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
       // 4. Filesystem imports relative to an `includePaths` path.
       // 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.
+      // `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
 
       if (!isDartSass) {
@@ -383,7 +389,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
       }));
     }
 
-    const webpackPossibleRequests = getPossibleRequests(request, true, rootContext);
+    const webpackPossibleRequests = getPossibleRequests(request, true);
     resolutionMap = resolutionMap.concat({
       resolve: webpackResolve,
       context: _path.default.dirname(context),
@@ -396,7 +402,7 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [],
 const matchCss = /\.css$/i;
 
 function getWebpackImporter(loaderContext, implementation, includePaths) {
-  const resolve = getWebpackResolver(loaderContext.getResolve, implementation, includePaths, loaderContext.rootContext);
+  const resolve = getWebpackResolver(loaderContext.getResolve, implementation, includePaths);
   return (originalUrl, prev, done) => {
     resolve(prev, originalUrl).then(result => {
       // Add the result as dependency.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -39,10 +39,10 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^5.0.0",
+    "fibers": ">= 3.1.0",
     "node-sass": "^4.0.0 || ^5.0.0",
     "sass": "^1.3.0",
-    "fibers": ">= 3.1.0"
+    "webpack": "^5.0.0"
   },
   "peerDependenciesMeta": {
     "node-sass": {
@@ -83,17 +83,18 @@
     "foundation-sites": "^6.6.3",
     "husky": "^4.3.6",
     "jest": "^26.6.3",
-    "lint-staged": "^10.5.3",
+    "lint-staged": "^10.5.4",
     "material-components-web": "^8.0.0",
     "memfs": "^3.2.0",
     "node-sass": "^5.0.0",
+    "node-sass-glob-importer": "^5.3.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.2.1",
     "sass": "^1.32.0",
     "semver": "^7.3.4",
     "standard-version": "^9.1.0",
     "style-loader": "^2.0.0",
-    "webpack": "^5.20.2"
+    "webpack": "^5.21.2"
   },
   "keywords": [
     "sass",