sass-loader 13.3.2 → 14.0.0

package/README.md

@@ -249,85 +249,6 @@ module.exports = {
 };
 ```
 
-Note that when using `sass` (`Dart Sass`), **synchronous compilation is twice as fast as asynchronous compilation** by default, due to the overhead of asynchronous callbacks.
-To avoid this overhead, you can use the [fibers](https://www.npmjs.com/package/fibers) package to call asynchronous importers from the synchronous code path.
-
-We automatically inject the [`fibers`](https://github.com/laverdet/node-fibers) package (setup `sassOptions.fiber`) for `Node.js` less v16.0.0 if is possible (i.e. you need install the [`fibers`](https://github.com/laverdet/node-fibers) package).
-
-> **Warning**
->
-> Fibers is not compatible with `Node.js` v16.0.0 or later. Unfortunately, v8 commit [dacc2fee0f](https://github.com/v8/v8/commit/dacc2fee0f815823782a7e432c79c2a7767a4765) is a breaking change and workarounds are non-trivial. ([see introduction to readme](https://github.com/laverdet/node-fibers)).
-
-**package.json**
-
-```json
-{
-  "devDependencies": {
-    "sass-loader": "^7.2.0",
-    "sass": "^1.22.10",
-    "fibers": "^4.0.1"
-  }
-}
-```
-
-You can disable automatically injecting the [`fibers`](https://github.com/laverdet/node-fibers) package by passing a `false` value for the `sassOptions.fiber` option.
-
-**webpack.config.js**
-
-```js
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.s[ac]ss$/i,
-        use: [
-          "style-loader",
-          "css-loader",
-          {
-            loader: "sass-loader",
-            options: {
-              implementation: require("sass"),
-              sassOptions: {
-                fiber: false,
-              },
-            },
-          },
-        ],
-      },
-    ],
-  },
-};
-```
-
-You can also pass the `fiber` value using this code:
-
-**webpack.config.js**
-
-```js
-module.exports = {
-  module: {
-    rules: [
-      {
-        test: /\.s[ac]ss$/i,
-        use: [
-          "style-loader",
-          "css-loader",
-          {
-            loader: "sass-loader",
-            options: {
-              implementation: require("sass"),
-              sassOptions: {
-                fiber: require("fibers"),
-              },
-            },
-          },
-        ],
-      },
-    ],
-  },
-};
-```
-
 ### `sassOptions`
 
 Type:
@@ -338,7 +259,7 @@ type sassOptions =
   | ((
       content: string | Buffer,
       loaderContext: LoaderContext,
-      meta: any
+      meta: any,
     ) => import("sass").LegacyOptions<"async">);
 ```
 
@@ -418,7 +339,7 @@ module.exports = {
           {
             loader: "sass-loader",
             options: {
-              sassOptions: (loaderContext) => {
+              sassOptions: (content, loaderContext) => {
                 // More information about available properties https://webpack.js.org/api/loaders/
                 const { resourcePath, rootContext } = loaderContext;
                 const relativePath = path.relative(rootContext, resourcePath);
@@ -677,14 +598,10 @@ Type:
 type warnRuleAsWarning = boolean;
 ```
 
-Default: `false`
+Default: `true`
 
 Treats the `@warn` rule as a webpack warning.
 
-> **Note**
->
-> It will be `true` by default in the next major release.
-
 **style.scss**
 
 ```scss

package/dist/index.js

@@ -74,7 +74,7 @@ async function loader(content) {
 
   // Modern API
   if (typeof result.loadedUrls !== "undefined") {
-    result.loadedUrls.filter(url => url.protocol === "file:").forEach(includedFile => {
+    result.loadedUrls.filter(loadedUrl => loadedUrl.protocol === "file:").forEach(includedFile => {
       const normalizedIncludedFile = _url.default.fileURLToPath(includedFile);
 
       // Custom `importer` can return only `contents` so includedFile will be relative
@@ -96,5 +96,4 @@ async function loader(content) {
   }
   callback(null, result.css.toString(), map);
 }
-var _default = loader;
-exports.default = _default;
+var _default = exports.default = loader;

package/dist/utils.js

@@ -10,7 +10,6 @@ exports.getSassImplementation = getSassImplementation;
 exports.getSassOptions = getSassOptions;
 exports.getWebpackImporter = getWebpackImporter;
 exports.getWebpackResolver = getWebpackResolver;
-exports.isSupportedFibers = isSupportedFibers;
 exports.normalizeSourceMap = normalizeSourceMap;
 var _url = _interopRequireDefault(require("url"));
 var _path = _interopRequireDefault(require("path"));
@@ -89,10 +88,6 @@ function proxyCustomImporters(importers, loaderContext) {
     return importer.apply(self, args);
   });
 }
-function isSupportedFibers() {
-  const [nodeVersion] = process.versions.node.split(".");
-  return Number(nodeVersion) < 16;
-}
 
 /**
  * Derives the sass options from the loader context and normalizes its values with sane defaults.
@@ -113,7 +108,7 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
   if (!sassOptions.logger) {
     const needEmitWarning = loaderOptions.warnRuleAsWarning !== false;
     const logger = loaderContext.getLogger("sass-loader");
-    const formatSpan = span => `${span.url || "-"}:${span.start.line}:${span.start.column}: `;
+    const formatSpan = span => `Warning on line ${span.start.line}, column ${span.start.column} of ${span.url || "-"}:${span.start.line}:${span.start.column}:\n`;
     const formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `;
     sassOptions.logger = {
       debug(message, loggerOptions) {
@@ -129,11 +124,14 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
         if (loggerOptions.deprecation) {
           builtMessage += "Deprecation ";
         }
-        if (loggerOptions.span && !loggerOptions.stack) {
-          builtMessage = formatSpan(loggerOptions.span);
+        if (loggerOptions.span) {
+          builtMessage += formatSpan(loggerOptions.span);
         }
         builtMessage += message;
-        if (loggerOptions.stack) {
+        if (loggerOptions.span && loggerOptions.span.context) {
+          builtMessage += `\n\n${loggerOptions.span.start.line} | ${loggerOptions.span.context}`;
+        }
+        if (loggerOptions.stack && loggerOptions.stack !== "null") {
           builtMessage += `\n\n${loggerOptions.stack}`;
         }
         if (needEmitWarning) {
@@ -176,28 +174,6 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
     sassOptions.importers = sassOptions.importers ? Array.isArray(sassOptions.importers) ? sassOptions.importers.slice() : [sassOptions.importers] : [];
   } else {
     sassOptions.file = resourcePath;
-    const isDartSass = implementation.info.includes("dart-sass");
-    if (isDartSass && isSupportedFibers()) {
-      const shouldTryToResolveFibers = !sassOptions.fiber && sassOptions.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
-          sassOptions.fiber = require(fibers);
-        }
-      } else if (sassOptions.fiber === false) {
-        // Don't pass the `fiber` option for `sass` (`Dart Sass`)
-        delete sassOptions.fiber;
-      }
-    } else {
-      // Don't pass the `fiber` option for `node-sass`
-      delete sassOptions.fiber;
-    }
 
     // opt.outputStyle
     if (!sassOptions.outputStyle && isProductionLikeMode(loaderContext)) {
@@ -227,6 +203,12 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
 
     // Allow passing custom importers to `sass`/`node-sass`. Accepts `Function` or an array of `Function`s.
     sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : [];
+
+    // Regression on the `sass-embedded` side
+    if (loaderOptions.webpackImporter === false && sassOptions.importer.length === 0) {
+      // eslint-disable-next-line no-undefined
+      sassOptions.importer = undefined;
+    }
     sassOptions.includePaths = [].concat(process.cwd()).concat(
     // We use `includePaths` in context for resolver, so it should be always absolute
     (sassOptions.includePaths ? sassOptions.includePaths.slice() : []).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" ? ";" : ":") : []);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "13.3.2",
+  "version": "14.0.0",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -13,7 +13,7 @@
   },
   "main": "dist/cjs.js",
   "engines": {
-    "node": ">= 14.15.0"
+    "node": ">= 18.12.0"
   },
   "scripts": {
     "start": "npm run build -- -w",
@@ -42,7 +42,6 @@
     "dist"
   ],
   "peerDependencies": {
-    "fibers": ">= 3.1.0",
     "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
     "sass": "^1.3.0",
     "sass-embedded": "*",
@@ -57,53 +56,49 @@
     },
     "sass-embedded": {
       "optional": true
-    },
-    "fibers": {
-      "optional": true
     }
   },
   "dependencies": {
     "neo-async": "^2.6.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.21.5",
-    "@babel/preset-env": "^7.21.5",
-    "@commitlint/cli": "^17.6.1",
-    "@commitlint/config-conventional": "^17.6.1",
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "@commitlint/cli": "^18.4.4",
+    "@commitlint/config-conventional": "^18.4.4",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^29.5.0",
+    "babel-jest": "^29.6.2",
     "bootstrap-sass": "^3.4.1",
     "bootstrap-v4": "npm:bootstrap@^4.5.3",
     "bootstrap-v5": "npm:bootstrap@^5.0.1",
     "cross-env": "^7.0.3",
-    "cspell": "^6.31.1",
-    "css-loader": "^6.7.3",
+    "cspell": "^8.3.2",
+    "css-loader": "^6.9.0",
     "del": "^6.1.1",
-    "del-cli": "^4.0.1",
-    "enhanced-resolve": "^5.13.0",
-    "eslint": "^8.39.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.27.5",
-    "fibers": "^5.0.3",
+    "del-cli": "^5.1.0",
+    "enhanced-resolve": "^5.15.0",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-import": "^2.28.0",
     "file-loader": "^6.2.0",
     "foundation-sites": "^6.7.5",
     "husky": "^8.0.3",
-    "jest": "^29.5.0",
-    "jest-environment-node-single-context": "^29.0.0",
-    "lint-staged": "^13.2.2",
+    "jest": "^29.6.2",
+    "jest-environment-node-single-context": "^29.1.0",
+    "lint-staged": "^15.2.0",
     "material-components-web": "^9.0.0",
-    "memfs": "^3.5.1",
-    "node-sass": "^8.0.0",
+    "memfs": "^4.6.0",
+    "node-sass": "^9.0.0",
     "node-sass-glob-importer": "^5.3.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.8",
-    "sass": "^1.62.1",
-    "sass-embedded": "^1.62.0",
-    "semver": "^7.5.0",
+    "prettier": "^3.2.2",
+    "sass": "^1.69.7",
+    "sass-embedded": "^1.69.7",
+    "semver": "^7.5.4",
     "standard-version": "^9.3.1",
-    "style-loader": "^3.3.2",
-    "webpack": "^5.81.0"
+    "style-loader": "^3.3.4",
+    "webpack": "^5.88.2"
   },
   "keywords": [
     "sass",