sass-loader 7.3.1 → 8.0.0

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 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.
 
+## [8.0.0](https://github.com/webpack-contrib/sass-loader/compare/v7.3.1...v8.0.0) (2019-08-29)
+
+
+### ⚠ BREAKING CHANGES
+
+* minimum required `webpack` version is `4.36.0`
+* minimum required `node.js` version is `8.9.0`
+* move all sass (`includePaths`, `importer`, `functions`) options to the `sassOptions` option. The `functions` option can't be used as `Function`, you should use `sassOption` as `Function` to achieve this.
+* the `data` option was renamed to the `prependData` option
+* default value of the `sourceMap` option depends on the `devtool` value (`eval`/`false` values don't enable source map generation)
+
+
+### Features
+
+* automatically use the `fibers` package if it is possible ([#744](https://github.com/webpack-contrib/sass-loader/issues/744)) ([96184e1](https://github.com/webpack-contrib/sass-loader/commit/96184e1))
+* source map generation depends on the `devtool` option ([#743](https://github.com/webpack-contrib/sass-loader/issues/743)) ([fcea88e](https://github.com/webpack-contrib/sass-loader/commit/fcea88e))
+* validate loader options ([#737](https://github.com/webpack-contrib/sass-loader/issues/737)) ([7b543fc](https://github.com/webpack-contrib/sass-loader/commit/7b543fc))
+* reworked error handling from `node-sass`/`sass`
+* improve resolution for `@import` (including support `_index` and `index` files in a directory)
+
+### Bug Fixes
+
+* compatibility with `pnp`
+
+
 ### [7.3.1](https://github.com/webpack-contrib/sass-loader/compare/v7.3.0...v7.3.1) (2019-08-20)
 
 

package/README.md

@@ -107,19 +107,44 @@ Thankfully there are a two solutions to this problem:
 
 ## Options
 
-By default all options passed to loader also passed to to [Node Sass](https://github.com/sass/node-sass) or [Dart Sass](http://sass-lang.com/dart-sass)
+### `implementation`
 
-> ℹ️ The `indentedSyntax` option has `true` value for the `sass` extension.
-> ℹ️ Options such as `file` and `outFile` are unavailable.
-> ℹ️ Only the "expanded" and "compressed" values of outputStyle are supported for `dart-sass`.
-> ℹ We recommend don't use `sourceMapContents`, `sourceMapEmbed`, `sourceMapRoot` options because loader automatically setup this options.
+The special `implementation` option determines which implementation of Sass to use.
 
-There is a slight difference between the `node-sass` and `sass` options. We recommend look documentation before used them:
+By default the loader resolve the implementation based on your dependencies.
+Just add required implementation to `package.json` (`node-sass` or `sass` package) and install dependencies.
 
-- [the Node Sass documentation](https://github.com/sass/node-sass/#options) for all available `node-sass` options.
-- [the Dart Sass documentation](https://github.com/sass/dart-sass#javascript-api) for all available `sass` options.
+Example where the `sass-loader` loader uses the `sass` (`dart-sass`) implementation:
 
-**webpack.config.js**
+**package.json**
+
+```json
+{
+  "devDependencies": {
+    "sass-loader": "^7.2.0",
+    "sass": "^1.22.10"
+  }
+}
+```
+
+Example where the `sass-loader` loader uses the `node-sass` implementation:
+
+**package.json**
+
+```json
+{
+  "devDependencies": {
+    "sass-loader": "^7.2.0",
+    "node-sass": "^4.0.0"
+  }
+}
+```
+
+Beware the situation when `node-sass` and `sass` was installed, by default the `sass-loader` prefers `node-sass`, to avoid this situation use the `implementation` option.
+
+It takes either `node-sass` or `sass` (`Dart Sass`) module.
+
+For example, to use Dart Sass, you'd pass:
 
 ```js
 module.exports = {
@@ -133,8 +158,8 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              indentWidth: 4,
-              includePaths: ['absolute/path/a', 'absolute/path/b'],
+              // Prefer `dart-sass`
+              implementation: require('sass'),
             },
           },
         ],
@@ -144,14 +169,10 @@ module.exports = {
 };
 ```
 
-### `implementation`
-
-The special `implementation` option determines which implementation of Sass to use.
-
-By default the loader resolve the implementation based on your dependencies.
-Just add required implementation to `package.json` (`node-sass` or `sass` package) and install dependencies.
+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.
 
-Example where the `sass-loader` loader uses the `sass` (`dart-sass`) implementation:
+We automatically inject the [`fibers`](https://github.com/laverdet/node-fibers) package (setup `sassOptions.fiber`) if is possible (i.e. you need install the [`fibers`](https://github.com/laverdet/node-fibers) package).
 
 **package.json**
 
@@ -159,29 +180,44 @@ Example where the `sass-loader` loader uses the `sass` (`dart-sass`) implementat
 {
   "devDependencies": {
     "sass-loader": "^7.2.0",
-    "sass": "^1.22.10"
+    "sass": "^1.22.10",
+    "fibers": "^4.0.1"
   }
 }
 ```
 
-Example where the `sass-loader` loader uses the `node-sass` implementation:
+You can disable automatically inject the [`fibers`](https://github.com/laverdet/node-fibers) package pass the `false` value for the `sassOptions.fiber` option.
 
-**package.json**
+**webpack.config.js**
 
-```json
-{
-  "devDependencies": {
-    "sass-loader": "^7.2.0",
-    "node-sass": "^4.0.0"
-  }
-}
+```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,
+              },
+            },
+          },
+        ],
+      },
+    ],
+  },
+};
 ```
 
-Beware the situation when `node-sass` and `sass` was installed, by default the `sass-loader` prefers `node-sass`, to avoid this situation use the `implementation` option.
+Also you can pass own the `fiber` value using this code:
 
-It takes either `node-sass` or `sass` (`Dart Sass`) module.
-
-For example, to use Dart Sass, you'd pass:
+**webpack.config.js**
 
 ```js
 module.exports = {
@@ -195,8 +231,10 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              // Prefer `dart-sass`
               implementation: require('sass'),
+              sassOptions: {
+                fiber: require('fibers'),
+              },
             },
           },
         ],
@@ -206,10 +244,27 @@ 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.
+### `sassOptions`
+
+Type: `Object|Function`
+
+Options for [Node Sass](https://github.com/sass/node-sass) or [Dart Sass](http://sass-lang.com/dart-sass) implementation.
+
+> ℹ️ The `indentedSyntax` option has `true` value for the `sass` extension.
+
+> ℹ️ Options such as `file` and `outFile` are unavailable.
+
+> ℹ We recommend don't use `sourceMapContents`, `sourceMapEmbed`, `sourceMapRoot` options because loader automatically setup this options.
+
+There is a slight difference between the `node-sass` and `sass` (`Dart Sass`) options.
+We recommend look documentation before used them:
+
+- [the Node Sass documentation](https://github.com/sass/node-sass/#options) for all available `node-sass` options.
+- [the Dart Sass documentation](https://github.com/sass/dart-sass#javascript-api) for all available `sass` options.
+
+#### `Object`
 
-To enable this, pass the `Fiber` class to the `fiber` option:
+Setups option as object for sass implementation.
 
 **webpack.config.js**
 
@@ -225,8 +280,10 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              implementation: require('sass'),
-              fiber: require('fibers'),
+              sassOptions: {
+                indentWidth: 4,
+                includePaths: ['absolute/path/a', 'absolute/path/b'],
+              },
             },
           },
         ],
@@ -236,7 +293,47 @@ module.exports = {
 };
 ```
 
-### `data`
+#### `Function`
+
+Allows setup difference options based on loader context.
+
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.s[ac]ss$/i,
+        use: [
+          'style-loader',
+          'css-loader',
+          {
+            loader: 'sass-loader',
+            options: {
+              sassOptions: (loaderContext) => {
+                // More information about available properties https://webpack.js.org/api/loaders/
+                const { resourcePath, rootContext } = loaderContext;
+                const relativePath = path.relative(rootContext, resourcePath);
+
+                if (relativePath === 'styles/foo.scss') {
+                  return {
+                    includePaths: ['absolute/path/c', 'absolute/path/d'],
+                  };
+                }
+
+                return {
+                  includePaths: ['absolute/path/a', 'absolute/path/b'],
+                };
+              },
+            },
+          },
+        ],
+      },
+    ],
+  },
+};
+```
+
+### `prependData`
 
 Type: `String|Function`
 Default: `undefined`
@@ -262,7 +359,7 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              data: '$env: ' + process.env.NODE_ENV + ';',
+              prependData: '$env: ' + process.env.NODE_ENV + ';',
             },
           },
         ],
@@ -286,8 +383,8 @@ module.exports = {
           {
             loader: 'sass-loader',
             options: {
-              data: (loaderContext) => {
-                // More information about avalaible options https://webpack.js.org/api/loaders/
+              prependData: (loaderContext) => {
+                // More information about available properties https://webpack.js.org/api/loaders/
                 const { resourcePath, rootContext } = loaderContext;
                 const relativePath = path.relative(rootContext, resourcePath);
 
@@ -309,11 +406,11 @@ module.exports = {
 ### `sourceMap`
 
 Type: `Boolean`
-Default: `false`
+Default: depends on the `compiler.devtool` value
 
 Enables/Disables generation of source maps.
 
-They are not enabled by default because they expose a runtime overhead and increase in bundle size (JS source maps do not).
+By default generation of source maps depends on the [`devtool`](https://webpack.js.org/configuration/devtool/) option, all values enable source map generation except `eval` and `false` value.
 
 **webpack.config.js**
 
@@ -351,7 +448,7 @@ module.exports = {
 Type: `Boolean`
 Default: `true`
 
-Allows to disable default `webpack` importer.
+Enables/Disables default `webpack` importer.
 
 This can improve performance in some cases. Use it with caution because aliases and `@import` at-rules starts with `~` will not work, but you can pass own `importer` to solve this (see [`importer docs`](https://github.com/sass/node-sass#importer--v200---experimental)).
 
@@ -424,6 +521,8 @@ module.exports = {
 
 ### Source maps
 
+Enables/Disables generation of source maps.
+
 To enable CSS source maps, you'll need to pass the `sourceMap` option to the sass-loader _and_ the css-loader.
 
 **webpack.config.js**

package/dist/SassError.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+class SassError extends Error {
+  constructor(sassError, resourcePath) {
+    super();
+    this.name = 'SassError';
+    this.originalSassError = sassError;
+    this.loc = {
+      line: sassError.line,
+      column: sassError.column
+    }; // Keep original error if `sassError.formatted` is unavailable
+
+    this.message = `${this.name}: ${this.originalSassError.message}`;
+
+    if (this.originalSassError.formatted) {
+      this.message = `${this.name}: ${this.originalSassError.formatted.replace(/^Error: /, '').replace(/(\s*)stdin(\s*)/, `$1${resourcePath}$2`)}`; // Instruct webpack to hide the JS stack from the console.
+      // Usually you're only interested in the SASS stack in this case.
+      // eslint-disable-next-line no-param-reassign
+
+      this.hideStack = true;
+      Error.captureStackTrace(this, this.constructor);
+    }
+  }
+
+}
+
+var _default = SassError;
+exports.default = _default;

package/dist/getDefaultSassImplementation.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+function getDefaultSassImplementation() {
+  let sassImplPkg = 'node-sass';
+
+  try {
+    require.resolve('node-sass');
+  } catch (error) {
+    try {
+      require.resolve('sass');
+
+      sassImplPkg = 'sass';
+    } catch (ignoreError) {
+      sassImplPkg = 'node-sass';
+    }
+  } // eslint-disable-next-line import/no-dynamic-require, global-require
+
+
+  return require(sassImplPkg);
+}
+
+var _default = getDefaultSassImplementation;
+exports.default = _default;

package/dist/getRenderFunctionFromSassImplementation.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _neoAsync = _interopRequireDefault(require("neo-async"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+let nodeSassJobQueue = null;
+/**
+ * Verifies that the implementation and version of Sass is supported by this loader.
+ *
+ * @param {Object} implementation
+ * @returns {Function}
+ */
+
+function getRenderFunctionFromSassImplementation(implementation) {
+  const isDartSass = implementation.info.includes('dart-sass');
+
+  if (isDartSass) {
+    return implementation.render.bind(implementation);
+  } // 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
+
+
+  if (nodeSassJobQueue === null) {
+    const threadPoolSize = Number(process.env.UV_THREADPOOL_SIZE || 4);
+    nodeSassJobQueue = _neoAsync.default.queue(implementation.render.bind(implementation), threadPoolSize - 1);
+  }
+
+  return nodeSassJobQueue.push.bind(nodeSassJobQueue);
+}
+
+var _default = getRenderFunctionFromSassImplementation;
+exports.default = _default;

package/dist/getSassImplementation.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _semver = _interopRequireDefault(require("semver"));
+
+var _getDefaultSassImplementation = _interopRequireDefault(require("./getDefaultSassImplementation"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function getSassImplementation(implementation) {
+  let resolvedImplementation = implementation;
+
+  if (!resolvedImplementation) {
+    // eslint-disable-next-line no-param-reassign
+    resolvedImplementation = (0, _getDefaultSassImplementation.default)();
+  }
+
+  const {
+    info
+  } = resolvedImplementation;
+
+  if (!info) {
+    throw new Error('Unknown Sass implementation.');
+  }
+
+  const infoParts = info.split('\t');
+
+  if (infoParts.length < 2) {
+    throw new Error(`Unknown Sass implementation "${info}".`);
+  }
+
+  const [implementationName, version] = infoParts;
+
+  if (implementationName === 'dart-sass') {
+    if (!_semver.default.satisfies(version, '^1.3.0')) {
+      throw new Error(`Dart Sass version ${version} is incompatible with ^1.3.0.`);
+    }
+
+    return resolvedImplementation;
+  } else if (implementationName === 'node-sass') {
+    if (!_semver.default.satisfies(version, '^4.0.0')) {
+      throw new Error(`Node Sass version ${version} is incompatible with ^4.0.0.`);
+    }
+
+    return resolvedImplementation;
+  }
+
+  throw new Error(`Unknown Sass implementation "${implementationName}".`);
+}
+
+var _default = getSassImplementation;
+exports.default = _default;

package/dist/getSassOptions.js

@@ -21,44 +21,53 @@ function isProductionLikeMode(loaderContext) {
 /**
  * Derives the sass options from the loader context and normalizes its values with sane defaults.
  *
- * Please note: If loaderContext.query is an options object, it will be re-used across multiple invocations.
- * That's why we must not modify the object directly.
- *
- * @param {LoaderContext} loaderContext
- * @param {string} loaderOptions
- * @param {object} content
+ * @param {object} loaderContext
+ * @param {object} loaderOptions
+ * @param {string} content
+ * @param {object} implementation
  * @returns {Object}
  */
 
 
-function getSassOptions(loaderContext, loaderOptions, content) {
-  const options = (0, _cloneDeep.default)(loaderOptions);
-  const {
-    resourcePath
-  } = loaderContext; // allow opt.functions to be configured WRT loaderContext
+function getSassOptions(loaderContext, loaderOptions, content, implementation) {
+  const options = (0, _cloneDeep.default)(loaderOptions.sassOptions ? typeof loaderOptions.sassOptions === 'function' ? loaderOptions.sassOptions(loaderContext) || {} : loaderOptions.sassOptions : {});
+  const isDartSass = implementation.info.includes('dart-sass');
 
-  if (typeof options.functions === 'function') {
-    options.functions = options.functions(loaderContext);
-  }
+  if (isDartSass) {
+    const shouldTryToResolveFibers = !options.fiber && options.fiber !== false;
 
-  let {
-    data
-  } = options;
+    if (shouldTryToResolveFibers) {
+      let fibers;
 
-  if (typeof options.data === 'function') {
-    data = options.data(loaderContext);
+      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.data = data ? data + _os.default.EOL + content : content; // opt.outputStyle
+  options.data = loaderOptions.prependData ? typeof loaderOptions.prependData === 'function' ? loaderOptions.prependData(loaderContext) + _os.default.EOL + content : loaderOptions.prependData + _os.default.EOL + content : content; // opt.outputStyle
 
   if (!options.outputStyle && isProductionLikeMode(loaderContext)) {
     options.outputStyle = 'compressed';
-  } // opt.sourceMap
+  }
+
+  const useSourceMap = typeof loaderOptions.sourceMap === 'boolean' ? loaderOptions.sourceMap : loaderContext.sourceMap; // opt.sourceMap
   // Not using the `this.sourceMap` flag because css source maps are different
   // @see https://github.com/webpack/css-loader/pull/40
 
-
-  if (options.sourceMap) {
+  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.
@@ -82,8 +91,11 @@ function getSassOptions(loaderContext, loaderOptions, content) {
       // when exported by webpack-extract-text-plugin.
       options.sourceMapContents = true;
     }
-  } // indentedSyntax is a boolean flag.
+  }
 
+  const {
+    resourcePath
+  } = loaderContext;
 
   const ext = _path.default.extname(resourcePath); // If we are compiling sass and indentedSyntax isn't set, automatically set it.
 
@@ -95,10 +107,8 @@ function getSassOptions(loaderContext, loaderOptions, content) {
   } // Allow passing custom importers to `node-sass`. Accepts `Function` or an array of `Function`s.
 
 
-  options.importer = options.importer ? (0, _proxyCustomImporters.default)(options.importer, resourcePath) : []; // `node-sass` uses `includePaths` to resolve `@import` paths. Append the currently processed file.
-
-  options.includePaths = options.includePaths || [];
-  options.includePaths.push(_path.default.dirname(resourcePath));
+  options.importer = options.importer ? (0, _proxyCustomImporters.default)(options.importer, resourcePath) : [];
+  options.includePaths = (options.includePaths || []).concat(_path.default.dirname(resourcePath));
   return options;
 }
 

package/dist/importsToResolve.js

@@ -34,7 +34,7 @@ function importsToResolve(url) {
   // @see https://github.com/webpack-contrib/sass-loader/issues/167
 
 
-  const ext = _path.default.extname(request); // In case there is module request, send this to webpack resolver
+  const ext = _path.default.extname(request).toLowerCase(); // In case there is module request, send this to webpack resolver
 
 
   if (matchModuleImport.test(url)) {

package/dist/index.js

@@ -7,66 +7,53 @@ exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
-var _neoAsync = _interopRequireDefault(require("neo-async"));
+var _schemaUtils = _interopRequireDefault(require("schema-utils"));
 
-var _pify = _interopRequireDefault(require("pify"));
+var _loaderUtils = require("loader-utils");
 
-var _semver = _interopRequireDefault(require("semver"));
+var _options = _interopRequireDefault(require("./options.json"));
 
-var _loaderUtils = require("loader-utils");
+var _getSassImplementation = _interopRequireDefault(require("./getSassImplementation"));
 
-var _formatSassError = _interopRequireDefault(require("./formatSassError"));
+var _getSassOptions = _interopRequireDefault(require("./getSassOptions"));
 
 var _webpackImporter = _interopRequireDefault(require("./webpackImporter"));
 
-var _getSassOptions = _interopRequireDefault(require("./getSassOptions"));
+var _getRenderFunctionFromSassImplementation = _interopRequireDefault(require("./getRenderFunctionFromSassImplementation"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _SassError = _interopRequireDefault(require("./SassError"));
 
-let nodeSassJobQueue = null; // Very hacky check
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function hasGetResolve(loaderContext) {
-  return loaderContext.getResolve && // eslint-disable-next-line no-underscore-dangle
-  loaderContext._compiler && // eslint-disable-next-line no-underscore-dangle
-  loaderContext._compiler.resolverFactory && // eslint-disable-next-line no-underscore-dangle
-  loaderContext._compiler.resolverFactory._create && /cachedCleverMerge/.test( // eslint-disable-next-line no-underscore-dangle
-  loaderContext._compiler.resolverFactory._create.toString());
-}
 /**
  * The sass-loader makes node-sass and dart-sass available to webpack modules.
  *
- * @this {LoaderContext}
+ * @this {object}
  * @param {string} content
  */
-
-
 function loader(content) {
   const options = (0, _loaderUtils.getOptions)(this) || {};
+  (0, _schemaUtils.default)(_options.default, options, {
+    name: 'Sass Loader',
+    baseDataPath: 'options'
+  });
+  const implementation = (0, _getSassImplementation.default)(options.implementation);
   const callback = this.async();
 
   const addNormalizedDependency = file => {
     // node-sass returns POSIX paths
-    this.dependency(_path.default.normalize(file));
+    this.addDependency(_path.default.normalize(file));
   };
 
-  if (typeof callback !== 'function') {
-    throw new Error('Synchronous compilation is not supported anymore. See https://github.com/webpack-contrib/sass-loader/issues/333');
-  }
-
-  let resolve = (0, _pify.default)(this.resolve); // Supported since v4.36.0
+  const sassOptions = (0, _getSassOptions.default)(this, options, content, implementation);
+  const shouldUseWebpackImporter = typeof options.webpackImporter === 'boolean' ? options.webpackImporter : true;
 
-  if (hasGetResolve(this)) {
-    resolve = this.getResolve({
+  if (shouldUseWebpackImporter) {
+    const resolve = this.getResolve({
       mainFields: ['sass', 'style', 'main', '...'],
       mainFiles: ['_index', 'index', '...'],
       extensions: ['.scss', '.sass', '.css', '...']
     });
-  }
-
-  const sassOptions = (0, _getSassOptions.default)(this, options, content);
-  const shouldUseWebpackImporter = typeof options.webpackImporter === 'boolean' ? options.webpackImporter : true;
-
-  if (shouldUseWebpackImporter) {
     sassOptions.importer.push((0, _webpackImporter.default)(this.resourcePath, resolve, addNormalizedDependency));
   } // Skip empty files, otherwise it will stop webpack, see issue #21
 
@@ -76,17 +63,14 @@ function loader(content) {
     return;
   }
 
-  const render = getRenderFuncFromSassImpl( // eslint-disable-next-line import/no-extraneous-dependencies, global-require
-  options.implementation || getDefaultSassImpl());
+  const render = (0, _getRenderFunctionFromSassImplementation.default)(implementation);
   render(sassOptions, (error, result) => {
     if (error) {
-      (0, _formatSassError.default)(error, this.resourcePath);
-
       if (error.file) {
-        this.dependency(error.file);
+        addNormalizedDependency(error.file);
       }
 
-      callback(error);
+      callback(new _SassError.default(error, this.resourcePath));
       return;
     }
 
@@ -125,78 +109,6 @@ function loader(content) {
     callback(null, result.css.toString(), result.map);
   });
 }
-/**
- * Verifies that the implementation and version of Sass is supported by this loader.
- *
- * @param {Object} module
- * @returns {Function}
- */
-
-
-function getRenderFuncFromSassImpl(module) {
-  const {
-    info
-  } = module;
-
-  if (!info) {
-    throw new Error('Unknown Sass implementation.');
-  }
-
-  const components = info.split('\t');
-
-  if (components.length < 2) {
-    throw new Error(`Unknown Sass implementation "${info}".`);
-  }
-
-  const [implementation, version] = components;
-
-  if (!_semver.default.valid(version)) {
-    throw new Error(`Invalid Sass version "${version}".`);
-  }
-
-  if (implementation === 'dart-sass') {
-    if (!_semver.default.satisfies(version, '^1.3.0')) {
-      throw new Error(`Dart Sass version ${version} is incompatible with ^1.3.0.`);
-    }
-
-    return module.render.bind(module);
-  } else if (implementation === 'node-sass') {
-    if (!_semver.default.satisfies(version, '^4.0.0')) {
-      throw new Error(`Node Sass version ${version} is incompatible with ^4.0.0.`);
-    } // 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
-
-
-    if (nodeSassJobQueue === null) {
-      const threadPoolSize = Number(process.env.UV_THREADPOOL_SIZE || 4);
-      nodeSassJobQueue = _neoAsync.default.queue(module.render.bind(module), threadPoolSize - 1);
-    }
-
-    return nodeSassJobQueue.push.bind(nodeSassJobQueue);
-  }
-
-  throw new Error(`Unknown Sass implementation "${implementation}".`);
-}
-
-function getDefaultSassImpl() {
-  let sassImplPkg = 'node-sass';
-
-  try {
-    require.resolve('node-sass');
-  } catch (error) {
-    try {
-      require.resolve('sass');
-
-      sassImplPkg = 'sass';
-    } catch (ignoreError) {
-      sassImplPkg = 'node-sass';
-    }
-  } // eslint-disable-next-line import/no-dynamic-require, global-require
-
-
-  return require(sassImplPkg);
-}
 
 var _default = loader;
 exports.default = _default;

package/dist/options.json

@@ -1,9 +1,41 @@
 {
   "type": "object",
   "properties": {
-    "name": {
+    "implementation": {
+      "description": "The implementation of the sass to be used (https://github.com/webpack-contrib/sass-loader#implementation).",
+      "type": "object"
+    },
+    "sassOptions": {
+      "description": "Options for `node-sass` or `sass` (`Dart Sass`) implementation. (https://github.com/webpack-contrib/sass-loader#implementation).",
+      "anyOf": [
+        {
+          "type": "object",
+          "additionalProperties": true
+        },
+        {
+          "instanceof": "Function"
+        }
+      ]
+    },
+    "prependData": {
+      "description": "Prepends `Sass`/`SCSS` code before the actual entry file (https://github.com/webpack-contrib/sass-loader#prependdata).",
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "instanceof": "Function"
+        }
+      ]
+    },
+    "sourceMap": {
+      "description": "Enables/Disables generation of source maps (https://github.com/webpack-contrib/sass-loader#sourcemap).",
+      "type": "boolean"
+    },
+    "webpackImporter": {
+      "description": "Enables/Disables default `webpack` importer (https://github.com/webpack-contrib/sass-loader#webpackimporter).",
       "type": "boolean"
     }
   },
   "additionalProperties": false
-}
+}

package/dist/webpackImporter.js

@@ -26,7 +26,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  * @param {string} prev
  * @param {Function<Error, string>} done
  */
-const matchCss = /\.css$/;
+const matchCss = /\.css$/i;
 /**
  * Returns an importer that uses webpack's resolving algorithm.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sass-loader",
-  "version": "7.3.1",
+  "version": "8.0.0",
   "description": "Sass loader for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/sass-loader",
@@ -9,7 +9,7 @@
   "bugs": "https://github.com/webpack-contrib/sass-loader/issues",
   "main": "dist/cjs.js",
   "engines": {
-    "node": ">= 6.9.0"
+    "node": ">= 8.9.0"
   },
   "scripts": {
     "start": "npm run build -- -w",
@@ -35,13 +35,27 @@
     "dist"
   ],
   "peerDependencies": {
-    "webpack": "^3.0.0 || ^4.0.0"
+    "webpack": "^4.36.0",
+    "node-sass": "^4.0.0",
+    "sass": "^1.3.0",
+    "fibers": ">= 3.1.0"
+  },
+  "peerDependenciesMeta": {
+    "node-sass": {
+      "optional": true
+    },
+    "sass": {
+      "optional": true
+    },
+    "fibers": {
+      "optional": true
+    }
   },
   "dependencies": {
     "clone-deep": "^4.0.1",
-    "loader-utils": "^1.0.1",
-    "neo-async": "^2.5.0",
-    "pify": "^4.0.1",
+    "loader-utils": "^1.2.3",
+    "neo-async": "^2.6.1",
+    "schema-utils": "^2.1.0",
     "semver": "^6.3.0"
   },
   "devDependencies": {
@@ -54,35 +68,33 @@
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
     "babel-jest": "^24.9.0",
     "bootstrap": "^4.3.1",
-    "bootstrap-sass": "^3.3.5",
-    "chokidar": "^2.1.6",
+    "bootstrap-sass": "^3.4.1",
     "commitlint-azure-pipelines-cli": "^1.0.2",
     "cross-env": "^5.2.0",
     "css-loader": "^3.2.0",
-    "del": "^4.1.1",
-    "del-cli": "^1.1.0",
-    "eslint": "^6.1.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-plugin-import": "^2.14.0",
+    "del": "^5.1.0",
+    "del-cli": "^2.0.0",
+    "eslint": "^6.2.2",
+    "eslint-config-prettier": "^6.1.0",
+    "eslint-plugin-import": "^2.18.2",
+    "fibers": "^4.0.1",
     "file-loader": "^4.2.0",
-    "husky": "^3.0.3",
+    "husky": "^3.0.4",
     "jest": "^24.9.0",
-    "jest-junit": "^7.0.0",
+    "jest-junit": "^8.0.0",
     "jquery": "^3.4.1",
-    "lint-staged": "^9.2.1",
+    "lint-staged": "^9.2.5",
     "memory-fs": "^0.4.1",
-    "node-sass": "^4.5.0",
+    "node-sass": "^4.12.0",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.1.1",
     "popper.js": "^1.15.0",
-    "prettier": "^1.15.2",
-    "raw-loader": "^3.1.0",
-    "sass": "^1.3.0",
+    "prettier": "^1.18.2",
+    "sass": "^1.22.10",
     "standard-version": "^7.0.0",
     "style-loader": "^1.0.0",
-    "webpack": "^4.5.0",
-    "webpack-cli": "^3.1.0",
-    "webpack-dev-server": "^3.1.4"
+    "webpack": "^4.39.3",
+    "webpack-cli": "^3.3.7",
+    "webpack-dev-server": "^3.8.0"
   },
   "keywords": [
     "sass",

package/dist/formatSassError.js

@@ -1,82 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _os = _interopRequireDefault(require("os"));
-
-var _fs = _interopRequireDefault(require("fs"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// A typical sass error looks like this
-// const SassError = {
-//   message: "invalid property name",
-//   column: 14,
-//   line: 1,
-//   file: "stdin",
-//   status: 1
-// };
-
-/**
- * Enhances the sass error with additional information about what actually went wrong.
- *
- * @param {SassError} error
- * @param {string} resourcePath
- */
-function formatSassError(error, resourcePath) {
-  // Instruct webpack to hide the JS stack from the console
-  // Usually you're only interested in the SASS stack in this case.
-  // eslint-disable-next-line no-param-reassign
-  error.hideStack = true; // The file property is missing in rare cases.
-  // No improvement in the error is possible.
-
-  if (!error.file) {
-    return;
-  }
-
-  let msg = error.message;
-
-  if (error.file === 'stdin') {
-    // eslint-disable-next-line no-param-reassign
-    error.file = resourcePath;
-  } // node-sass returns UNIX-style paths
-  // eslint-disable-next-line no-param-reassign
-
-
-  error.file = _path.default.normalize(error.file); // The 'Current dir' hint of node-sass does not help us, we're providing
-  // additional information by reading the err.file property
-
-  msg = msg.replace(/\s*Current dir:\s*/, ''); // msg = msg.replace(/(\s*)(stdin)(\s*)/, `$1${err.file}$3`);
-  // eslint-disable-next-line no-param-reassign
-
-  error.message = `${getFileExcerptIfPossible(error) + msg.charAt(0).toUpperCase() + msg.slice(1) + _os.default.EOL}      in ${error.file} (line ${error.line}, column ${error.column})`;
-}
-/**
- * Tries to get an excerpt of the file where the error happened.
- * Uses err.line and err.column.
- *
- * Returns an empty string if the excerpt could not be retrieved.
- *
- * @param {SassError} error
- * @returns {string}
- */
-
-
-function getFileExcerptIfPossible(error) {
-  try {
-    const content = _fs.default.readFileSync(error.file, 'utf8');
-
-    return `${_os.default.EOL + content.split(/\r?\n/)[error.line - 1] + _os.default.EOL + new Array(error.column - 1).join(' ')}^${_os.default.EOL}      `;
-  } catch (ignoreError) {
-    // If anything goes wrong here, we don't want any errors to be reported to the user
-    return '';
-  }
-}
-
-var _default = formatSassError;
-exports.default = _default;