sass-loader 12.4.0 → 12.6.0

package/dist/utils.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRenderFunctionFromSassImplementation = getRenderFunctionFromSassImplementation;
+exports.getCompileFn = getCompileFn;
+exports.getModernWebpackImporter = getModernWebpackImporter;
 exports.getSassImplementation = getSassImplementation;
 exports.getSassOptions = getSassOptions;
 exports.getWebpackImporter = getWebpackImporter;
@@ -28,13 +29,19 @@ function getDefaultSassImplementation() {
 
   try {
     require.resolve("sass");
-  } catch (error) {
+  } catch (ignoreError) {
     try {
       require.resolve("node-sass");
 
       sassImplPkg = "node-sass";
-    } catch (ignoreError) {
-      sassImplPkg = "sass";
+    } catch (_ignoreError) {
+      try {
+        require.resolve("sass-embedded");
+
+        sassImplPkg = "sass-embedded";
+      } catch (__ignoreError) {
+        sassImplPkg = "sass";
+      }
     }
   } // eslint-disable-next-line import/no-dynamic-require, global-require
 
@@ -93,6 +100,9 @@ function getSassImplementation(loaderContext, implementation) {
   } else if (implementationName === "node-sass") {
     // eslint-disable-next-line consistent-return
     return resolvedImplementation;
+  } else if (implementationName === "sass-embedded") {
+    // eslint-disable-next-line consistent-return
+    return resolvedImplementation;
   }
 
   loaderContext.emitError(new Error(`Unknown Sass implementation "${implementationName}".`));
@@ -135,73 +145,8 @@ function isSupportedFibers() {
 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 && isSupportedFibers()) {
-    const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
-
-    if (shouldTryToResolveFibers) {
-      let fibers;
-
-      try {
-        fibers = require.resolve("fibers");
-      } catch (_error) {// Nothing
-      }
-
-      if (fibers) {
-        // eslint-disable-next-line global-require, import/no-dynamic-require
-        options.fiber = require(fibers);
-      }
-    } else if (options.fiber === false) {
-      // Don't pass the `fiber` option for `sass` (`Dart Sass`)
-      delete options.fiber;
-    }
-  } else {
-    // Don't pass the `fiber` option for `node-sass`
-    delete options.fiber;
-  }
-
-  options.file = loaderContext.resourcePath;
-  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";
-  }
-
-  if (useSourceMap) {
-    // Deliberately overriding the sourceMap option here.
-    // node-sass won't produce source maps if the data option is used and options.sourceMap is not a string.
-    // In case it is a string, options.sourceMap should be a path where the source map is written.
-    // But since we're using the data option, the source map will not actually be written, but
-    // 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.sourceMapContents = true;
-    options.omitSourceMapUrl = true;
-    options.sourceMapEmbed = false;
-  }
-
-  const {
-    resourcePath
-  } = loaderContext;
-
-  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") {
-    options.indentedSyntax = true;
-  } else {
-    options.indentedSyntax = Boolean(options.indentedSyntax);
-  } // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
-
-
-  options.importer = options.importer ? proxyCustomImporters(Array.isArray(options.importer) ? options.importer : [options.importer], loaderContext) : [];
-  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" ? ";" : ":") : []);
-
-  if (typeof options.charset === "undefined") {
-    options.charset = true;
-  }
+  const isModernAPI = loaderOptions.api === "modern";
+  options.data = loaderOptions.additionalData ? typeof loaderOptions.additionalData === "function" ? await loaderOptions.additionalData(content, loaderContext) : `${loaderOptions.additionalData}\n${content}` : content;
 
   if (!options.logger) {
     // TODO set me to `true` by default in the next major release
@@ -249,6 +194,100 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
     };
   }
 
+  const {
+    resourcePath
+  } = loaderContext;
+
+  if (isModernAPI) {
+    options.url = _url.default.pathToFileURL(resourcePath); // opt.outputStyle
+
+    if (!options.style && isProductionLikeMode(loaderContext)) {
+      options.style = "compressed";
+    }
+
+    if (useSourceMap) {
+      options.sourceMap = true;
+    } // If we are compiling sass and indentedSyntax isn't set, automatically set it.
+
+
+    if (typeof options.syntax === "undefined") {
+      const ext = _path.default.extname(resourcePath);
+
+      if (ext && ext.toLowerCase() === ".scss") {
+        options.syntax = "scss";
+      } else if (ext && ext.toLowerCase() === ".sass") {
+        options.syntax = "indented";
+      } else if (ext && ext.toLowerCase() === ".css") {
+        options.syntax = "css";
+      }
+    }
+
+    options.importers = options.importers ? proxyCustomImporters(Array.isArray(options.importers) ? options.importers : [options.importers], loaderContext) : [];
+  } else {
+    options.file = resourcePath;
+
+    if (isDartSass && isSupportedFibers()) {
+      const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
+
+      if (shouldTryToResolveFibers) {
+        let fibers;
+
+        try {
+          fibers = require.resolve("fibers");
+        } catch (_error) {// Nothing
+        }
+
+        if (fibers) {
+          // eslint-disable-next-line global-require, import/no-dynamic-require
+          options.fiber = require(fibers);
+        }
+      } else if (options.fiber === false) {
+        // Don't pass the `fiber` option for `sass` (`Dart Sass`)
+        delete options.fiber;
+      }
+    } else {
+      // Don't pass the `fiber` option for `node-sass`
+      delete options.fiber;
+    } // opt.outputStyle
+
+
+    if (!options.outputStyle && isProductionLikeMode(loaderContext)) {
+      options.outputStyle = "compressed";
+    }
+
+    if (useSourceMap) {
+      // Deliberately overriding the sourceMap option here.
+      // node-sass won't produce source maps if the data option is used and options.sourceMap is not a string.
+      // In case it is a string, options.sourceMap should be a path where the source map is written.
+      // But since we're using the data option, the source map will not actually be written, but
+      // 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.sourceMapContents = true;
+      options.omitSourceMapUrl = true;
+      options.sourceMapEmbed = false;
+    }
+
+    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") {
+      options.indentedSyntax = true;
+    } else {
+      options.indentedSyntax = Boolean(options.indentedSyntax);
+    } // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
+
+
+    options.importer = options.importer ? proxyCustomImporters(Array.isArray(options.importer) ? options.importer : [options.importer], loaderContext) : [];
+    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" ? ";" : ":") : []);
+
+    if (typeof options.charset === "undefined") {
+      options.charset = true;
+    }
+  }
+
   return options;
 }
 
@@ -330,6 +369,40 @@ function promiseResolve(callbackResolve) {
   });
 }
 
+async function startResolving(resolutionMap) {
+  if (resolutionMap.length === 0) {
+    return Promise.reject();
+  }
+
+  const [{
+    possibleRequests
+  }] = resolutionMap;
+
+  if (possibleRequests.length === 0) {
+    return Promise.reject();
+  }
+
+  const [{
+    resolve,
+    context
+  }] = resolutionMap;
+
+  try {
+    return await resolve(context, possibleRequests[0]);
+  } catch (_ignoreError) {
+    const [, ...tailResult] = possibleRequests;
+
+    if (tailResult.length === 0) {
+      const [, ...tailResolutionMap] = resolutionMap;
+      return startResolving(tailResolutionMap);
+    } // eslint-disable-next-line no-param-reassign
+
+
+    resolutionMap[0].possibleRequests = tailResult;
+    return startResolving(resolutionMap);
+  }
+}
+
 const IS_SPECIAL_MODULE_IMPORT = /^~[^/]+$/; // `[drive_letter]:\` + `\\[server]\[sharename]\`
 
 const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
@@ -352,41 +425,7 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
  */
 
 function getWebpackResolver(resolverFactory, implementation, includePaths = []) {
-  async function startResolving(resolutionMap) {
-    if (resolutionMap.length === 0) {
-      return Promise.reject();
-    }
-
-    const [{
-      possibleRequests
-    }] = resolutionMap;
-
-    if (possibleRequests.length === 0) {
-      return Promise.reject();
-    }
-
-    const [{
-      resolve,
-      context
-    }] = resolutionMap;
-
-    try {
-      return await resolve(context, possibleRequests[0]);
-    } catch (_ignoreError) {
-      const [, ...tailResult] = possibleRequests;
-
-      if (tailResult.length === 0) {
-        const [, ...tailResolutionMap] = resolutionMap;
-        return startResolving(tailResolutionMap);
-      } // eslint-disable-next-line no-param-reassign
-
-
-      resolutionMap[0].possibleRequests = tailResult;
-      return startResolving(resolutionMap);
-    }
-  }
-
-  const isDartSass = implementation.info.includes("dart-sass"); // We only have one difference with the built-in sass resolution logic and out resolution logic:
+  const isDartSass = implementation && implementation.info.includes("dart-sass"); // We only have one difference with the built-in sass resolution logic and out resolution logic:
   // First, we look at the files starting with `_`, then without `_` (i.e. `_name.sass`, `_name.scss`, `_name.css`, `name.sass`, `name.scss`, `name.css`),
   // although `sass` look together by extensions (i.e. `_name.sass`/`name.sass`/`_name.scss`/`name.scss`/`_name.css`/`name.css`).
   // It shouldn't be a problem because `sass` throw errors:
@@ -510,6 +549,18 @@ function getWebpackResolver(resolverFactory, implementation, includePaths = [])
 
 const MATCH_CSS = /\.css$/i;
 
+function getModernWebpackImporter() {
+  return {
+    async canonicalize() {
+      return null;
+    },
+
+    load() {// TODO implement
+    }
+
+  };
+}
+
 function getWebpackImporter(loaderContext, implementation, includePaths) {
   const resolve = getWebpackResolver(loaderContext.getResolve, implementation, includePaths);
   return function importer(originalUrl, prev, done) {
@@ -539,14 +590,38 @@ let nodeSassJobQueue = null;
  * Verifies that the implementation and version of Sass is supported by this loader.
  *
  * @param {Object} implementation
+ * @param {Object} options
  * @returns {Function}
  */
 
-function getRenderFunctionFromSassImplementation(implementation) {
-  const isDartSass = implementation.info.includes("dart-sass");
+function getCompileFn(implementation, options) {
+  const isNewSass = implementation.info.includes("dart-sass") || implementation.info.includes("sass-embedded");
+
+  if (isNewSass) {
+    if (options.api === "modern") {
+      return sassOptions => {
+        const {
+          data,
+          ...rest
+        } = sassOptions;
+        return implementation.compileStringAsync(data, rest);
+      };
+    }
+
+    return sassOptions => new Promise((resolve, reject) => {
+      implementation.render(sassOptions, (error, result) => {
+        if (error) {
+          reject(error);
+          return;
+        }
+
+        resolve(result);
+      });
+    });
+  }
 
-  if (isDartSass) {
-    return implementation.render.bind(implementation);
+  if (options.api === "modern") {
+    throw new Error("Modern API is not supported for 'node-sass'");
   } // There is an issue with node-sass when async custom importers are used
   // See https://github.com/sass/node-sass/issues/857#issuecomment-93594360
   // We need to use a job queue to make sure that one thread is always available to the UV lib
@@ -557,7 +632,16 @@ function getRenderFunctionFromSassImplementation(implementation) {
     nodeSassJobQueue = _neoAsync.default.queue(implementation.render.bind(implementation), threadPoolSize - 1);
   }
 
-  return nodeSassJobQueue.push.bind(nodeSassJobQueue);
+  return sassOptions => new Promise((resolve, reject) => {
+    nodeSassJobQueue.push.bind(nodeSassJobQueue)(sassOptions, (error, result) => {
+      if (error) {
+        reject(error);
+        return;
+      }
+
+      resolve(result);
+    });
+  });
 }
 
 const ABSOLUTE_SCHEME = /^[A-Za-z0-9+\-.]+:/;
@@ -587,7 +671,10 @@ function normalizeSourceMap(map, rootContext) {
   // Since we don't know the final filename in the webpack build chain yet, it makes no sense to have it.
   // eslint-disable-next-line no-param-reassign
 
-  delete newMap.file; // eslint-disable-next-line no-param-reassign
+  if (typeof newMap.file !== "undefined") {
+    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.
   // This fixes an error on windows where the source-map module cannot resolve the source maps.
@@ -595,9 +682,11 @@ function normalizeSourceMap(map, rootContext) {
   // eslint-disable-next-line no-param-reassign
 
   newMap.sources = newMap.sources.map(source => {
-    const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types
+    const sourceType = getURLType(source); // Do no touch `scheme-relative`, `path-absolute` and `absolute` types (except `file:`)
 
-    if (sourceType === "path-relative") {
+    if (sourceType === "absolute" && /^file:/i.test(source)) {
+      return _url.default.fileURLToPath(source);
+    } else if (sourceType === "path-relative") {
       return _path.default.resolve(rootContext, _path.default.normalize(source));
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "12.4.0",
+  "version": "12.6.0",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -41,6 +41,7 @@
     "fibers": ">= 3.1.0",
     "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
     "sass": "^1.3.0",
+    "sass-embedded": "*",
     "webpack": "^5.0.0"
   },
   "peerDependenciesMeta": {
@@ -50,6 +51,9 @@
     "sass": {
       "optional": true
     },
+    "sass-embedded": {
+      "optional": true
+    },
     "fibers": {
       "optional": true
     }
@@ -59,41 +63,43 @@
     "neo-async": "^2.6.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.14.6",
-    "@babel/preset-env": "^7.14.7",
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@babel/cli": "^7.17.0",
+    "@babel/core": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@commitlint/cli": "^16.2.1",
+    "@commitlint/config-conventional": "^16.2.1",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^27.0.6",
+    "babel-jest": "^27.5.0",
     "bootstrap-sass": "^3.4.1",
     "bootstrap-v4": "npm:bootstrap@^4.5.3",
     "bootstrap-v5": "npm:bootstrap@^5.0.1",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.2.0",
+    "css-loader": "^6.6.0",
     "del": "^6.0.0",
     "del-cli": "^4.0.1",
     "enhanced-resolve": "^5.8.2",
-    "eslint": "^8.1.0",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.3",
-    "fibers": "^5.0.0",
+    "eslint-plugin-import": "^2.25.4",
+    "fibers": "^5.0.1",
     "file-loader": "^6.2.0",
     "foundation-sites": "^6.6.3",
     "husky": "^7.0.1",
-    "jest": "^27.0.6",
-    "lint-staged": "^12.1.2",
+    "jest": "^27.5.0",
+    "jest-environment-node-single-context": "^27.2.0",
+    "lint-staged": "^12.3.3",
     "material-components-web": "^8.0.0",
-    "memfs": "^3.2.2",
-    "node-sass": "^7.0.0",
+    "memfs": "^3.4.1",
+    "node-sass": "^7.0.1",
     "node-sass-glob-importer": "^5.3.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.3.2",
-    "sass": "^1.35.2",
+    "sass": "^1.49.7",
+    "sass-embedded": "^1.49.7",
     "semver": "^7.3.5",
     "standard-version": "^9.3.1",
     "style-loader": "^3.2.1",
-    "webpack": "^5.45.1"
+    "webpack": "^5.68.0"
   },
   "keywords": [
     "sass",