sass-loader 13.3.1 → 13.3.2

package/README.md

@@ -98,6 +98,10 @@ module.exports = {
 
 Finally run `webpack` via your preferred method.
 
+### The `outputStyle` (old API) and `style` (new API) options in `production` mode
+
+For `production` mode, the `outputStyle` (old API) and `style` (new API) options default to `compressed` unless otherwise specified in `sassOptions`.
+
 ### Resolving `import` at-rules
 
 Webpack provides an [advanced mechanism to resolve files](https://webpack.js.org/concepts/module-resolution/).

package/dist/utils.js

@@ -14,8 +14,6 @@ exports.isSupportedFibers = isSupportedFibers;
 exports.normalizeSourceMap = normalizeSourceMap;
 var _url = _interopRequireDefault(require("url"));
 var _path = _interopRequireDefault(require("path"));
-var _full = require("klona/full");
-var _neoAsync = _interopRequireDefault(require("neo-async"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function getDefaultSassImplementation() {
   let sassImplPkg = "sass";
@@ -107,16 +105,17 @@ function isSupportedFibers() {
  * @returns {Object}
  */
 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");
-  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) {
+  const options = loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === "function" ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {};
+  const sassOptions = {
+    ...options,
+    data: loaderOptions.additionalData ? typeof loaderOptions.additionalData === "function" ? await loaderOptions.additionalData(content, loaderContext) : `${loaderOptions.additionalData}\n${content}` : content
+  };
+  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 formatDebugSpan = span => `[debug:${span.start.line}:${span.start.column}] `;
-    options.logger = {
+    sassOptions.logger = {
       debug(message, loggerOptions) {
         let builtMessage = "";
         if (loggerOptions.span) {
@@ -148,36 +147,38 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
       }
     };
   }
+  const isModernAPI = loaderOptions.api === "modern";
   const {
     resourcePath
   } = loaderContext;
   if (isModernAPI) {
-    options.url = _url.default.pathToFileURL(resourcePath);
+    sassOptions.url = _url.default.pathToFileURL(resourcePath);
 
     // opt.outputStyle
-    if (!options.style && isProductionLikeMode(loaderContext)) {
-      options.style = "compressed";
+    if (!sassOptions.style && isProductionLikeMode(loaderContext)) {
+      sassOptions.style = "compressed";
     }
     if (useSourceMap) {
-      options.sourceMap = true;
+      sassOptions.sourceMap = true;
     }
 
     // If we are compiling sass and indentedSyntax isn't set, automatically set it.
-    if (typeof options.syntax === "undefined") {
+    if (typeof sassOptions.syntax === "undefined") {
       const ext = _path.default.extname(resourcePath);
       if (ext && ext.toLowerCase() === ".scss") {
-        options.syntax = "scss";
+        sassOptions.syntax = "scss";
       } else if (ext && ext.toLowerCase() === ".sass") {
-        options.syntax = "indented";
+        sassOptions.syntax = "indented";
       } else if (ext && ext.toLowerCase() === ".css") {
-        options.syntax = "css";
+        sassOptions.syntax = "css";
       }
     }
-    options.importers = options.importers ? Array.isArray(options.importers) ? options.importers : [options.importers] : [];
+    sassOptions.importers = sassOptions.importers ? Array.isArray(sassOptions.importers) ? sassOptions.importers.slice() : [sassOptions.importers] : [];
   } else {
-    options.file = resourcePath;
+    sassOptions.file = resourcePath;
+    const isDartSass = implementation.info.includes("dart-sass");
     if (isDartSass && isSupportedFibers()) {
-      const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
+      const shouldTryToResolveFibers = !sassOptions.fiber && sassOptions.fiber !== false;
       if (shouldTryToResolveFibers) {
         let fibers;
         try {
@@ -187,20 +188,20 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
         }
         if (fibers) {
           // eslint-disable-next-line global-require, import/no-dynamic-require
-          options.fiber = require(fibers);
+          sassOptions.fiber = require(fibers);
         }
-      } else if (options.fiber === false) {
+      } else if (sassOptions.fiber === false) {
         // Don't pass the `fiber` option for `sass` (`Dart Sass`)
-        delete options.fiber;
+        delete sassOptions.fiber;
       }
     } else {
       // Don't pass the `fiber` option for `node-sass`
-      delete options.fiber;
+      delete sassOptions.fiber;
     }
 
     // opt.outputStyle
-    if (!options.outputStyle && isProductionLikeMode(loaderContext)) {
-      options.outputStyle = "compressed";
+    if (!sassOptions.outputStyle && isProductionLikeMode(loaderContext)) {
+      sassOptions.outputStyle = "compressed";
     }
     if (useSourceMap) {
       // Deliberately overriding the sourceMap option here.
@@ -209,31 +210,31 @@ async function getSassOptions(loaderContext, loaderOptions, content, implementat
       // 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;
+      sassOptions.sourceMap = true;
+      sassOptions.outFile = _path.default.join(loaderContext.rootContext, "style.css.map");
+      sassOptions.sourceMapContents = true;
+      sassOptions.omitSourceMapUrl = true;
+      sassOptions.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;
+    if (ext && ext.toLowerCase() === ".sass" && typeof sassOptions.indentedSyntax === "undefined") {
+      sassOptions.indentedSyntax = true;
     } else {
-      options.indentedSyntax = Boolean(options.indentedSyntax);
+      sassOptions.indentedSyntax = Boolean(sassOptions.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(
+    sassOptions.importer = sassOptions.importer ? proxyCustomImporters(Array.isArray(sassOptions.importer) ? sassOptions.importer.slice() : [sassOptions.importer], loaderContext) : [];
+    sassOptions.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;
+    (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" ? ";" : ":") : []);
+    if (typeof sassOptions.charset === "undefined") {
+      sassOptions.charset = true;
     }
   }
-  return options;
+  return sassOptions;
 }
 const MODULE_REQUEST_REGEX = /^[^?]*~/;
 
@@ -553,7 +554,10 @@ function getCompileFn(implementation, options) {
   // We need to use a job queue to make sure that one thread is always available to the UV lib
   if (nodeSassJobQueue === null) {
     const threadPoolSize = Number(process.env.UV_THREADPOOL_SIZE || 4);
-    nodeSassJobQueue = _neoAsync.default.queue(implementation.render.bind(implementation), threadPoolSize - 1);
+    // Only used for `node-sass`, so let's load it lazily
+    // eslint-disable-next-line global-require
+    const async = require("neo-async");
+    nodeSassJobQueue = async.queue(implementation.render.bind(implementation), threadPoolSize - 1);
   }
   return sassOptions => new Promise((resolve, reject) => {
     nodeSassJobQueue.push.bind(nodeSassJobQueue)(sassOptions, (error, result) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "13.3.1",
+  "version": "13.3.2",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -63,7 +63,6 @@
     }
   },
   "dependencies": {
-    "klona": "^2.0.6",
     "neo-async": "^2.6.2"
   },
   "devDependencies": {