sass-loader 15.0.0 → 16.0.1

package/README.md

@@ -362,7 +362,7 @@ module.exports = {
           {
             loader: "sass-loader",
             options: {
-              sassOptions: (content, loaderContext) => {
+              sassOptions: (loaderContext) => {
                 // More information about available properties https://webpack.js.org/api/loaders/
                 const { resourcePath, rootContext } = loaderContext;
                 const relativePath = path.relative(rootContext, resourcePath);
@@ -683,7 +683,7 @@ Type:
 type api = "legacy" | "modern" | "modern-compiler";
 ```
 
-Default: `"legacy"`
+Default: `"modern"` for `sass` (`dart-sass`) and `sass-embedded` or `"legacy"` for `node-sass`
 
 Allows you to switch between the `legacy` and `modern` APIs. You can find more information [here](https://sass-lang.com/documentation/js-api). The `modern-compiler` option enables the modern API with support for [Shared Resources](https://github.com/sass/sass/blob/main/accepted/shared-resources.d.ts.md).
 
@@ -709,7 +709,7 @@ module.exports = {
           {
             loader: "sass-loader",
             options: {
-              api: "modern",
+              api: "modern-compiler",
               sassOptions: {
                 // Your sass options
               },

package/dist/index.js

@@ -26,10 +26,12 @@ async function loader(content) {
     return;
   }
   const useSourceMap = typeof options.sourceMap === "boolean" ? options.sourceMap : this.sourceMap;
-  const sassOptions = await (0, _utils.getSassOptions)(this, options, content, implementation, useSourceMap);
+  // Use `legacy` for `node-sass` and `modern` for `dart-sass` and `sass-embedded`
+  const apiType = typeof implementation.compileStringAsync === "undefined" ? "legacy" : typeof options.api === "undefined" ? "modern" : options.api;
+  const sassOptions = await (0, _utils.getSassOptions)(this, options, content, implementation, useSourceMap, apiType);
   const shouldUseWebpackImporter = typeof options.webpackImporter === "boolean" ? options.webpackImporter : true;
   if (shouldUseWebpackImporter) {
-    const isModernAPI = options.api === "modern" || options.api === "modern-compiler";
+    const isModernAPI = apiType === "modern" || apiType === "modern-compiler";
     if (!isModernAPI) {
       const {
         includePaths
@@ -43,7 +45,7 @@ async function loader(content) {
   }
   let compile;
   try {
-    compile = (0, _utils.getCompileFn)(this, implementation, options);
+    compile = (0, _utils.getCompileFn)(this, implementation, apiType);
   } catch (error) {
     callback(error);
     return;

package/dist/utils.js

@@ -97,9 +97,10 @@ function proxyCustomImporters(importers, loaderContext) {
  * @param {string} content
  * @param {object} implementation
  * @param {boolean} useSourceMap
+ * @param {"legacy" | "modern" | "modern-compiler"} apiType
  * @returns {Object}
  */
-async function getSassOptions(loaderContext, loaderOptions, content, implementation, useSourceMap) {
+async function getSassOptions(loaderContext, loaderOptions, content, implementation, useSourceMap, apiType) {
   const options = loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === "function" ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {};
   const sassOptions = {
     ...options,
@@ -145,7 +146,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
       }
     };
   }
-  const isModernAPI = loaderOptions.api === "modern" || loaderOptions.api === "modern-compiler";
+  const isModernAPI = apiType === "modern" || apiType === "modern-compiler";
   const {
     resourcePath
   } = loaderContext;
@@ -349,7 +350,7 @@ const IS_NATIVE_WIN32_PATH = /^[a-z]:[/\\]|^\\\\/i;
  * @throws If a compatible Sass implementation cannot be found.
  */
 function getWebpackResolver(resolverFactory, implementation, includePaths = []) {
-  const isModernSass = implementation && (implementation.info.includes("dart-sass") || implementation.info.includes("sass-embedded"));
+  const isModernSass = implementation && typeof implementation.compileStringAsync !== "undefined";
   // 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`).
@@ -518,7 +519,8 @@ function getModernWebpackImporter(loaderContext, implementation, loadPaths) {
         });
         return {
           contents,
-          syntax
+          syntax,
+          sourceMapUrl: canonicalUrl
         };
       } catch (err) {
         return null;
@@ -559,13 +561,12 @@ const sassModernCompilers = new WeakMap();
  *
  * @param {Object} loaderContext
  * @param {Object} implementation
- * @param {Object} options
+ * @param {"legacy" | "modern" | "modern-compiler"} apiType
  * @returns {Function}
  */
-function getCompileFn(loaderContext, implementation, options) {
-  const isNewSass = implementation.info.includes("dart-sass") || implementation.info.includes("sass-embedded");
-  if (isNewSass) {
-    if (options.api === "modern") {
+function getCompileFn(loaderContext, implementation, apiType) {
+  if (typeof implementation.compileStringAsync !== "undefined") {
+    if (apiType === "modern") {
       return sassOptions => {
         const {
           data,
@@ -574,7 +575,7 @@ function getCompileFn(loaderContext, implementation, options) {
         return implementation.compileStringAsync(data, rest);
       };
     }
-    if (options.api === "modern-compiler") {
+    if (apiType === "modern-compiler") {
       return async sassOptions => {
         // eslint-disable-next-line no-underscore-dangle
         const webpackCompiler = loaderContext._compiler;
@@ -615,7 +616,7 @@ function getCompileFn(loaderContext, implementation, options) {
       });
     });
   }
-  if (options.api === "modern" || options.api === "modern-compiler") {
+  if (apiType === "modern" || apiType === "modern-compiler") {
     throw new Error("Modern API is not supported for 'node-sass'");
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "15.0.0",
+  "version": "16.0.1",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -72,8 +72,8 @@
     "@babel/cli": "^7.23.4",
     "@babel/core": "^7.24.0",
     "@babel/preset-env": "^7.24.0",
-    "@commitlint/cli": "^18.4.4",
-    "@commitlint/config-conventional": "^18.4.4",
+    "@commitlint/cli": "^19.3.0",
+    "@commitlint/config-conventional": "^19.2.2",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^29.6.2",
     "bootstrap-sass": "^3.4.1",
@@ -90,7 +90,7 @@
     "eslint-plugin-import": "^2.28.0",
     "file-loader": "^6.2.0",
     "foundation-sites": "^6.7.5",
-    "husky": "^9.0.11",
+    "husky": "^9.1.3",
     "jest": "^29.6.2",
     "jest-environment-node-single-context": "^29.1.0",
     "lint-staged": "^15.2.0",
@@ -105,7 +105,7 @@
     "semver": "^7.5.4",
     "standard-version": "^9.3.1",
     "style-loader": "^3.3.4",
-    "webpack": "^5.88.2",
+    "webpack": "^5.93.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^5.0.4"
   },